Commit Graph

680 Commits

Author SHA1 Message Date
Timofey
d83808142a Web:Common:Loaders: add support dark-theme for tile loader 2022-01-21 22:40:29 +08:00
Timofey
47974e378f Merge branch 'develop' into feature/dark-theme 2022-01-21 19:31:48 +08:00
Timofey
cfb4818b1e Web:Common:FloationgButton: add props variable 2022-01-20 23:46:46 +08:00
Timofey
84aabef8e7 Web:Common: update dark theme after merge branch 'develop' 2022-01-20 23:45:33 +08:00
Timofey
4598d238e5 Web:Components: update dark theme after merge branch 'develop' 2022-01-20 23:29:09 +08:00
Timofey
e5f06b932d Merge branch 'develop' into feature/dark-theme 2022-01-20 21:18:30 +08:00
99105f5d73 Merge branch 'develop' into component-tooltips
# Conflicts:
#	packages/asc-web-components/icon-button/index.js
#	products/ASC.Files/Client/public/locales/de/Article.json
#	products/ASC.Files/Client/public/locales/de/Translations.json
#	products/ASC.Files/Client/public/locales/en/Article.json
#	products/ASC.Files/Client/public/locales/en/Translations.json
#	products/ASC.Files/Client/public/locales/fr/Article.json
#	products/ASC.Files/Client/public/locales/fr/Translations.json
#	products/ASC.Files/Client/public/locales/it/Article.json
#	products/ASC.Files/Client/public/locales/it/Translations.json
#	products/ASC.Files/Client/public/locales/pt-BR/Article.json
#	products/ASC.Files/Client/public/locales/pt-BR/Translations.json
#	products/ASC.Files/Client/public/locales/ro/Article.json
#	products/ASC.Files/Client/public/locales/ro/Translations.json
#	products/ASC.Files/Client/public/locales/ru/Article.json
#	products/ASC.Files/Client/public/locales/ru/Translations.json
#	products/ASC.Files/Client/public/locales/sk/Article.json
#	products/ASC.Files/Client/public/locales/sk/Translations.json
2022-01-20 15:45:24 +03:00
6c72436a03
Merge branch 'develop' into feature/mobile-main-button 2022-01-20 14:25:05 +03:00
441d8875ba Web:Common:Store: change default theme 2021-12-29 23:14:21 +08:00
0ad204743f Merge branch 'develop' into feature/dark-theme 2021-12-29 20:25:29 +08:00
bedfad1ec5 Merge branch 'master' into develop
# Conflicts:
#	common/ASC.Core.Common/Caching/CachedUserService.cs
#	common/ASC.Core.Common/Migrations/MySql/FilesDbContextMySql/20211012145330_FilesDbContextMySql.cs
#	common/ASC.Core.Common/Migrations/PostgreSql/FilesDbContextPostgreSql/20211012145331_FilesDbContextPostgreSql.Designer.cs
#	common/ASC.Core.Common/Migrations/PostgreSql/FilesDbContextPostgreSql/20211012145331_FilesDbContextPostgreSql.cs
#	common/ASC.Core.Common/Migrations/PostgreSql/FilesDbContextPostgreSql/PostgreSqlFilesDbContextModelSnapshot.cs
#	products/ASC.Files/Client/src/pages/Home/Section/Header/index.js
#	products/ASC.Files/Client/src/store/DialogsStore.js
#	products/ASC.Files/Client/src/store/FilesActionsStore.js
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/TagDao.cs
#	products/ASC.Files/Core/Core/EF/FilesDbContext.cs
#	products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveStorage.cs
#	products/ASC.Files/Core/Migrations/MySql/FilesDbContextMySql/MySqlFilesDbContextModelSnapshot.cs
#	products/ASC.Files/Server/DocStore
#	web/ASC.Web.Api/Controllers/SettingsController.cs
#	web/ASC.Web.Core/Tfa/TfaManager.cs
2021-12-28 18:21:44 +03:00
f129a98d93 Web:Common:Store: add array for available themes 2021-12-28 21:35:47 +08:00
2140ccff0b Web:Client: add the ability to get default theme from browser theme and save it in local storage 2021-12-28 19:01:03 +08:00
25ee05f38a Web:Common:FilterInput: fix fill and stroke color for filter button in dark and base themes 2021-12-28 17:58:56 +08:00
ee839e8169 Web:Common:PageLayout: change background-color and fill for section toggler button in dark-theme 2021-12-28 16:52:37 +08:00
d46679e9bb Web:Common:PageLayout: add support dark-theme for section 2021-12-25 00:50:45 +08:00
b45e7a26ae Web:Common:MediaViewer: add support dark-theme 2021-12-25 00:43:52 +08:00
d7b98e875b Web:Common:Header: add support dark-theme for loader 2021-12-24 19:44:37 +08:00
6f6ea8eca8 Web:Common:FloatingButton: add support dark-theme 2021-12-24 19:36:24 +08:00
f3821d18f6 Web:Common:AdvancedSelector:add support dark-theme 2021-12-24 19:25:35 +08:00
440811e931 Web: Added convertLanguage for compatibility 2021-12-23 14:01:08 +03:00
6fde793f14 Web:add opportunity change theme in profile menu 2021-12-22 22:22:35 +08:00
6d84bd5f04 Merge branch 'release/v1.1.0' into feature/translate-1.1.0 2021-12-15 17:22:17 +03:00
00865480dd Web:Common:FilterInput: add support dark-theme 2021-12-14 17:45:09 +08:00
e7854ed5d8 Web:Common:PageLayout:Article: add support dark-theme 2021-12-14 16:14:36 +08:00
04ff7308b8 Web:Common:Store: add theme support 2021-12-14 15:52:49 +08:00
39f172bd22 Merge branch 'release/v1.1.0' of github.com:ONLYOFFICE/AppServer into release/v1.1.0 2021-12-13 17:58:34 +03:00
530d1a18a8 Web: Api: Added property for setEncryptionKeys 2021-12-13 17:58:25 +03:00
9269594b8a Web: DesktopEditors mode: Added more logs 2021-12-13 01:32:47 +03:00
2afce477b1 Web: Common: Removed useless code. 2021-12-10 09:30:11 +03:00
51b7921ed4 Web: Edit: Added doc property to api methods for history versions.
# Conflicts:
#	packages/asc-web-common/api/files/index.js
2021-12-08 16:30:26 +03:00
d5a77379b3 Web: Editor: Added api method for restore document version. 2021-12-08 16:28:30 +03:00
317750f909 Web: Added api methods.
# Conflicts:
#	packages/asc-web-common/api/files/index.js
2021-12-08 16:28:25 +03:00
c44f580681 Fix issues of UselessModuleTranslationKeysTest 2021-12-07 13:04:06 +03:00
907877b08a Web: Common: delete filter button title 2021-12-02 13:08:33 +05:00
27e732e9a3 Web: Login: Added usage of new API /authentication.json parameter "session" 2021-12-01 10:56:50 +03:00
626ad87077
Merge pull request #469 from ONLYOFFICE/feature/make-form
Feature/make form
2021-11-30 11:36:23 +03:00
7f39ebd499 Web: Files: SelectFileDialog: Fixed loaders according layouts. 2021-11-30 10:11:49 +03:00
5bb3602964 Web: Common: Api: Fixed copyAs api call params 2021-11-30 08:20:55 +03:00
0b9a9b633d Web: Common: Api: Added fileCopyAs action 2021-11-29 16:31:40 +03:00
08746974f4 Web: SW: Added SW unregister + refactoring 2021-11-25 15:08:18 +03:00
2f21f2246a
Merge branch 'develop' into feature/mobile-main-button 2021-11-22 16:39:22 +03:00
54a58916ed Web: Common: Filter: fixed multiple api request 2021-11-22 16:29:32 +03:00
52626a548e Web: fixed Snackbar styles 2021-11-22 15:01:33 +03:00
f675415228 Merge branch 'master' into release/v1.1.0
# Conflicts:
#	lerna.json
#	packages/asc-web-common/package.json
#	packages/asc-web-components/package.json
#	packages/browserslist-config-asc/package.json
#	packages/debug-info/package.json
#	products/ASC.CRM/Client/package.json
#	products/ASC.Calendar/Client/package.json
#	products/ASC.Files/Client/package.json
#	products/ASC.Files/Client/public/locales/en/SelectFile.json
#	products/ASC.Files/Client/public/locales/en/SelectFolder.json
#	products/ASC.Files/Client/public/locales/en/Translations.json
#	products/ASC.Files/Client/public/locales/ru/Translations.json
#	products/ASC.Files/Client/src/components/Article/MainButton/index.js
#	products/ASC.Mail/Client/package.json
#	products/ASC.People/Client/package.json
#	products/ASC.People/Client/public/locales/en/Translations.json
#	products/ASC.People/Client/public/locales/ru/Translations.json
#	products/ASC.People/Client/src/components/Article/MainButton/index.js
#	products/ASC.People/Client/src/pages/ProfileAction/Section/Body/createUserForm.js
#	products/ASC.Projects/Client/package.json
#	web/ASC.Web.Client/package.json
#	web/ASC.Web.Editor/package.json
#	web/ASC.Web.Login/package.json
2021-11-21 14:26:20 +03:00
d31ea87211 Merge branch 'master' into develop
# Conflicts:
#	packages/asc-web-common/components/PageLayout/sub-components/section-body.js
#	packages/asc-web-components/table-container/TableHeaderCell.js
#	products/ASC.Files/Client/src/components/panels/SharingPanel/index.js
#	products/ASC.Files/Client/src/store/FilesActionsStore.js
#	products/ASC.Files/Client/src/store/UploadDataStore.js
2021-11-21 13:57:55 +03:00
2eb6843e46 Web: Editor: Added conditions for creating a file in my documents folder when filling out a form. 2021-11-19 10:28:57 +03:00
a4e21a2319 Web: Component: Added modal dialog height property. 2021-11-18 15:24:28 +03:00
9e4b29a136 Web: Common: Api: Added new data parameters 2021-11-17 16:36:50 +03:00
b28acbe943 Web: Common: added color prop for floating button 2021-11-17 17:37:01 +05:00