|
889e0e31de
|
Web: Common: moved main-bar over section header
|
2022-01-25 20:29:13 +05:00 |
|
|
ef6682ab32
|
Web:Files:Added check for open MediaViewer. Added checkURLchange function to MediaViewer.
|
2022-01-25 18:20:59 +03:00 |
|
|
e810605a4d
|
Web: Socket: Fix proxy ws by web:hub:url (appsettings.json)
|
2022-01-25 12:54:21 +03:00 |
|
Timofey
|
f955bea115
|
Web:Client:Components: fixed product name color for dark and base theme
|
2022-01-25 16:32:35 +08:00 |
|
Timofey
|
55fe7bd155
|
Web:Common:PageLayout: fixed background and fill color for section toggler in dark theme
|
2022-01-25 16:17:12 +08:00 |
|
Timofey
|
72c5c93737
|
Web: add theme support from props
|
2022-01-24 23:27:24 +08:00 |
|
|
00a4851ebf
|
Web: Common: deleted getBarHtml function
(cherry picked from commit 990eaaf8a32dca24ef51c39f67458136a689d51a)
|
2022-01-24 18:50:06 +05:00 |
|
|
f1dccd9708
|
Web: Common: created checkBar and getBar function
(cherry picked from commit 954ad6c950f6b1428d5a5f6c0b75cd3e699f4326)
|
2022-01-24 18:46:21 +05:00 |
|
|
88a5b319cd
|
Web: Common: added section bar component
|
2022-01-24 18:44:20 +05:00 |
|
|
b25f339c3e
|
Merge branch 'hotfix/v1.1.1' into feature/socket-io
|
2022-01-24 15:43:04 +03:00 |
|
Timofey
|
4dd1237974
|
Web:Common:ErrorContainer: add change theme in index.js and fixed height to 100vh
|
2022-01-24 20:03:19 +08:00 |
|
Timofey
|
57f5caba85
|
Web:Common:ErrorContainer: add support dark-theme
|
2022-01-24 18:48:24 +08:00 |
|
|
57c1084b87
|
Web: Common: refactoring
|
2022-01-22 01:47:37 +03:00 |
|
|
ee2fd6bb0f
|
Web:Files:Added a check for the absence of other pictures in the playlist for moving through the picture via a direct link in MediaViewer.
|
2022-01-21 19:21:29 +03:00 |
|
|
a66964e0b8
|
Merge branch 'hotfix/v1.1.1' of github.com:ONLYOFFICE/AppServer into hotfix/campaigns-banner
|
2022-01-21 18:46:20 +03:00 |
|
|
f838f5c6da
|
Web: Common: fix methods in firebase config
|
2022-01-21 18:26:34 +03:00 |
|
|
ff5667fe07
|
Web: Common/People: delete useless
|
2022-01-21 18:25:31 +03:00 |
|
Timofey
|
d83808142a
|
Web:Common:Loaders: add support dark-theme for tile loader
|
2022-01-21 22:40:29 +08:00 |
|
Dmitry Kulak
|
b740a4d00a
|
Merge branch 'develop' into feature/redesign-tiles
# Conflicts:
# products/ASC.Files/Client/src/pages/Home/Section/Body/TilesView/sub-components/Tile.js
# products/ASC.Files/Server/DocStore
|
2022-01-21 16:47:39 +03:00 |
|
Timofey
|
f5ae02dfc9
|
Merge branch 'develop' into feature/catalog
|
2022-01-21 21:06:40 +08:00 |
|
|
efe799d712
|
Merge branch 'hotfix/v1.1.1' into feature/convert-password
# Conflicts:
# products/ASC.Files/Client/src/helpers/utils.js
|
2022-01-21 14:44:06 +03: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 |
|
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 |
|
|
0555b73c5d
|
Web: Common: fix firebase error
|
2022-01-19 16:16:01 +03:00 |
|
|
5dbe35f4d1
|
Web:Common:Сhanged history.pushState method to history.push.
|
2022-01-19 12:27:41 +03:00 |
|
|
2e0d72719e
|
Web: Files: moved db config
|
2022-01-19 12:15:23 +03:00 |
|
Dmitry Kulak
|
5098ea1079
|
Web: Files: Tiles: Loaders: Fixed number of loaders on smartphones
|
2022-01-19 11:34:32 +03:00 |
|
|
5222666d2e
|
Web:Common:Added history.pushState method to display images in MediaViewer.
|
2022-01-18 10:47:00 +03:00 |
|
|
1a8d88345a
|
Merge branch 'hotfix/v1.1.1' into feature/socket-io
# Conflicts:
# products/ASC.Files/Client/src/store/FilesStore.js
# yarn.lock
|
2022-01-17 19:02:40 +03:00 |
|
|
aa8903b0ef
|
Web: Files: Added copy method to save in 'oform' format.
|
2022-01-17 15:54:14 +03:00 |
|
|
77937390ef
|
Web: Fix crash of Wizard with default en-US language
|
2022-01-14 19:12:58 +03:00 |
|
|
6f90864ed8
|
Merge branch 'hotfix/v1.1.1' into feature/socket-io
|
2022-01-13 10:49:43 +03:00 |
|
|
8b327ceb66
|
Web: Socket.IO: Extended /api/2.0/settings with socketUrl + refactoring of client socket usage
|
2022-01-12 20:13:30 +03:00 |
|
|
0c341f0709
|
Merge branch 'hotfix/v1.1.1' into feature/convert-password
|
2022-01-11 16:14:46 +03:00 |
|
|
c7bb1a51d5
|
Fixed Bug 50858 - People. ‘Something went wrong.’ when following the back arrow from a blocked profile card
|
2022-01-10 16:24:21 +03:00 |
|
|
3c23f4d892
|
Merge branch 'hotfix/v1.1.1' into feature/convert-password
# Conflicts:
# products/ASC.Files/Client/src/components/panels/StyledPanels.js
# products/ASC.Files/Client/src/components/panels/UploadPanel/FileRow.js
# products/ASC.Files/Client/src/store/UploadDataStore.js
|
2021-12-30 14:34:49 +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 |
|
|
febf172875
|
Merge branch 'master' into hotfix/v1.1.1
# Conflicts:
# lerna.json
# packages/asc-web-common/package.json
# packages/asc-web-components/avatar-editor/index.js
# packages/asc-web-components/avatar-editor/sub-components/avatar-editor-body.js
# packages/asc-web-components/main-button/index.js
# 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/src/HOCs/withFileActions.js
# products/ASC.Files/Client/src/components/dialogs/DeleteDialog/index.js
# products/ASC.Files/Client/src/components/panels/SelectFileDialog/AsideView.js
# products/ASC.Files/Server/DocStore
# products/ASC.Mail/Client/package.json
# products/ASC.People/Client/package.json
# products/ASC.People/Client/src/pages/ProfileAction/Section/Body/updateUserForm.js
# products/ASC.Projects/Client/package.json
# web/ASC.Web.Client/package.json
# web/ASC.Web.Editor/package.json
# web/ASC.Web.Editor/src/Editor.jsx
# web/ASC.Web.Login/package.json
|
2021-12-28 13:35:02 +03: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 |
|
|
b047ae3c0b
|
Web: Common: Added password field to api method.
|
2021-12-22 12:15:56 +03:00 |
|
|
6d84bd5f04
|
Merge branch 'release/v1.1.0' into feature/translate-1.1.0
|
2021-12-15 17:22:17 +03:00 |
|
gectokot
|
e9449b5a72
|
Web: Studio: Homepage: Fixed vertical scroll appearing on mobile in landscape mode
|
2021-12-14 14:45:40 +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 |
|
|
e967b38aa3
|
Fix bug 51320: firebase error
|
2021-12-13 17:03:59 +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 |
|
|
3a50fca3cc
|
Merge branch 'hotfix/v1.1.1' into bugfix/dropdown-correct-display
|
2021-12-02 18:32:36 +05: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 |
|
|
bce51d74b6
|
Fix Bug 53438 - Client.Editor. Added redirect to homepage due to error
|
2021-11-25 16:37:36 +03:00 |
|
|
08746974f4
|
Web: SW: Added SW unregister + refactoring
|
2021-11-25 15:08:18 +03:00 |
|
|
73d3b00c07
|
Web: added missing classNames for autotests
|
2021-11-25 12:11:22 +03:00 |
|
|
465c57b8f6
|
Fixed Bug 54013 - Client.Files.Returned the ability to select elements on the About program page.
|
2021-11-24 11:09:52 +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 |
|
|
11d527ba03
|
Merge branch 'master' into hotfix/v1.1.1
# 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/src/store/FilesActionsStore.js
# products/ASC.Files/Client/src/store/UploadDataStore.js
# products/ASC.Mail/Client/package.json
# products/ASC.People/Client/package.json
# 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:40:24 +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 |
|
|
612c953ddc
|
Fixed Bug 52931 - Client. Files. Media. Fixed console error
|
2021-11-18 15:15:39 +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 |
|
|
17e3e5cb98
|
bump version to 1.1.1
|
2021-11-12 15:21:25 +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 |
|
|
6ee6f21445
|
Web: Components: Added max width of section header.
|
2021-10-28 16:13:50 +03:00 |
|
|
1f5fea8f81
|
Web: Common: fixed mediaPlayerClose cursor style
|
2021-10-28 14:43:20 +03:00 |
|
|
fe65632277
|
Web: Common: changed media-viewer icons, fixed media styles
|
2021-10-28 14:20:06 +03:00 |
|
|
c488fb0d8e
|
Web: Common: Added enableRestore api method.
|
2021-10-28 12:14:46 +03:00 |
|
|
dcb8f108b8
|
Web: Files: fixed Paging re-render
|
2021-10-28 11:30:23 +03:00 |
|
|
68b2108bcb
|
Web: Common: PageLayout: Fixed padding for first row element at desktop view
|
2021-10-26 20:37:28 +03:00 |
|
|
ba68d7b5fd
|
Web: Common: fixed floating button styles when article is visible
|
2021-10-25 12:20:08 +03:00 |
|
|
8ba2f0c694
|
Merge branch 'develop' into feature/backup
# Conflicts:
# packages/asc-web-common/api/settings/index.js
# web/ASC.Web.Api/Models/SettingsWrapper.cs
|
2021-10-25 11:02:42 +03:00 |
|
|
1e15174d23
|
Web: Files: fixed styles after merge
|
2021-10-22 15:01:43 +03:00 |
|
|
0331356f5d
|
Web: Common: return style.
|
2021-10-22 13:09:58 +03:00 |
|
|
c163576b8b
|
Web: Files: Fixed styles for section header for tablet/mobile view.
|
2021-10-22 13:03:17 +03:00 |
|
|
5bd9c06c1a
|
Merge branch 'develop' into table-group-menu
# Conflicts:
# products/ASC.Files/Client/src/store/FilesStore.js
|
2021-10-22 12:20:20 +03:00 |
|
|
94cbac3c02
|
Merge branch 'develop' into feature/catalog
|
2021-10-22 15:43:23 +08:00 |
|
|
949346fa32
|
Merge branch 'develop' into feature/navigation
|
2021-10-22 15:32:13 +08:00 |
|
|
d7547a11a1
|
Web: Fix Failed prop type: Invalid prop animate of value 0 supplied to RectangleLoader
|
2021-10-22 10:17:29 +03:00 |
|
|
94a466ed48
|
Merge branch 'release/1.0.0' into develop
# Conflicts:
# packages/asc-web-components/aside/aside.js
|
2021-10-22 09:02:39 +03:00 |
|
|
576c62e337
|
Merge pull request #400 from ONLYOFFICE/bugfix/tile-view
Bugfix/tile view
|
2021-10-21 19:16:16 +03:00 |
|
|
81019049d7
|
Merge branch 'develop' into feature/personal-share-dialog
|
2021-10-21 19:14:59 +03:00 |
|
|
498a625ce8
|
Web: Common: fix firebase isEnabled
|
2021-10-21 16:44:29 +03:00 |
|
|
c2d0ff17d0
|
Merge branch 'develop' into table-group-menu
|
2021-10-21 15:34:57 +03:00 |
|
Artem Tarasov
|
27eff81dbc
|
Merge branch 'release/1.0.0' into bugfix/tile-view
|
2021-10-21 15:14:58 +03:00 |
|
Artem Tarasov
|
38f742e750
|
Web: Common: PageLayout: fixed position filter section on desktop
|
2021-10-21 15:13:01 +03:00 |
|
|
fce60f4018
|
Web: Common: PageLayout: Fixed error "Cannot read properties of null (reading 'focus')".
|
2021-10-21 13:19:28 +03:00 |
|
|
cc9857c904
|
Web: Deleted useless code.
|
2021-10-21 12:29:25 +03:00 |
|
|
152207d85a
|
Merge branch 'develop' into bugfix/version-history-list
# Conflicts:
# packages/asc-web-common/components/PageLayout/sub-components/section-body.js
# products/ASC.Files/Client/src/pages/VersionHistory/Section/Body/VersionRow.js
|
2021-10-21 12:02:57 +03:00 |
|
|
fd89092abe
|
Web: Fix Failed prop type: Invalid prop animate of value 0 supplied to RectangleLoader
|
2021-10-21 11:43:26 +03:00 |
|
|
2f8804653a
|
Web: SectionBody: Deleted useless code.
|
2021-10-21 11:11:14 +03:00 |
|
|
9aa3fd7047
|
Web:Common:Catalog: update branch
|
2021-10-20 22:31:39 +08:00 |
|
Artem Tarasov
|
23b30f5d8d
|
Web: Common: PageLayout: table style fix
|
2021-10-20 15:52:02 +03:00 |
|
|
5a47020303
|
Web:Common:Navigation: updated branch and edit navigation padding
|
2021-10-20 17:06:59 +08:00 |
|
|
3ed6a3d92a
|
Fix bug 53211: next/prev media on swipe on desktop
|
2021-10-19 19:48:15 +03:00 |
|
|
30f089e9b7
|
Merge branch 'develop' into table-group-menu
|
2021-10-19 15:44:29 +03:00 |
|
|
5a3b7fdc6c
|
Web: Common: PageLayout: Refactoring, deleted useless code.
|
2021-10-19 13:58:55 +03:00 |
|
|
b82dc5bf91
|
Web: Files: VersionHistoryPanel: Deleted body scroll? fixed styles.
|
2021-10-19 13:41:52 +03:00 |
|
|
30dc2623ba
|
Web: Common: Fixed styles for body list without scroll.
|
2021-10-19 12:18:07 +03:00 |
|
|
7481f3a2d0
|
Merge branch 'develop' into feature/catalog
|
2021-10-19 15:51:12 +08:00 |
|
|
b393678371
|
Web: Common: fixed user selector
|
2021-10-18 19:13:50 +05:00 |
|
|
5b64a6174c
|
Merge branch 'release/1.0.0' into bugfix/dropdown-correct-display
|
2021-10-18 17:18:21 +05:00 |
|
|
51c91cf63b
|
Web: Common: fixed user selector when aside panel expanded, corrected z-index
|
2021-10-18 17:17:36 +05:00 |
|
|
95e30d7df6
|
Web: Common: switched filter item to without portal mode, fixed opening user selector
|
2021-10-18 16:19:05 +05:00 |
|
|
ec0bb0a1b8
|
Fix bug 53192: fix media play/pause
|
2021-10-18 13:55:50 +03:00 |
|
|
defb0a387d
|
Web:Common:Navigation: fixed root item height
|
2021-10-18 18:03:30 +08:00 |
|
|
42780a5480
|
Web:Common:Navigation: changed height calc
|
2021-10-18 17:03:56 +08:00 |
|
|
67179fd267
|
Merge branch 'release/1.0.0' into table-group-menu
|
2021-10-18 10:53:09 +03:00 |
|
|
10a12dfec0
|
Web: Fix max-size of ArticleMainButton (too long button issue)
|
2021-10-15 21:22:34 +03:00 |
|
|
24ad7bf89f
|
Web: Common: fix aside view for people and group selector
|
2021-10-15 18:43:13 +05:00 |
|
|
7428893b2d
|
Web: Common, Components, People: added small section prop for drop down
|
2021-10-15 18:29:32 +05:00 |
|
|
9431206eed
|
Merge pull request #394 from ONLYOFFICE/bugfix/open-tiff-format
Fix bug 53097: can't open .tiff
|
2021-10-15 16:07:37 +03:00 |
|
|
58fce28bf5
|
Merge branch 'release/1.0.0' into bugfix/dropdown-correct-display
|
2021-10-15 16:53:45 +05:00 |
|
|
3d1a094fd7
|
Web:Common:Navigation:fixed dropbox header width
|
2021-10-15 17:35:14 +08:00 |
|
|
18a159203a
|
Web:Common:Navigation:fixed margin top on tablet device
|
2021-10-15 16:31:21 +08:00 |
|
|
e144a27c07
|
Web:Common: added navigation components
|
2021-10-15 15:07:15 +08:00 |
|
|
ec7f028d0f
|
Web: Common: switched drop down mode in hideFilter
|
2021-10-14 19:04:21 +05:00 |
|
|
d635b33cac
|
Web: Common: fixed select-box boundContainer
|
2021-10-14 15:05:07 +03:00 |
|
|
bc37fcc8ce
|
Merge branch 'release/1.0.0' into bugfix/dropdown-correct-display
|
2021-10-14 16:06:55 +05:00 |
|
|
30bbfd4fb4
|
Web: Common: fixed drop down in aside mode advanced selector, fixed hide filter styles
|
2021-10-14 15:59:49 +05:00 |
|
|
e3718c3697
|
Merge branch 'release/1.0.0' into table-group-menu
# Conflicts:
# packages/asc-web-components/table-container/StyledTableContainer.js
|
2021-10-14 13:46:11 +03:00 |
|
|
5005e0a6c0
|
Web: Icons: Fixed old checkbox icons, change header plus icon
|
2021-10-14 13:09:54 +03:00 |
|
|
e36697c9df
|
Web: Files: TableGroupMenu moved to header
|
2021-10-13 16:04:49 +03:00 |
|
|
1c38f29440
|
Web: Added new logo files and setup is_retina cookie for better icons inside Editor on retina resolution
|
2021-10-13 15:19:31 +03:00 |
|
|
6e4e3d69aa
|
Merge branch 'release/1.0.0' into bugfix/dropdown-correct-display
|
2021-10-12 20:26:45 +05:00 |
|
|
1725f403dc
|
Web: Common: fixed backdrop width in tablet mode when opened drop down
|
2021-10-12 20:20:09 +05:00 |
|
|
2c8ea767f9
|
Web: Common: added missing drop down styles
|
2021-10-12 20:16:44 +05:00 |
|
|
b9c3b25bec
|
Web: Common: fixed drop down displaying in filter components
|
2021-10-12 20:14:28 +05:00 |
|
|
2bf0d697cd
|
Fix bug 53097: can't open .tiff
|
2021-10-12 16:16:40 +03:00 |
|
|
6c41e3c888
|
Temporary disabled service-worker
|
2021-10-11 16:20:13 +03:00 |
|
|
749e89cbb3
|
Web: Components: fixed group-button-menu styles
|
2021-10-07 17:44:37 +03:00 |
|
|
19232a92e9
|
Web: Common: fixed header styles
|
2021-10-07 16:27:43 +03:00 |
|
|
b0fe6bd9e2
|
Merge branch 'release/1.0.0' into bugfix/dropdown-correct-display
|
2021-10-07 15:17:04 +03:00 |
|
|
593ac7abc5
|
Web: Common: fixed section-header styles for mobile devices
|
2021-10-07 10:47:25 +03:00 |
|
|
deffb0c901
|
Merge branch 'release/1.0.0' into bugfix/fixed-styles-selcted-row
|
2021-10-06 21:01:53 +03:00 |
|
|
f8fe418704
|
Merge pull request #381 from ONLYOFFICE/bugfix/Bug52923
Fix bug 52923: video doesn't play in Safari
|
2021-10-06 16:52:52 +03:00 |
|
|
36c25c8278
|
Web: fixed media query
|
2021-10-06 15:44:39 +03:00 |
|
|
cb5c70e071
|
Web: fixed header styles
|
2021-10-06 15:28:29 +03:00 |
|
|
f87b71f2e5
|
Web: Files: fixed header icons, fixed styles
|
2021-10-06 15:02:56 +03:00 |
|
|
d601b3610b
|
Web: Common: fix name
|
2021-10-06 13:44:26 +03:00 |
|
|
e734f222f5
|
Merge branch 'release/1.0.0' into bugfix/profile-form-validation
|
2021-10-06 13:32:50 +03:00 |
|
|
20b9f8d6b2
|
Fix bug 52923: video doesn't play in Safari
|
2021-10-06 13:30:30 +03:00 |
|
|
edd967de76
|
Web:Studio: edited nav menu v1.2.1
|
2021-10-06 17:58:09 +08:00 |
|
|
55cb1e875e
|
Web: fixed header height
|
2021-10-06 12:22:28 +03:00 |
|
|
57e050ba92
|
Web: Desktop: Changed provider to "onlyoffice" and renamed guid to cryptoEngineId
|
2021-10-06 11:26:06 +03:00 |
|
|
5b64ba0044
|
Web: Refactoring.
|
2021-10-06 11:22:00 +03:00 |
|
|
66e2fc8663
|
Web: Refactoring.
|
2021-10-06 11:04:29 +03:00 |
|
|
c82b931cc6
|
Web: Changed constants.
|
2021-10-05 19:20:21 +03:00 |
|
|
15b475677f
|
Web: Added RegExp constant for checking folder name.
|
2021-10-05 17:45:33 +03:00 |
|
|
a02926532c
|
Web: People: Added constants for RegExp.
|
2021-10-05 17:38:29 +03:00 |
|
|
4a16633734
|
Merge branch 'release/1.0.0' into bugfix/dropdown-correct-display
|
2021-10-05 18:14:15 +05:00 |
|
|
3f81f68b29
|
Web: Components: fixed people group selector, fixed checkbox table settings style for drop down portals
|
2021-10-05 18:11:18 +05:00 |
|
|
19c8ee34c0
|
Web: Components: added drop down work in two modes
|
2021-10-05 16:54:45 +05:00 |
|
|
628225816d
|
Web:Common:Catalog: fixed margin top on tablet
|
2021-10-05 19:20:43 +08:00 |
|
|
3262e9f767
|
Merge branch 'release/1.0.0' into bugfix/fixed-styles-selcted-row
|
2021-10-05 13:01:43 +03:00 |
|
|
d0229aa17f
|
Merge pull request #370 from ONLYOFFICE/bugfix/fix-operations-notifications
Bugfix/fix operations notifications
|
2021-10-05 12:32:39 +03:00 |
|
|
88d0c9a5a9
|
Web:Common:Catalog: removed margin top and fix main button loader
|
2021-10-05 16:40:31 +08:00 |
|
|
5d3d8f4d45
|
Web: Changed opportunity to show/hide DebugInfo to appsettings.json param "debug-info:enabled" and 'api/2.0/settings.json'
|
2021-10-05 11:13:38 +03:00 |
|
|
324ca6af20
|
Web:Common:Catalog: added default width and fix margins
|
2021-10-04 22:22:06 +08:00 |
|
|
9ce696e624
|
Web: Studio: Init Debug Info
+ Added About version from package.json
+ Fix DocumentServer version
|
2021-10-04 17:08:03 +03:00 |
|
|
01879779cd
|
Merge branch 'develop' into feature/backup
|
2021-10-04 15:21:45 +03:00 |
|
|
96980d00b8
|
Web: Components: changed article panel width
|
2021-10-04 15:08:56 +03:00 |
|
|
df6df65fa6
|
Web:Common:Catalog: fixed tablet margin
|
2021-10-04 17:36:59 +08:00 |
|
|
822aba4713
|
Web: Files: fixed download action
|
2021-10-03 14:47:28 +03:00 |
|
Artem Tarasov
|
f497e28241
|
Web: Common: PageLayout/Headline: fixed styles of header section, filter section
|
2021-10-01 16:51:28 +03:00 |
|
|
9aa3db82f1
|
Web:Common:Catalog: hide scrollbar catalog
|
2021-10-01 21:49:27 +08:00 |
|
Artem Tarasov
|
9c5f4524a7
|
Common: PageLayout: Article: deleted devider'
|
2021-10-01 15:30:11 +03:00 |
|
|
8b67843b3a
|
Web:Common:Catalog: added call sizeChangeHandler when catalog did mount
|
2021-10-01 18:27:42 +08:00 |
|
|
37c0b41699
|
Web:Common:Catalog: reduced debouncing time
|
2021-10-01 17:25:12 +08:00 |
|
|
34fc1d7732
|
Web:Common:Catalog: added resize event and debouncig
|
2021-10-01 16:54:22 +08:00 |
|
|
05127a5198
|
Web:Common:Catalog: added resize event
|
2021-10-01 16:30:36 +08:00 |
|
Artem Tarasov
|
4a6738f898
|
Web: Common/Components/Files: deleted unnecessary code, refactoring
|
2021-10-01 11:05:03 +03:00 |
|
|
bd56abaa0a
|
Web:Common: fixed z-index
|
2021-09-30 18:06:00 +08:00 |
|
|
b36f141cfb
|
Web:Common: fixed catalog on big screen tablet or mobile
|
2021-09-30 17:05:04 +08:00 |
|
Artem Tarasov
|
8382581ff1
|
Merge branch 'release/1.0.0' into bugfix/fixed-styles-selcted-row
|
2021-09-30 10:59:20 +03:00 |
|
Artem Tarasov
|
e64a7f07de
|
Web: Common/Components/Files: fixed styles when selecting row
|
2021-09-30 10:55:26 +03:00 |
|
|
e46d383196
|
Fix bug 52840: hide delete button in preview mode
|
2021-09-29 17:05:42 +03:00 |
|
|
e5807a43fc
|
Merge develop branch
|
2021-09-29 20:52:55 +08:00 |
|
|
b50f303ca4
|
Web:Common:Catalog: added text hide on mobile on click back button
|
2021-09-29 20:04:15 +08:00 |
|
|
e4fa7cf5fd
|
Fix Bug 52834 - Docs. Desktop: regDesktop not calling when isEncryption equals false (personal mode issue)
|
2021-09-29 15:02:54 +03:00 |
|
|
27b8ca28b7
|
Web:Common:Catalog: added text hiding on mobile device, when user clicked back button
|
2021-09-29 17:26:26 +08:00 |
|
|
2cd8235f16
|
Web:Common: fixed display article
|
2021-09-29 15:50:58 +08:00 |
|
|
335eaeaba7
|
Web: Common: Added third party storages enum.
|
2021-09-28 18:10:11 +03:00 |
|
|
24772e88ad
|
Web: fixed document catalog loader
|
2021-09-28 18:25:23 +08:00 |
|
|
b2676b4df8
|
Web: Common: Api: Removed debugger
|
2021-09-28 12:33:39 +03:00 |
|
|
9bd9bc3e33
|
Web: Common: Api: Changed request method from POST to GET (mobile app issue)
|
2021-09-28 12:32:09 +03:00 |
|
|
0963b8fad7
|
Web: added support IOS device (adding margin-top for catalog)
|
2021-09-27 22:29:28 +08:00 |
|
|
6591080403
|
Fix Bug 52797 with unsupported browsers. Added new packages/browserslist-config-asc with browserlist.config.js
|
2021-09-27 16:04:37 +03:00 |
|
|
a5c57fea52
|
Web: added catalog layout and document catalog
|
2021-09-27 20:59:37 +08:00 |
|
|
590db7bb67
|
Merge pull request #347 from ONLYOFFICE/feature/third
Feature/third
|
2021-09-27 12:35:07 +03:00 |
|
Artem Tarasov
|
ae64556bb0
|
web: common/people/login: renamed providers to lowercase (client)
|
2021-09-27 09:55:44 +03:00 |
|
|
25a58de730
|
Web: SW: Update workbox
|
2021-09-24 21:17:50 +03:00 |
|
|
6ada582cc5
|
Web: service-worker updates optimization
|
2021-09-24 20:10:54 +03:00 |
|
|
50becafef7
|
Fixed Bug 52642 - Android.Docs.Mobile. Fixed orientation change for mobile Firefox
|
2021-09-24 15:07:44 +03:00 |
|
|
cf5a7c8ff2
|
Bug 52726 - Client.Files.Image: Fix After removing the image from the viewer, the following media file is displayed on the page.
|
2021-09-23 17:05:04 +03:00 |
|
|
8ad5ac73c6
|
Merge branch 'release/1.0.0' of github.com:ONLYOFFICE/AppServer into release/1.0.0
|
2021-09-22 13:52:09 +03:00 |
|
|
a7597a42e2
|
Merge branch 'release/1.0.0' of github.com:ONLYOFFICE/AppServer into release/1.0.0
|
2021-09-21 14:01:12 +03:00 |
|
|
d702b47502
|
Fixed Bug 52642 - Android.Docs.Mobile. Fixed orientation change for mobile Firefox
|
2021-09-21 14:01:06 +03:00 |
|
|
11935dc196
|
Web: Common: delete useless
|
2021-09-21 14:00:59 +03:00 |
|
|
6691e523a8
|
Fix bug 52626, 52622: Media Viewer crash
|
2021-09-21 13:48:13 +03:00 |
|
|
aa6c02b190
|
Merge branch 'develop' into feature/backup
# Conflicts:
# common/ASC.Data.Backup.Core/Core/NotifyHelper.cs
# common/ASC.Data.Backup.Core/Service/BackupWorker.cs
# common/services/ASC.Data.Backup/Controllers/BackupController.cs
# packages/asc-web-common/api/settings/index.js
# packages/asc-web-common/components/PrivateRoute/index.js
# packages/asc-web-common/store/SettingsStore.js
# products/ASC.Files/Client/public/locales/en/SelectFile.json
# products/ASC.Files/Client/public/locales/ru/SelectFile.json
# products/ASC.Files/Client/src/components/Article/Body/TreeFolders.js
# products/ASC.Files/Client/src/components/panels/SelectFileDialog/index.js
# products/ASC.Files/Client/src/components/panels/SelectFileInput/index.js
# products/ASC.Files/Client/src/components/panels/SelectFolderDialog/index.js
# products/ASC.Files/Client/src/components/panels/SelectFolderInput/index.js
# products/ASC.Files/Client/src/components/panels/StyledPanels.js
# products/ASC.Files/Client/webpack.config.js
# web/ASC.Web.Api/Controllers/SettingsController.cs
# web/ASC.Web.Api/Models/SettingsWrapper.cs
# web/ASC.Web.Client/src/Shell.jsx
|
2021-09-20 16:26:34 +03:00 |
|
|
15e7cf9bfd
|
Merge branch 'release/1.0.0' into bugfix/dropdown-correct-display
|
2021-09-16 12:28:20 +05:00 |
|
|
b88a6f5ddf
|
Merge branch 'release/1.0.0' of https://github.com/ONLYOFFICE/AppServer into release/1.0.0
|
2021-09-15 15:56:28 +03:00 |
|
|
3c77982f4a
|
Fix Bug 51819 Web: Editor. Fixed openEdit
|
2021-09-15 14:52:36 +03:00 |
|
|
1ca554f82d
|
Merge branch 'develop' into release/1.0.0
# Conflicts:
# packages/asc-web-components/campaigns-banner/index.js
# web/ASC.Web.Client/src/Shell.jsx
|
2021-09-15 14:45:33 +03:00 |
|
|
e2f977ce17
|
Merge branch 'develop' into feature/optimization
|
2021-09-15 11:47:29 +03:00 |
|
|
03d8d560ba
|
Web: Hide internal login from personal mode
|
2021-09-14 16:44:39 +03:00 |
|
|
11dfddb031
|
Merge branch 'release/1.0.0' into bugfix/dropdown-correct-display
|
2021-09-14 18:33:01 +05:00 |
|
|
fe2cf74350
|
Web: Common: fix headline font size
|
2021-09-14 13:46:15 +03:00 |
|
|
52dfeaa6e7
|
Web: Disabled body selection for macOS (for touchpad).
|
2021-09-14 12:28:13 +03:00 |
|
|
79b778c36d
|
Merge branch 'develop' into feature/new-campaigns
|
2021-09-14 11:48:24 +03:00 |
|
|
e6e49559a9
|
Merge branch 'release/1.0.0' into bugfix/dropdown-correct-display
|
2021-09-13 14:59:06 +05:00 |
|
|
1fe11360a8
|
Web: Components: added portals to drop-down
|
2021-09-13 14:56:02 +05:00 |
|
|
c7ad040293
|
Web: Sorted all "package.json" files by vscode-sort-package-json
|
2021-09-13 12:36:07 +03:00 |
|
|
38242e83c1
|
Web: Moved other common dependencies to sharedDependencies.js
|
2021-09-13 12:29:44 +03:00 |
|
|
74011d7328
|
Fixed Bug 52443 - Client.Files. Fixed downloadAs action
|
2021-09-13 11:09:59 +03:00 |
|
|
a47c73b5ce
|
Web: Moved "mobx", "moment", prop-types" to sharedDependencies.js
|
2021-09-10 16:50:23 +03:00 |
|
|
956c9b3467
|
Web: Moved "react", "react-dom", "react-router", "react-router-dom", "styled-components" to sharedDependencies.js
|
2021-09-10 15:57:14 +03:00 |
|
|
d2f3c93c14
|
Web: Moved "@babel/runtime", "i18next", "i18next-http-backend", "react-i18next" to sharedDependencies.js
|
2021-09-10 15:15:51 +03:00 |
|
|
46161eef95
|
Web: Moved axios to sharedDependencies.js
|
2021-09-10 14:49:20 +03:00 |
|
|
f0c7a09a6c
|
Web: Moved common shared dependencies to sharedDependencies.js + moved workbox-window
|
2021-09-10 14:20:19 +03:00 |
|
|
b70a9cd115
|
Web: Common: Fixed response for response type "text".
|
2021-09-10 11:52:06 +03:00 |
|
|
8c6de99101
|
Web: Updated @welldone-software/why-did-you-render, move it to the common devDependencies
|
2021-09-08 16:52:56 +03:00 |
|
|
da606cb574
|
Merge branch 'release/1.0.0' of github.com:ONLYOFFICE/AppServer into release/1.0.0
|
2021-09-08 16:24:28 +03:00 |
|
|
899507000f
|
Web: fixed login route
|
2021-09-08 16:24:20 +03:00 |
|
|
1501c1d91e
|
FIx Bug 52243 Client.Editor. There is no prompt message indicating that the file was saved successfully when using Save Copy As.
|
2021-09-08 15:46:52 +03:00 |
|
|
b0147cc811
|
Web: Removed duplicated dependency declaration (fast-deep-equal)
|
2021-09-08 15:40:38 +03:00 |
|
|
551c623541
|
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/new-campaigns
# Conflicts:
# packages/asc-web-components/campaigns-banner/index.js
# products/ASC.Files/Client/src/components/Article/Body/index.js
|
2021-09-08 14:36:10 +03:00 |
|
|
fa1d016554
|
Web: Common: fixed banner translations
|
2021-09-07 18:34:30 +03:00 |
|
|
019deb54ab
|
Web: Common: fixed article scroll
|
2021-09-07 16:41:10 +03:00 |
|
|
ef920a2023
|
Merge branch 'release/1.0.0' into bugfix/mousewheel-opening-files
|
2021-09-07 12:57:13 +03:00 |
|
|
c46ebd5af9
|
Web: Common: get campaigns translations from firebase
|
2021-09-07 12:48:22 +03:00 |
|
|
d51887f642
|
Web: Common: Fixed Article loaders + added MainButtonLoader
|
2021-09-07 12:29:55 +03:00 |
|
|
009a801be7
|
Web: Personal: fixed redirect to login
|
2021-09-07 11:38:24 +03:00 |
|
|
80f264dd34
|
Web: Files: fixed filter search
|
2021-09-06 15:59:41 +03:00 |
|
|
6ee8033097
|
Web: Common: fixed warning
|
2021-09-06 12:30:58 +03:00 |
|
|
f32b4f1c9d
|
Web: Files: fixed filter crash
|
2021-09-03 17:07:07 +03:00 |
|
|
417f5199a2
|
Merge branch 'release/1.0.0' of github.com:ONLYOFFICE/AppServer into release/1.0.0
|
2021-09-02 18:03:49 +03:00 |
|
|
7d69053fc1
|
Fixed Bug 52088 - Client.Files. Restricted the file selection for the select box
|
2021-09-02 18:03:42 +03:00 |
|
|
72251a6c11
|
Fix bug 51320: «FirebaseError: Remote Config: The config fetch request timed out while in an exponential backoff state»
|
2021-09-02 15:05:36 +03:00 |
|
|
7f08893134
|
Fix Bug 52311 - Client.Files. Fixed filter block
|
2021-09-02 13:01:42 +03:00 |
|
|
701e61a6d1
|
Fix Bug 52188 - Client.Files. Fixed filter reset
|
2021-08-31 15:01:31 +03:00 |
|
|
c4fb8be12a
|
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/new-campaigns
# Conflicts:
# products/ASC.Files/Client/src/components/Article/Body/index.js
|
2021-08-30 16:54:41 +03:00 |
|
|
ccd7532161
|
Merge branch 'develop' into release/1.0.0
# Conflicts:
# products/ASC.Files/Client/src/components/Article/Body/index.js
# products/ASC.Files/Client/src/pages/Home/Section/Header/index.js
|
2021-08-27 17:45:52 +03:00 |
|
|
ff7f3926ce
|
Merge branch 'develop' into feature/table-view
# Conflicts:
# packages/asc-web-common/components/PageLayout/index.js
# products/ASC.Files/Client/src/pages/Home/Section/Header/index.js
# public/locales/de/Common.json
# public/locales/it/Common.json
# public/locales/lo/Common.json
# public/locales/pt-BR/Common.json
# public/locales/ro/Common.json
|
2021-08-26 16:05:15 +03:00 |
|
|
26c5d2ed90
|
Web: Common: PageLayout: moved isArticlePinned to settingsStore
|
2021-08-26 15:07:29 +03:00 |
|
|
ea31c0f258
|
Web: Files: Fixed article height for tablet view, deleted useless styles.
|
2021-08-26 15:05:21 +03:00 |
|
|
c66268a9c2
|
Merge branch 'develop' into release/1.0.0
# Conflicts:
# products/ASC.Files/Client/public/locales/en/Translations.json
# products/ASC.Files/Client/public/locales/ru/Translations.json
# products/ASC.Files/Client/src/helpers/utils.js
|
2021-08-26 13:49:25 +03:00 |
|
|
1bda036a9f
|
Merge branch 'develop' into bugfix/render-optimization
|
2021-08-26 10:32:32 +03:00 |
|
|
c81a28f48f
|
Web: Common: fixed onError
|
2021-08-25 17:54:08 +03:00 |
|
|
8727b504b7
|
Merge branch 'develop' into feature/table-view
# Conflicts:
# products/ASC.Files/Client/src/HOCs/withFileActions.js
# products/ASC.Files/Client/src/pages/Home/Section/Body/TilesView/FileTile.js
|
2021-08-25 16:48:07 +03:00 |
|
|
1a43638815
|
Web: added firebase storage
|
2021-08-24 21:52:01 +03:00 |
|
|
91199a0de0
|
Merge branch 'release/1.0.0' of github.com:ONLYOFFICE/AppServer into release/1.0.0
|
2021-08-24 15:50:17 +03:00 |
|
|
d223fb6406
|
Web: Components: Added application block visibility to article for tablet view.
|
2021-08-24 15:50:12 +03:00 |
|
|
b46a3ae6f0
|
Web: Common: PrivateRoute: fixed redirect to login
|
2021-08-24 11:47:00 +03:00 |
|
|
0cfb70d9e2
|
Error 52089 - Client.Files. Elements of the page are not selected using left mouse button.
|
2021-08-23 13:50:21 +03:00 |
|
|
c295f1a77c
|
Web: Files: fixed routing to the service folder
|
2021-08-20 13:23:53 +03:00 |
|
|
0870d65c20
|
Web: Common: added video loaded error
|
2021-08-20 12:06:00 +03:00 |
|
|
31bee632e0
|
Web: Common: fixed MediaViewer
|
2021-08-19 13:30:42 +03:00 |
|
|
b97e9d1fd7
|
Web: Common: added utils for load script
|
2021-08-19 13:30:15 +03:00 |
|
|
3b8cf0a275
|
Merge branch 'develop' into feature/file-folder-selectors
# Conflicts:
# products/ASC.Files/Client/public/locales/en/Translations.json
# products/ASC.Files/Client/public/locales/ru/Translations.json
# products/ASC.Files/Client/src/HOCs/withFileActions.js
# products/ASC.Files/Client/src/helpers/utils.js
# web/ASC.Web.Editor/src/Editor.jsx
|
2021-08-19 10:08:14 +03:00 |
|
|
dd3140129b
|
Fix bug 51929: view tiff format
|
2021-08-19 05:23:50 +03:00 |
|
|
7cde8b26f1
|
Web: Common: MediaViewer refactoring
|
2021-08-19 04:10:32 +03:00 |
|
|
f53d7eb718
|
Web: Common: fixed article unpin
|
2021-08-18 17:17:45 +03:00 |
|
|
46a97efb52
|
Merge branch 'develop' into release/1.0.0
# Conflicts:
# products/ASC.Files/Client/src/components/Article/Body/ThirdPartyList.js
|
2021-08-18 16:59:00 +03:00 |
|
|
b7df3903dd
|
Web: Files: fixed the hiding of the article
|
2021-08-18 15:52:27 +03:00 |
|
|
b4d6beb1ae
|
Web: Common: fixed main-snackbar style
|
2021-08-17 17:54:42 +03:00 |
|
|
48c6d35a20
|
Web: AuthStore: Removed useless code
|
2021-08-17 16:32:19 +03:00 |
|
|
e8991a612b
|
Fix bug Bug 51927: MediaViewer updateHammer TypeError
|
2021-08-17 01:00:07 +03:00 |
|
|
e634b5c72f
|
Web: Editor: Fixed converting file when open in new tab.
|
2021-08-16 13:17:49 +03:00 |
|
|
9715719994
|
Merge branch 'develop' into bugfix/canShare
|
2021-08-16 11:07:30 +03:00 |
|
|
f5e9e17e11
|
Merge branch 'develop' into feature/table-view
# Conflicts:
# products/ASC.Files/Client/src/pages/Home/Section/Filter/index.js
# products/ASC.Files/Client/src/pages/Home/Section/Header/index.js
|
2021-08-16 10:53:48 +03:00 |
|
|
e60815b15d
|
Web: Refactoring and API calls optimization
|
2021-08-13 20:32:50 +03:00 |
|
|
996b438a6b
|
Web: Api: Added opportunity to skipLogout on 401 error
|
2021-08-13 19:24:48 +03:00 |
|
|
c7efd52424
|
Web: Common: simplified condition
|
2021-08-13 16:54:05 +03:00 |
|
|
6e9ceea8c0
|
Web: Editor: Added link for insert image and mail merge.
|
2021-08-13 14:50:24 +03:00 |
|
|
9a5034386b
|
Fix bug 51930: wrong order media
|
2021-08-13 07:21:10 +03:00 |
|
|
f3b06cf04f
|
Web: Common: fixed video play
|
2021-08-13 06:45:00 +03:00 |
|
|
17eaf17b7d
|
Web: Common: Add check if store is initialized.
|
2021-08-12 14:41:12 +03:00 |
|
|
0250e1c898
|
Web: service-worker: Force wb.messageSkipWaiting() after reload page
|
2021-08-11 22:04:22 +03:00 |
|
|
63426dcaf3
|
Web: Update workbox to v6.2.3
|
2021-08-11 20:38:39 +03:00 |
|
|
3f56790c85
|
Fix bug 51365: update avatar in header
|
2021-08-11 10:18:10 +03:00 |
|
|
26641ad77c
|
Fix bug 51692: autoplay next file
|
2021-08-11 00:21:34 +03:00 |
|
|
d84918b6e5
|
Fix bug 51861: esc closed MediaViewer
|
2021-08-10 16:49:17 +03:00 |
|
|
65b7b75e26
|
Fix bug 51693: keyboard navigation
|
2021-08-10 16:12:51 +03:00 |
|
|
6b1447bb72
|
Web: Common: fixed video autoplay
|
2021-08-05 12:38:38 +03:00 |
|
|
85817fc25f
|
Web: Common: fixed close button size
|
2021-08-04 17:50:50 +03:00 |
|
|
fccd79c997
|
Web: Common: added space button action
|
2021-08-04 12:50:44 +03:00 |
|
|
48f92c6ad2
|
Web: Common: added action on press delete
|
2021-08-04 12:43:31 +03:00 |
|
|
edc522d317
|
Web: Common: start video by click
|
2021-08-04 12:35:24 +03:00 |
|
Artem Tarasov
|
deeb497a9e
|
Web: Common: AuthStore: at logout added a condition for going to the login page if personal is true
|
2021-08-03 11:03:19 +03:00 |
|
|
452cfd2b5a
|
Web: Common: fixed getFoldersTree foldersCount
|
2021-07-30 18:12:10 +03:00 |
|
|
0457bd714a
|
Web: Common: disabled media autoplay
|
2021-07-30 12:03:38 +03:00 |
|
|
6829a2c854
|
Web: People: added table view, refactoring
|
2021-07-29 20:21:26 +03:00 |
|
|
b13e71fcae
|
Web: Files: fixed table filter
|
2021-07-28 17:45:09 +03:00 |
|
|
75e7ca893f
|
Merge branch 'develop' into feature/file-folder-selectors
# Conflicts:
# products/ASC.Files/Client/webpack.config.js
# web/ASC.Web.Editor/src/Editor.jsx
|
2021-07-28 17:19:05 +03:00 |
|
|
2abbd580c2
|
Merge branch 'develop' into feature/table-view
# Conflicts:
# public/locales/en/Common.json
# public/locales/ru/Common.json
|
2021-07-28 16:53:23 +03:00 |
|
|
90b706c750
|
Web: Common: fixed firebase init
|
2021-07-27 18:04:42 +03:00 |
|
|
93d1cb0f38
|
Fix Bug 51344 "downloadable font: kern: Too large subtable..." on FF
|
2021-07-27 15:56:19 +03:00 |
|
|
475d6d638f
|
Web: Files: added column filtering
|
2021-07-27 15:22:51 +03:00 |
|
|
050ce4ce8d
|
Merge branch 'release/1.0.0' of github.com:ONLYOFFICE/AppServer into release/1.0.0
|
2021-07-27 14:00:39 +03:00 |
|
|
107476c544
|
Web: Common: fixed minimumFetchIntervalMillis
|
2021-07-27 12:32:18 +03:00 |
|
|
e2d3f3195d
|
Merge branch 'develop' into release/1.0.0
|
2021-07-26 15:40:05 +03:00 |
|
|
538d65c724
|
Web: Remove query hash from remoteEntry.js
|
2021-07-26 14:02:10 +03:00 |
|
|
30b41aac42
|
Merge branch 'release/1.0.0' of github.com:ONLYOFFICE/AppServer into release/1.0.0
|
2021-07-26 12:37:01 +03:00 |
|
|
d86605e2da
|
Web: Files: added drag and drop for table
|
2021-07-23 18:13:06 +03:00 |
|
|
0f27a6c673
|
Merge branch 'develop' into release/1.0.0
|
2021-07-23 17:34:43 +03:00 |
|
|
675fb8de21
|
Web: Fix caching remoteEntry.js
|
2021-07-23 17:20:42 +03:00 |
|
|
9b47aa8d4a
|
Merge branch 'develop' into feature/table-view
|
2021-07-22 16:56:48 +03:00 |
|
|
01cbae520d
|
Web: Common: fixed translations
|
2021-07-22 15:09:42 +03:00 |
|
|
34247e4a25
|
Web: Common: added translation in new version snackbar
|
2021-07-22 14:24:09 +03:00 |
|
|
ed5d2f5ba0
|
Web: Common: disabled workbox logs
|
2021-07-22 14:23:42 +03:00 |
|
|
fa500d094f
|
Merge branch 'develop' into release/1.0.0
|
2021-07-22 11:12:37 +03:00 |
|
|
e703927239
|
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into release/1.0.0
|
2021-07-21 18:30:33 +03:00 |
|
|
13f8f5ef7d
|
Fix sw.js creation
|
2021-07-21 18:28:56 +03:00 |
|
|
ee453f8111
|
Web: Common: fixed main-bar style
|
2021-07-21 12:51:03 +03:00 |
|
|
c92d8318f1
|
Web: Files: fixed header sorting, removed unused code
|
2021-07-21 12:16:46 +03:00 |
|
|
6924b34e84
|
Web: Common: show new version snackbar
|
2021-07-21 07:23:56 +03:00 |
|
|
f7ce0e210b
|
Merge branch 'release/1.0.0' of github.com:ONLYOFFICE/AppServer into release/1.0.0
# Conflicts:
# packages/asc-web-common/utils/sw-helper.js
|
2021-07-21 07:20:51 +03:00 |
|
|
4e920bfe3c
|
Web: Common: disabled snackbar
|
2021-07-21 07:19:08 +03:00 |
|
|
95c99a0ac9
|
Web: Common: added snackbar container style
|
2021-07-21 07:17:58 +03:00 |
|
|
653066af0c
|
Merge branch 'develop' into release/1.0.0
# Conflicts:
# config/nginx/onlyoffice.conf
|
2021-07-20 18:21:00 +03:00 |
|
|
829edbbda5
|
Merge branch 'release/1.0.0' of github.com:ONLYOFFICE/AppServer into release/1.0.0
|
2021-07-20 13:22:44 +03:00 |
|
|
eab97bbfed
|
Web: init new single sw.js creation
|
2021-07-20 12:32:27 +03:00 |
|
|
5ed5adbb9b
|
Web: Components: Table: added settings, fixed table group menu header
|
2021-07-19 14:09:09 +03:00 |
|
|
dc323f255f
|
Enabled registerSW
|
2021-07-15 15:16:07 +03:00 |
|
|
57a1e23eba
|
Disable registerSW for fix issues with CDN
|
2021-07-15 11:57:07 +03:00 |
|
|
e81c3df0be
|
Added displaying version from appsettings.json (api/2.0/settings.json)
|
2021-07-14 17:31:06 +03:00 |
|
|
728b6d359d
|
Web: Components: replaced snackbar
|
2021-07-14 17:12:13 +03:00 |
|
|
1ebc588a93
|
Web: Bumped version to 1.0.0
|
2021-07-14 13:26:36 +03:00 |
|
|
a3592ca94d
|
Web: Common: added snackbar
|
2021-07-13 14:36:27 +03:00 |
|
|
cb8d225707
|
Merge branch 'develop' into feature/file-folder-selectors
# Conflicts:
# products/ASC.Files/Client/src/store/index.js
|
2021-07-12 13:08:40 +03:00 |
|
|
b4c4625f3f
|
Moved getting firebase config to API method /api/2.0/settings.json
|
2021-07-09 18:28:08 +03:00 |
|
|
0297620036
|
Fix SnackBar usage
|
2021-07-09 17:25:20 +03:00 |
|
|
3556497de6
|
Merge branch 'develop' into feature/personal
|
2021-07-08 14:38:26 +03:00 |
|
|
84fa1f8eb3
|
Web: Common: fixed height
|
2021-07-08 13:59:48 +03:00 |
|
|
08d3e9df5e
|
Web: Files: Optimization: deleted getFiles function.
|
2021-07-08 13:25:24 +03:00 |
|
|
67902f2072
|
Merge branch 'develop' into feature/backup
|
2021-07-07 15:15:59 +03:00 |
|
|
523fb66248
|
Web: Common: fixed buttons height
|
2021-07-07 13:20:16 +03:00 |
|
|
2e2f121d26
|
Web: Common: disabled hover
|
2021-07-07 12:47:01 +03:00 |
|
|
c5b409a571
|
Merge branch 'develop' into feature/file-folder-selectors
|
2021-07-07 11:41:45 +03:00 |
|
|
04173a1426
|
Web: Common: fixed
|
2021-07-07 11:05:18 +03:00 |
|
|
a9ed86fee7
|
Web: Common: open selector on button
|
2021-07-06 17:37:07 +03:00 |
|
|
db7ea5c88f
|
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into bugfix/v1.0.0
# Conflicts:
# products/ASC.Files/Client/src/pages/Home/index.js
|
2021-07-06 11:38:02 +03:00 |
|
|
77b5a5a440
|
Web: Common: fixed load translate rules for campaigns
|
2021-07-05 20:47:49 +03:00 |
|
|
a325507b0e
|
WEb: SelectFileFolder: Added custom types of files.
|
2021-07-02 18:35:38 +03:00 |
|
|
b3fd47a216
|
Merge branch 'feature/CampaignsBanner' of github.com:ONLYOFFICE/AppServer into feature/personal
# Conflicts:
# products/ASC.Files/Client/src/components/Article/Body/index.js
|
2021-07-02 16:42:05 +03:00 |
|
|
a31dc583c1
|
Merge branch 'develop' into feature/personal
# Conflicts:
# products/ASC.Files/Client/src/HOCs/withFileActions.js
# products/ASC.Files/Client/src/components/panels/SharingPanel/index.js
# products/ASC.Files/Client/src/pages/Home/Section/Filter/index.js
# products/ASC.Files/Client/src/pages/Settings/index.js
|
2021-07-02 16:26:45 +03:00 |
|
|
da924cc3b3
|
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/CampaignsBanner
# Conflicts:
# products/ASC.Files/Client/src/components/Article/Body/index.js
|
2021-07-02 16:12:06 +03:00 |
|
|
81f93c3640
|
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/CampaignsBanner
|
2021-07-02 13:22:40 +03:00 |
|
|
c940aae128
|
Web: refactoring translation loaders
|
2021-07-02 12:25:36 +03:00 |
|
|
513ec04e33
|
Merge branch 'develop' into feature/translations-loaders
# Conflicts:
# products/ASC.Files/Client/src/components/dialogs/DeleteDialog/index.js
# products/ASC.Files/Client/src/components/panels/SharingPanel/index.js
# products/ASC.People/Client/src/components/Article/MainButton/index.js
# products/ASC.People/Client/src/pages/Home/Section/Header/index.js
|
2021-07-01 16:47:34 +03:00 |
|
|
5ef780d40d
|
Web: Common: Added api methods.
|
2021-07-01 15:46:36 +03:00 |
|
|
426fce6140
|
Web: Common: Added api method.
|
2021-07-01 13:18:43 +03:00 |
|
|
a7d56b56f2
|
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/CampaignsBanner
|
2021-07-01 13:12:18 +03:00 |
|
|
3d662a53ee
|
Web: Added transition to the preparation page.
|
2021-07-01 12:12:09 +03:00 |
|
|
19c9f88d6a
|
Web: Common: added locales path
|
2021-07-01 10:40:37 +03:00 |
|
|
bcf7ceb568
|
Merge branch 'develop' into feature/translations-loaders
# Conflicts:
# packages/asc-web-common/components/Loaders/index.js
|
2021-07-01 09:13:17 +03:00 |
|
|
b419c640bc
|
Web: Settings: Added preparation portal page.
|
2021-06-30 20:09:00 +03:00 |
|
|
c93a4eda8e
|
Merge branch 'develop' into feature/privacy-rooms-page
# Conflicts:
# products/ASC.Files/Client/src/pages/Home/Section/Filter/index.js
|
2021-06-30 17:20:54 +03:00 |
|
Artem Tarasov
|
ef25c07ddc
|
Web: Common: FilterInput: fixed transfer viewSettings
|
2021-06-30 17:05:11 +03:00 |
|
|
69889cab4c
|
Merge branch 'develop' into feature/privacy-rooms-page
# Conflicts:
# packages/asc-web-common/components/PageLayout/index.js
# products/ASC.Files/Client/src/HOCs/withFileActions.js
# products/ASC.Files/Client/src/helpers/constants.js
# products/ASC.Files/Client/src/pages/Home/Section/Filter/index.js
# products/ASC.Files/Client/src/store/FilesStore.js
|
2021-06-30 16:28:37 +03:00 |
|
|
1083fd8416
|
Merge branch 'develop' into feature/personal
# Conflicts:
# products/ASC.Files/Client/src/pages/Home/Section/Filter/index.js
# products/ASC.Files/Client/src/store/FilesStore.js
|
2021-06-30 16:09:53 +03:00 |
|
|
db7954ee31
|
Merge branch 'develop' into feature/backup
|
2021-06-30 15:54:45 +03:00 |
|
|
dae7215376
|
Web: Common: fixed article max width
|
2021-06-30 13:57:48 +03:00 |
|
|
567d3b46ed
|
Web: Common: fixed button height on mobile
|
2021-06-30 13:49:33 +03:00 |
|