|
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 |
|
Timofey
|
c6c651974d
|
Web:Common:PageLayout: update margin for section filter components
|
2022-01-20 20:05:53 +08:00 |
|
Timofey
|
61222c04fe
|
Web:Common:NewFilterInput: init new filter input
|
2022-01-20 20:05:07 +08:00 |
|
|
6c72436a03
|
Merge branch 'develop' into feature/mobile-main-button
|
2022-01-20 14:25:05 +03:00 |
|
Dmitry Kulak
|
5098ea1079
|
Web: Files: Tiles: Loaders: Fixed number of loaders on smartphones
|
2022-01-19 11:34:32 +03:00 |
|
Dmitry Kulak
|
e014ff614e
|
Web: Files: Tiles: Loaders aligned with content, fixes
|
2021-12-30 10:55:16 +03:00 |
|
|
441d8875ba
|
Web:Common:Store: change default theme
|
2021-12-29 23:14:21 +08:00 |
|
Dmitry Kulak
|
b5bcf38456
|
Merge remote-tracking branch 'origin/develop' into feature/redesign-tiles
|
2021-12-29 15:48:41 +03: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 |
|
Dmitry Kulak
|
57c2460c3e
|
Web: Files: Tiles: Redesign, refactoring
|
2021-12-27 18:46:26 +03: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 |
|
gectokot
|
4f334432e5
|
Web: Files: Tiles: Different number of loaders on different screens
|
2021-12-23 12:32:49 +03:00 |
|
Dmitry Kulak
|
1f4ce11734
|
Web: Files: Tiles: Loaders redesign
|
2021-12-23 12:32:46 +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 |
|
|
a012038f3b
|
Merge branch 'develop' into feature/catalog
|
2021-12-02 14:59:31 +08:00 |
|
|
7a00dba491
|
Merge branch 'develop' into feature/navigation
|
2021-12-02 14:53:42 +08: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 |
|
Artem Tarasov
|
f33d99c9c0
|
Web: People/Common: added sorting of groups in the tree
|
2021-11-16 19:27:27 +03:00 |
|
|
39c3d57781
|
Web: Common: AuthStore: Added reset auth-store after login with app code
|
2021-11-15 14:29:02 +03:00 |
|
|
f06283bb1a
|
Fix displayName of current user after creation/update if user's display name with diacritics
|
2021-11-13 20:18:58 +03:00 |
|
|
0bd634dd16
|
Web: Files: added className for tree root folders
|
2021-11-12 15:36:56 +03:00 |
|
|
3809273075
|
bump version to 1.1.0
|
2021-11-12 15:19:40 +03:00 |
|
|
2b5e4bad38
|
Merge branch 'hotfix/v1.0.1' of github.com:ONLYOFFICE/AppServer into hotfix/v1.0.1
|
2021-11-11 15:37:31 +03:00 |
|
|
2ea63910a2
|
Web: Added encoding/decoding operations for string file ids. Fixed errors with opening folders and files with string id s
|
2021-11-11 15:37:23 +03:00 |
|
|
3a03d65ed9
|
Merge branch 'hotfix/v1.0.1' of github.com:ONLYOFFICE/AppServer into hotfix/v1.0.1
|
2021-11-11 13:49:08 +03:00 |
|
|
53cb6827b4
|
Fix Bug 53360: Client.Files.Image - Removed the render when opening and closing the file delete dialog.
|
2021-11-11 13:48:47 +03:00 |
|
|
04d3d5253f
|
Fix displayName of current user after changing culture of Profile
|
2021-11-10 21:31:39 +03:00 |
|
|
11769e8c9e
|
Fix Bug 53180 - Client: Profile. Error «.../pt/Common.json 404» on pt-BR language.
|
2021-11-10 19:59:03 +03:00 |
|
|
e917b4bb56
|
Fix Bug 53454 - Client: Sign out. Error on api/2.0/people/@self.json
|
2021-11-10 15:52:36 +03:00 |
|
|
f5da85049c
|
Fix Bug 53524 - Client.Profile|List: User's display name with diacritics invalid
|
2021-11-09 19:32:15 +03:00 |
|
|
677f7d73e3
|
Web: Common: Api: Added encoding for string folderId
|
2021-11-09 17:55:27 +03:00 |
|
|
56d16ac2f4
|
Merge pull request #437 from ONLYOFFICE/feature/files-upload
Web: Files: fixed files upload
|
2021-11-08 15:38:45 +03:00 |
|
|
5c5db26dc4
|
Web: Files: removed unused code
|
2021-11-08 14:04:52 +03:00 |
|
|
a876ce8b67
|
Web:Common:PageLayout: add catalog in readme and storybook
|
2021-11-08 17:23:56 +08:00 |
|
|
5d953407ad
|
Merge branch 'hotfix/v1.0.1' into feature/desktop-login
|
2021-11-03 16:55:44 +03:00 |
|
|
f1f42a88ae
|
Merge branch 'hotfix/v1.0.1' into feature/desktop-login
|
2021-11-03 15:44:23 +03:00 |
|
|
bf4126cc0e
|
Web: Deleted console.log.
|
2021-11-03 15:25:04 +03:00 |
|
|
773419f3ef
|
Web: Common: AuthStore: Added added url at response parameters
|
2021-11-03 12:18:28 +03:00 |
|
|
da8e34930f
|
Web: Added prop.
|
2021-11-03 11:59:54 +03:00 |
|
|
2d60dbee1b
|
Merge branch 'hotfix/v1.0.1' into bugfix/Bug53416
# Conflicts:
# packages/asc-web-common/components/PageLayout/sub-components/section-body.js
|
2021-11-03 11:58:56 +03:00 |
|
|
71febf0a3e
|
Web:Common:Navigation: fix drop-box position on tablet
|
2021-11-03 16:52:35 +08:00 |
|
|
a99111b6f6
|
Web:Common:Navigation: remove x-scrollbar on tablet and mobile
|
2021-11-03 15:52:10 +08:00 |
|
|
3d9bda87b0
|
Web:Common:Navigation: remove x-scrollbar on tablet and mobile
|
2021-11-03 15:49:15 +08:00 |
|
|
72adefec39
|
Web: Deleted useless code after Cherry Pick.
|
2021-11-03 10:35:03 +03:00 |
|
|
706913275c
|
Web: Common: PageLayout: Fixed error "Cannot read properties of null (reading 'focus')".
|
2021-11-03 09:57:56 +03:00 |
|
|
06437454a8
|
Web: Deleted useless code.
|
2021-11-03 09:57:55 +03:00 |
|
|
6fb6f3db60
|
Web: SectionBody: Deleted useless code.
|
2021-11-03 09:57:53 +03:00 |
|
|
6cf7c6d43e
|
Web: Common: PageLayout: Refactoring, deleted useless code.
# Conflicts:
# packages/asc-web-common/components/PageLayout/sub-components/section-body.js
|
2021-11-03 09:57:51 +03:00 |
|
|
76b4251559
|
Web: Files: VersionHistoryPanel: Deleted body scroll? fixed styles.
# Conflicts:
# packages/asc-web-common/components/PageLayout/sub-components/section-body.js
|
2021-11-03 09:57:12 +03:00 |
|
|
44f2a1c17f
|
Web: Common: Fixed styles for body list without scroll.
# Conflicts:
# packages/asc-web-common/components/PageLayout/sub-components/section-body.js
|
2021-11-03 09:54:16 +03:00 |
|
|
7c9e875ff3
|
Merge branch 'hotfix/v1.0.1' into bugfix/Bug53416
|
2021-11-02 18:42:55 +03:00 |
|
|
5759758f71
|
Bug 53416 - Client.Files.Desktop: Fixed scrolls under Ubuntu.
|
2021-11-02 18:41:33 +03:00 |
|
|
4127fae876
|
Merge branch 'hotfix/v1.0.1' of github.com:ONLYOFFICE/AppServer into hotfix/v1.0.1
|
2021-11-02 17:52:53 +03:00 |
|
|
e5e5f267c2
|
Web: Common: fixed mediaPlayerClose cursor style
|
2021-11-02 17:51:44 +03:00 |
|
|
20e59a7cbe
|
Web: Common: changed media-viewer icons, fixed media styles
|
2021-11-02 17:51:44 +03:00 |
|
|
68a8683e13
|
Merge branch 'develop' into feature/navigation
|
2021-11-02 22:46:04 +08:00 |
|
|
c32e4999b4
|
Merge branch 'develop' into feature/navigation
|
2021-11-02 22:45:25 +08:00 |
|
|
d37aa52f09
|
Merge branch 'develop' into feature/catalog
|
2021-11-02 21:04:46 +08:00 |
|
|
4e018d2d71
|
Web: Bump version to 1.0.1
|
2021-11-02 14:02:46 +03:00 |
|
|
3f532f6765
|
Merge branch 'develop' into feature/mobile-main-button
|
2021-11-02 13:36:34 +05:00 |
|
|
886e1baf89
|
Web: Common: added icons in floating button
|
2021-11-02 13:30:33 +05:00 |
|
|
8cc08045b7
|
Merge branch 'master' into develop
# Conflicts:
# packages/asc-web-common/components/PageLayout/sub-components/section-header.js
# packages/asc-web-components/combobox/index.js
# packages/asc-web-components/table-container/StyledTableContainer.js
# packages/asc-web-components/table-container/TableGroupMenu.js
# packages/asc-web-components/table-container/TableHeader.js
# products/ASC.Files/Client/src/pages/Home/Section/Header/index.js
# products/ASC.Files/Client/src/store/FilesStore.js
# products/ASC.Files/Core/Core/Search/FactoryIndexerFile.cs
|
2021-11-01 13:54:40 +03:00 |
|
|
1f5fea8f81
|
Web: Common: fixed mediaPlayerClose cursor style
|
2021-10-28 14:43:20 +03:00 |
|