Artem Tarasov
ee4760e899
Merge branch 'develop' into feature/thumbnails
...
# Conflicts:
# products/ASC.Files/Client/src/HOCs/withFileActions.js
2021-06-11 18:30:44 +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
Artem Tarasov
d44f1bee0f
Web: fixed loading people/my, fixed Loaders.ProfileView, deleted unnecessary code
2021-06-11 16:57:17 +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
fc9d626bcc
UrlShortenerService: fix log
2021-06-11 11:44:10 +03:00
Sergey Kirichenko
7dc8889e2f
Fix building image ASC.Socket.IO.Svc ( #276 )
2021-06-10 18:18:07 +03:00
Sergey Kirichenko
82b3109fbc
Fix building ASC.Files image ( #275 )
2021-06-10 15:42:04 +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
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
82fddadd6d
Web: Client: fixed tooltip color
2021-06-09 04:03:18 +03:00
93c2f7fb07
Web: Component: added tooltipColor for help button
2021-06-09 04:02:58 +03:00
6fcddbcefa
Web: Components: added color for tooltip
2021-06-09 04:02:28 +03:00
4fcd83ae6d
Web: Client: fixed translate
2021-06-09 03:31:52 +03:00
20a1869cfd
Web: Client: fixed label
2021-06-09 03:10:38 +03:00
bc46acebcc
Web: Client: bringing code to common style
2021-06-09 02:57:11 +03:00
5ea562e996
Web: Client: fixed translations
2021-06-09 02:43:07 +03:00
167ca1fbb5
Web: Client: fixed loading
2021-06-09 00:39:08 +03:00
9019b36951
Web: Client: moved pages in sub-components
2021-06-09 00:33:04 +03:00
db21597f17
Web: Client: fixed access portal urls
2021-06-09 00:30:19 +03:00
3db9fde5aa
Web: Client: fixed title
2021-06-09 00:25:45 +03:00
b7ce4a35e7
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/access-rights-admins
...
# Conflicts:
# products/ASC.Files/Server/DocStore
# web/ASC.Web.Client/public/locales/en/Settings.json
# web/ASC.Web.Client/public/locales/ru/Settings.json
# web/ASC.Web.Client/src/components/pages/Settings/categories/security/sub-components/admins.js
# web/ASC.Web.Client/src/components/pages/Settings/index.js
2021-06-09 00:23:12 +03:00
Artem Tarasov
3db9b30e5e
Merge branch 'develop' into bugfix/fixed-styles
...
# Conflicts:
# products/ASC.People/Client/src/pages/Profile/Section/Body/index.js
2021-06-08 17:58:29 +03:00
f72e40357b
Merge pull request #261 from ONLYOFFICE/feature/two-factor-auth
...
Feature/two factor auth
2021-06-08 17:46:04 +03:00
93ba9c5940
Web: People: change trans on t
2021-06-08 16:09:51 +03:00
783bedffbb
Web: Client: deleted unused image
2021-06-08 16:06:07 +03:00
d9b4611517
added ResetApplication translations in Common
2021-06-08 15:30:11 +03:00
18cdf1dc95
Web: People: fixed translations
2021-06-08 15:29:44 +03:00
Artem Tarasov
c25fa589a9
Web: People: deleted fonts with ext .woff, added hash to font name
2021-06-08 15:26:56 +03:00
65936fb856
Web: People: fixed translations
2021-06-08 15:25:26 +03:00
d881c48b4b
Web: Client: fixed translations
2021-06-08 15:20:03 +03:00
6a06707d18
Web: People: fixed translations
2021-06-08 15:19:49 +03:00
27e6226e66
Web: People: get backupCodes from tfa store
2021-06-08 14:19:55 +03:00
