Commit Graph

12306 Commits

Author SHA1 Message Date
5d94113e23 Backup: fix 2021-05-19 11:31:50 +03:00
536c6c2f5e Web: Moved custom.scss to @appserver/common
+ Added missing ErrorBoundary
+ Removed useless commented code
2021-05-19 11:14:44 +03:00
86952dd71e Merge branch 'develop' into bugfix/context-actions 2021-05-19 10:19:17 +03:00
3433c074d7 Merge branch 'develop' into feature/my-profile
# Conflicts:
#	products/ASC.People/Client/src/pages/ProfileAction/Section/Body/updateUserForm.js
2021-05-19 10:16:40 +03:00
b9c52c526e Fixed DistributedTask 2021-05-18 21:24:22 +03:00
1b4807c07a Files: fixed SetTagsNew for thirdparty 2021-05-18 20:10:48 +03:00
2f7b9102ee Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into develop 2021-05-18 20:06:42 +03:00
d9e17af9d5 OneDrive: fix DI 2021-05-18 20:06:06 +03:00
c4c4d940a0
Merge pull request #252 from ONLYOFFICE/feature/remove-wq
Feature/remove wq
2021-05-18 19:04:34 +03:00
619b33caf3 Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into develop 2021-05-18 18:51:23 +03:00
06928a7896 People: fixed group cache 2021-05-18 18:50:48 +03:00
5f36009630 Web: Moved translationKeys "LoadingDescription" and "LoadingLabel" to "/static/locales/{lng}/Common.json" 2021-05-18 18:35:03 +03:00
4f1371370c
Merge pull request #260 from ONLYOFFICE/bugfix/fixed-firefox-header
Bugfix/fixed firefox header
2021-05-18 18:27:07 +03:00
8ad59d282b Web: Files: Store: Added mark read button 2021-05-18 18:18:38 +03:00
84565d46c6 Merge branch 'develop' into bugfix/fixed-firefox-header 2021-05-18 18:08:53 +03:00
bc901b8a4a Web: People: disabled user type change 2021-05-18 18:00:29 +03:00
07934f6cd9 Web: Common: fixed firefox header 2021-05-18 17:59:34 +03:00
2c6d06f304 Web: Files: fixed drag 2021-05-18 17:59:02 +03:00
6c51f15d28 Web: Components: fixed toggle-button styles 2021-05-18 17:58:45 +03:00
db7e2b8700 People: fixed query 2021-05-18 16:16:17 +03:00
df1ebc8d77 Web: Moved translationKeys "OpenApp" and "ViewWeb" to "/static/locales/{lng}/Common.json" 2021-05-18 15:23:12 +03:00
f6ecc35ae7 Web: Moved translationKeys "LearnMore" and "ComingSoon" to "/static/locales/{lng}/Common.json" 2021-05-18 15:10:20 +03:00
0ae236ad6d Web: Moved translationKey "People" to "/static/locales/{lng}/Common.json" 2021-05-18 14:42:44 +03:00
923f5012bc Web: Moved translationKey "SendButton" to "/static/locales/{lng}/Common.json" 2021-05-18 14:35:54 +03:00
49780cee24 Web: Moved translationKey "Email" to "/static/locales/{lng}/Common.json" 2021-05-18 14:27:59 +03:00
99b86212dd Web: Moved translationKey "Password" to "/static/locales/{lng}/Common.json" 2021-05-18 13:57:17 +03:00
08411cfc3b Web: Moved translationKey "CloseButton" to "/static/locales/{lng}/Common.json" 2021-05-18 13:47:36 +03:00
35da962d06 Web: Moved translationKey "LoadingProcessing" to "/static/locales/{lng}/Common.json" 2021-05-18 13:40:32 +03:00
7a2167a0b9 Web: Rename translationKeys to Common "OKButton", "SaveButton" and "CancelButton" to "/static/locales/{lng}/Common.json" 2021-05-18 13:23:54 +03:00
629239fd9b Web: Moved translationKey "OkButton" to "/static/locales/{lng}/Common.json" 2021-05-18 13:07:05 +03:00
Vyacheslav Semin
3c2cc92001
Make the necessary edits to install in k8s (#255)
* Make the necessary edits to install in k8s

* Add image build for waiting for appserver to start

* Edit the env file
2021-05-18 12:36:21 +03:00
bad58f32f2 Merge branch 'develop' into bugfix/context-actions 2021-05-18 11:05:43 +03:00
cdb9ef6be9 Web: Moved translationKey "SaveButton" to "/static/locales/{lng}/Common.json" 2021-05-18 10:56:24 +03:00
bcc82381bb
Merge pull request #258 from ONLYOFFICE/bugfix/fixed-badge-new
Bugfix/fixed badge new
2021-05-18 10:40:22 +03:00
036a8595c2 Web: Files: fixed update badges new 2021-05-17 17:55:55 +03:00
002469c650 Web: Files: added progress to "mark as read" operation 2021-05-17 17:53:52 +03:00
ef8b4d8a3a Web: Files: removed useless code, fixed getting file icons 2021-05-17 17:43:05 +03:00
4b1c067d34 Web: Files: fixed badge new translation 2021-05-17 17:41:35 +03:00
f907244431 Web: Files: Store: Added remove from list button, fixed displaying separator and some actions inside context menu 2021-05-17 12:27:09 +03:00
85cb6b822a Merge branch 'develop' into bugfix/context-actions 2021-05-17 12:25:27 +03:00
b91ddca880 Web: Moved translationKey "CancelButton" to "/static/locales/{lng}/Common.json" 2021-05-17 12:08:57 +03:00
ce57a76648 Web: Back-end tests: refactoring 2021-05-17 11:20:13 +03:00
2beacfcf23 Web: Enabled Common.json translations loading 2021-05-17 11:19:38 +03:00
4013d0a799 Tests: Front-end: Added NUnit tests for i18n duplicates 2021-05-17 10:46:43 +03:00
Artem Tarasov
6e5b34f4f7
Merge pull request #257 from ONLYOFFICE/bugfix/fixed-files-badges
Bugfix/fixed files badges
2021-05-14 16:36:38 +03:00
8ba2d041f9 Merge branch 'develop' into bugfix/fixed-files-badges 2021-05-14 15:29:12 +03:00
31752e64b4 fixed warnings 2021-05-14 15:26:18 +03:00
0792920677 Web: Files: hid the edit icon if the file is locked 2021-05-14 14:11:16 +03:00
fe38eb0f44 Web: Files: fixed locked badge 2021-05-14 14:10:08 +03:00
Alexey Kostenko
059b43ea01
Merge pull request #256 from ONLYOFFICE/bugfix/enable-favorites-recent-settings
Bugfix/enable favorites recent settings
2021-05-14 13:12:38 +03:00