Commit Graph

12597 Commits

Author SHA1 Message Date
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
Alexey Kostenko
08cc7b3560 Web: Client: Fixed warning, style, added text translation 2021-05-17 10:56:40 +03:00
4013d0a799 Tests: Front-end: Added NUnit tests for i18n duplicates 2021-05-17 10:46:43 +03:00
Alexey Kostenko
64f70c1bd0 Web: Client: Added translations 2021-05-14 17:22:45 +03:00
Alexey Kostenko
663417d14b Web: Client: Configuring access rights to modules, small refactoring 2021-05-14 17:05:39 +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
9f83d67ffb Web: Client: get secret key and qr 2021-05-14 15:59:40 +03:00
77f17d55b6 Web: Common: redirect on confirm page 2021-05-14 15:59:15 +03:00
9b54835996 Web: Common: get secret key and qr 2021-05-14 15:58:50 +03:00
57589a4e9e Web: Client: init confirm store 2021-05-14 15:57:56 +03:00
4c618c0826 Web: Client: added confirm loader HOC 2021-05-14 15:57:00 +03:00
c4df455587 Web: Client: created confirm store 2021-05-14 15:54:03 +03:00
Alexey Kostenko
d2b51b4672 Web: Client: Removed the ability to add the portal owner to the list of administrators 2021-05-14 15:53:02 +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
124ea0aa5c Web: Client: fixed translates 2021-05-14 13:58:21 +03:00
Alexey Kostenko
1d036e33d6 Merge branch 'develop' into feature/access-rights-admins 2021-05-14 13:13:34 +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
Alexey Kostenko
22f0d3bd37 Web: Client: Do not show the owner of the portal on the admins page 2021-05-14 12:50:09 +03:00
85bd971735 Merge branch 'develop' into feature/translations 2021-05-14 12:07:48 +03:00
eb628d3703 Merge branch 'develop' into bugfix/enable-favorites-recent-settings 2021-05-14 11:34:10 +03:00
Artem Tarasov
7747bf50b1
Merge pull request #254 from ONLYOFFICE/bugfix/fixed-header-loader
Bugfix/fixed header loader
2021-05-14 11:32:29 +03:00
1a58007fcd Web: Common: removed custom selection frame 2021-05-14 11:21:59 +03:00
ef085ef7df Web: Files: enable favorites and recent settings 2021-05-14 11:08:57 +03:00
f4e8ddc33b Merge branch 'develop' into bugfix/fixed-header-loader 2021-05-14 10:45:15 +03:00
359ead6b85 Files: added RecentSection, FavoritesSection 2021-05-13 20:25:49 +03:00
Alexey Kostenko
4300861abf Web: Client: Show all available modules in the settings, request for admins list only on the componentDidMount, added onFullAccessToggle method 2021-05-13 18:35:19 +03:00
67e166772c Web: People: MyProfile: Added setModuleInfo 2021-05-13 18:20:24 +03:00
0d98b05210 Web: Files: fixed icons clickability 2021-05-13 16:57:10 +03:00
75a603f439 Web: Files: removed useless code 2021-05-13 15:39:44 +03:00
acccdfbda5 Web: Files: fixed setSelectedFolder 2021-05-13 15:39:18 +03:00
7ad62ded2b Auth: fix confirm 2021-05-13 14:02:33 +03:00
d7d22a9369 Web: People: Disabled editing of UserType and Group in MyProfile with action=edit 2021-05-13 13:43:45 +03:00
3db2963106 Web: People: Added transition back from MyProfile with action=edit 2021-05-13 13:08:30 +03:00
bb48586343 Web: People: Added transition back from MyProfile 2021-05-13 13:03:36 +03:00
f5b242e957 Web: People: Added transition to edit page from MyProfile 2021-05-13 12:56:11 +03:00
d01db1eed6 Merge branch 'feature/remove-wq' of github.com:ONLYOFFICE/AppServer into feature/remove-wq
# Conflicts:
#	common/ASC.Data.Storage/Encryption/EncryptionOperation.cs
#	common/ASC.Data.Storage/Encryption/EncryptionServiceNotifier.cs
#	common/ASC.Data.Storage/Encryption/EncryptionWorker.cs
#	common/ASC.Data.Storage/StaticUploader.cs
#	common/services/ASC.Data.Backup/BackupAjaxHandler.cs
#	common/services/ASC.Data.Backup/Service/BackupService.cs
#	web/ASC.Web.Api/Controllers/SettingsController.cs
2021-05-13 11:57:40 +03:00
16deb72acc Web: People: MyProfile refactoring 2021-05-13 11:26:55 +03:00
28cbbc1671 Web: Added allowForMe for Route My 2021-05-13 11:26:11 +03:00
6867ded281 Merge branch 'develop' into feature/remove-wq
# Conflicts:
#	common/ASC.Common/DIHelper.cs
#	common/ASC.Common/Threading/DistributedTaskQueue.cs
#	common/ASC.Common/Threading/Progress/ProgressQueue.cs
#	common/ASC.Common/Threading/Workers/WorkerQueue.cs
#	common/ASC.Data.Reassigns/QueueWorker.cs
#	common/ASC.Data.Reassigns/ReassignProgressItem.cs
#	common/ASC.Data.Reassigns/RemoveProgressItem.cs
#	common/ASC.Data.Storage/StaticUploader.cs
#	common/ASC.Data.Storage/StorageUploader.cs
#	common/services/ASC.Data.Backup/BackupServiceLauncher.cs
#	common/services/ASC.Data.Backup/Service/BackupService.cs
#	common/services/ASC.Data.Backup/Service/BackupWorker.cs
#	common/services/ASC.Data.Backup/Startup.cs
#	common/services/ASC.Data.Storage.Encryption/EncryptionOperation.cs
#	common/services/ASC.Data.Storage.Encryption/EncryptionWorker.cs
#	products/ASC.Files/Core/Services/WCFService/FileOperations/FileOperationsManager.cs
#	products/ASC.Files/Core/Utils/FileMarker.cs
#	products/ASC.People/Server/Startup.cs
#	web/ASC.Web.Core/Users/UserPhotoManager.cs
2021-05-13 11:23:44 +03:00
710e3db4c5 Web: People: Added new component "people/MyProfile" for users without "People" module access 2021-05-13 10:55:31 +03:00
5747743641
Merge pull request #251 from ONLYOFFICE/bugfix/selectable-group-fix
Web: Common: fixed clickability for mobile devices
2021-05-12 17:14:37 +03:00
f05147eb29 Web: Common: fixed clickability for mobile devices 2021-05-12 16:53:40 +03:00
Alexey Kostenko
7ae752b86e Web: Client: Added ModalDialog, removed unused code 2021-05-12 16:51:50 +03:00
058096699f
Merge pull request #250 from ONLYOFFICE/bugfix/media-viewer
Bugfix/media viewer
2021-05-12 16:32:13 +03:00
d5163fe61c Web: Files: fixed closing MediaViewer 2021-05-12 16:08:20 +03:00