65378cc089
Merge branch 'develop' into feature/personal
...
# Conflicts:
# products/ASC.CRM/Client/public/index.html
# products/ASC.Calendar/Client/public/index.html
# products/ASC.Files/Client/public/index.html
# products/ASC.Files/Client/src/HOCs/withFileActions.js
# products/ASC.Files/Client/src/components/panels/UploadPanel/FileRow.js
# products/ASC.Files/Client/src/pages/Home/index.js
# products/ASC.Mail/Client/public/index.html
# products/ASC.People/Client/public/index.html
# products/ASC.People/Client/src/pages/Profile/Section/Body/ProfileInfo/ProfileInfo.js
# products/ASC.People/Client/src/pages/Profile/Section/Body/index.js
# products/ASC.People/Client/src/pages/ProfileAction/Section/Body/updateUserForm.js
# products/ASC.Projects/Client/public/index.html
2021-06-15 11:49:39 +03:00
8305c30348
Merge pull request #278 from ONLYOFFICE/feature/restore-files-convertation
...
Feature/restore files convertation
2021-06-11 18:41:37 +03:00
a66e3afa92
Web: Tests: Commented "Save empty 'EN' keys to not found files"
2021-06-11 18:18:38 +03:00
4a154db396
Web: removed useless translations
2021-06-11 18:07:51 +03:00
5db2e8a868
Merge branch 'develop' into feature/restore-files-convertation
2021-06-11 17:50:28 +03:00
1927c9f9d6
Merge pull request #273 from ONLYOFFICE/bugfix/fixed-styles
...
Bugfix/fixed styles
2021-06-11 17:48:43 +03:00
52214ade4b
Web: Common: Slowed down TopLoaderService show
2021-06-11 17:29:29 +03:00
68f880254e
Web: Files: added dialog for converting to context actions
2021-06-11 17:20:38 +03:00
Artem Tarasov
d44f1bee0f
Web: fixed loading people/my, fixed Loaders.ProfileView, deleted unnecessary code
2021-06-11 16:57:17 +03:00
e074c0cf93
Web: Files: changed color of conversion
2021-06-11 16:56:43 +03:00
92f317768e
Merge branch 'develop' into feature/restore-files-convertation
2021-06-11 16:44:15 +03:00
ef59a2ac47
Web: Files: added hideConfirmConvert setting
2021-06-11 15:49:32 +03:00
e0d076a7bc
Merge branch 'develop' into feature/restore-files-convertation
2021-06-11 15:17:35 +03:00
Artem Tarasov
f181a491fb
Merge branch 'develop' into bugfix/fixed-styles
2021-06-11 14:56:52 +03:00
Artem Tarasov
1073da9d58
Web: deleted unnecessary code
2021-06-11 14:55:53 +03:00
637be57e84
People: resize fix
2021-06-11 14:48:49 +03:00
6b1656ff10
Files: settings
2021-06-11 14:33:07 +03:00
61e957d00a
Files: added /subfolders request
2021-06-11 14:24:01 +03:00
Artem Tarasov
81b778765f
Web: People: navigation profile fix
2021-06-11 14:04:26 +03:00
Artem Tarasov
74fba5c2de
Web: People: fixed loading Profile, ProfileAction, fixed navigation between them
2021-06-11 13:25:09 +03:00
bac090e180
Merge branch 'develop' into feature/personal
...
# Conflicts:
# products/ASC.People/Client/src/pages/Profile/Section/Body/index.js
2021-06-11 13:11:08 +03:00
864ef2ff64
Web: Files: changed the logic of opening the folder tree
2021-06-11 12:50:33 +03:00
a9e55b49ec
Web: Files: hid the display of folders for the recycle bin
2021-06-11 12:04:23 +03:00
fc9d626bcc
UrlShortenerService: fix log
2021-06-11 11:44:10 +03:00
64b6c973b1
Web: Files: fixed conversion
2021-06-10 20:18:30 +03:00
Sergey Kirichenko
7dc8889e2f
Fix building image ASC.Socket.IO.Svc ( #276 )
2021-06-10 18:18:07 +03:00
Vladislav Makhov
87c8da2355
web:components: change config
2021-06-10 18:06:25 +03:00
9bb8e9bd1d
Web: Files: fixed getConversationPercent
2021-06-10 17:33:50 +03:00
Vladislav Makhov
c10b131cc1
Merge branch 'feature/personal' of github.com:ONLYOFFICE/AppServer into feature/personal
2021-06-10 17:20:30 +03:00
Vladislav Makhov
98d9881ef1
web: components: add snackbar
2021-06-10 17:20:09 +03:00
ed161258c3
Files: fix convert
2021-06-10 15:54:05 +03:00
Sergey Kirichenko
82b3109fbc
Fix building ASC.Files image ( #275 )
2021-06-10 15:42:04 +03:00
7501e91ae3
Web: Client: Files: Fixed share option for not edited items
2021-06-10 14:19:26 +03:00
ebe55a792a
Merge pull request #274 from ONLYOFFICE/feature/access-rights-admins
...
Feature/access rights admins
2021-06-10 12:56:35 +03:00
cf125330f1
Web: Server: Settings: Revert DocStore
2021-06-10 12:24:53 +03:00
7c7d548825
Merge branch 'develop' into feature/access-rights-admins
2021-06-10 11:50:49 +03:00
e257012a9a
Notify: fix
2021-06-10 11:47:58 +03:00
3c48d4661d
Merge branch 'develop' into feature/access-rights-admins
2021-06-10 11:45:52 +03:00
1d9e49b88f
Web: Client: Settings: Fixed translation keys
2021-06-10 11:31:47 +03:00
a9cb51056b
Add support docker installation ( #271 )
...
* Fix removing old packages in rpm
* Add script downloads from github
* Add oneclickinstall by using docker
* Add a common script to select the installation
* Correction file name
* Add a reconfigure
* Edit download files
* Add a parameter for silent download
* Change the external port configuration
* Add the dotnet_env variable
* Add password generation
* Add invalid character filtering
* Change the copyright
* Change the copyright
* Add the local scripts parameter
* Minor fixes
* Copyright correction
2021-06-09 18:48:42 +03:00
a47b94bd7f
Web: Files: removed useless uploadStatus, fixed upload bugs
2021-06-09 17:52:28 +03:00
fbb480671b
Web: Client: fixed translates
2021-06-09 17:30:10 +03:00
a3c5eea477
Web: Client: deleted unused translations key
2021-06-09 17:16:37 +03:00
ff5ea3019b
Web: Client: added select all
2021-06-09 16:42:43 +03:00
026ceec20c
Web: Client: fixed
2021-06-09 16:18:06 +03:00
52cb1f3896
Merge branch 'develop' into feature/access-rights-admins
2021-06-09 15:11:38 +03:00
8d80955686
Thumbnail: fix
2021-06-09 15:04:29 +03:00
fdc71ec359
Merge branch 'feature/restore-files-convertation' of github.com:ONLYOFFICE/AppServer into feature/restore-files-convertation
2021-06-09 15:02:44 +03:00
29733f0ace
Wen: Files: fixed upload panel style
2021-06-09 15:02:24 +03:00
59bab6a085
Web: Files: fixed conversion progress
2021-06-09 13:28:22 +03:00
