Commit Graph

8165 Commits

Author SHA1 Message Date
0ee1a35424 analizators/U2U1115 2022-01-17 11:22:52 +03:00
77937390ef Web: Fix crash of Wizard with default en-US language 2022-01-14 19:12:58 +03:00
516cd2fd80 analizators/U2U1111 2022-01-14 16:44:02 +03:00
b9884e6b81 Analizators/U2U1107 2022-01-14 16:32:06 +03:00
4bf841581f Analizators/U2U1104 2022-01-14 16:12:37 +03:00
48897308d7 refactoring 2022-01-13 22:17:56 +03:00
6b883bcd60 Merge branch 'develop' into feature/support-elasticache 2022-01-13 18:16:43 +03:00
9bc8584184 analizators/U2U1103 2022-01-13 15:53:57 +03:00
4155f911c0 analizators/U2U1025 2022-01-13 14:19:39 +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
66cf28ba29 analizators/U2U1100 2022-01-12 18:42:03 +03:00
aba8cb9174 Web: Studio: fixed logo styles 2022-01-12 16:11:14 +03:00
2ffa9eb180 Web: Studio: added icons to header for desktop view 2022-01-12 15:53:52 +03:00
6961f38593 analizators/U2U1023 2022-01-12 15:34:58 +03:00
60c45e8c5e Web: Client: Wizard: Fixed issue with default portal language inside selector 2022-01-12 11:08:51 +03:00
efb51c613f refactoring *.proto files according to https://bit.ly/3KcZ0Ef 2022-01-11 19:28:48 +03:00
c85c2e6f26 analizators/U2U1007 2022-01-11 18:37:10 +03:00
Dmitry Kulak
de8fdb748d Web: Studio: Header: Fixed spacing between burger menu button and logo 2022-01-11 14:37:11 +03:00
Dmitry Kulak
38e09fe63a Web: Studio: Header: Fixed margin for logo on Personal 2022-01-10 19:17:23 +03:00
c43f244282 analizators/U2U1003 2022-01-10 18:13:30 +03:00
a671732da5 analizators/SCS0005 2022-01-10 12:24:21 +03:00
6cbd02b71c Merge branch 'hotfix/v1.1.1' into feature/socket-io
# Conflicts:
#	products/ASC.Files/Client/webpack.config.js
#	products/ASC.Files/Server/DocStore
#	yarn.lock
2022-01-10 11:06:32 +03:00
a7dc8c7dfd sync CommunityServer and AppServer cache via redis 2021-12-30 18:09:20 +03:00
0ad204743f Merge branch 'develop' into feature/dark-theme 2021-12-29 20:25:29 +08:00
Dmitry Kulak
84b1a18137 Web: Studio: Fixed header not closing on item click 2021-12-29 10:41:10 +03:00
a40b06648a analizators/s3963 2021-12-28 19:01:12 +03:00
ad5ee66ef9 Web:Wizard:Components: add support dark-theme 2021-12-28 23:52:12 +08:00
5e91416c53 analizators/s4035 2021-12-28 18:44:54 +03:00
9d43cb07ba Files: fix after merge 2021-12-28 18:40:42 +03: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
9557ad7abb Web:Common:Store: add array for available themes 2021-12-28 21:39:27 +08:00
0a786bbfa3 analizators/s4830 2021-12-28 15:00:48 +03:00
605e7eba35 Fix bad merge febf172875 2021-12-28 14:56:00 +03: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
42411acf49 Web:Login: add support dark-theme 2021-12-28 11:27:15 +08:00
c78cd078cf
Merge pull request #481 from ONLYOFFICE/feature/redesign-start-page
Feature/redesign start page
2021-12-27 17:33:48 +03:00
657961c334 Web: Socket: Implemented "stop editing" + refactoring 2021-12-24 20:58:38 +03:00
d7b98e875b Web:Common:Header: add support dark-theme for loader 2021-12-24 19:44:37 +08:00
eb02c96697 microsoft recomended store the System.Guid type as string type in protobuf format 2021-12-23 18:29:35 +03:00
6d250efffa add *.dll for support redis + update Grpc.* dll 2021-12-23 16:17:31 +03:00
440811e931 Web: Added convertLanguage for compatibility 2021-12-23 14:01:08 +03:00
3bf412166d Web: Settings: Commented old redux actions 2021-12-23 13:09:38 +03:00
919092e6c6 Merge branch 'feature/translate-1.1.0' of https://github.com/ONLYOFFICE/AppServer into feature/translate-1.1.0 2021-12-23 11:28:50 +03:00
9e24c182c9 edit ko 2021-12-23 11:22:48 +03:00
86e965d779 Web: Fix translations 2021-12-22 18:12:04 +03:00
6fde793f14 Web:add opportunity change theme in profile menu 2021-12-22 22:22:35 +08:00
1d49c9dc51 Web: Client: Fixed spelling errors 2021-12-21 20:25:59 +03:00
ff7b6fc432 Web: init e2e tests 2021-12-21 15:59:11 +08:00
99e37d960d Web: Socket.IO: Refactoring work with socket.io 2021-12-20 15:38:08 +03:00
156fbada6d edit translations bg 2021-12-16 17:13:44 +03:00
93cbab055c edit lo 2021-12-16 15:59:02 +03:00
9736c9ded8 Web: Socket: added redis, fixed editorCreateCopy 2021-12-16 15:28:01 +03:00
6d84bd5f04 Merge branch 'release/v1.1.0' into feature/translate-1.1.0 2021-12-15 17:22:17 +03:00
e09f079052 Web: Editor: Fixed checking key`s existing inside config 2021-12-15 15:40:37 +03:00
0244c3b924 Web: Editor: Restored config as param 2021-12-15 15:07:25 +03:00
bb31f7d574 Web: Files: refactoring socket code 2021-12-15 12:32:38 +03:00
a3e2f13e36 Web:Client:Shell: change theme from base to dark 2021-12-15 17:28:30 +08:00
gectokot
f2548e27ba Web: Studio: Moved settings menu link from hamburger menu to profile menu 2021-12-14 14:47:23 +03:00
gectokot
e9449b5a72 Web: Studio: Homepage: Fixed vertical scroll appearing on mobile in landscape mode 2021-12-14 14:45:40 +03:00
gectokot
a1f0c01558 Web: Studio: Homepage: Fixed layout jump on load 2021-12-14 14:42:40 +03:00
b5eeac9a47 edit translations 2021-12-14 12:43:10 +03:00
gectokot
1ea64c8701 Web: Studio: Homepage: Now displayName is used in greeting message 2021-12-14 11:14:08 +03:00
4860584695 Web:Client:NavMenu: add support dark theme 2021-12-14 15:52:03 +08:00
6422c65841 Web: Files: moved openDocEditor to FilesActionsStore.js. Removed socket.js, added SocketStore 2021-12-13 18:42:53 +03:00
gectokot
8ee3ef5bd5 Web: Studio: Homepage: Changed logic for greeting message 2021-12-13 16:12:52 +03:00
gectokot
6f49b68f8e Web: Studio: Homepage: Fixes 2021-12-13 15:31:23 +03:00
gectokot
0a53e3bd7d Web: Studio: Homepage: Refactoring 2021-12-13 14:50:33 +03:00
031af716e6 Tfa: fix 2021-12-10 21:25:03 +03:00
gectokot
464a5cd456 Web: Studio: Fixed links 2021-12-10 20:06:03 +03:00
gectokot
cf5723cd53 Web: Studio: Renamed function isModuleOld to checkIfModuleOld 2021-12-10 17:31:46 +03:00
gectokot
d32dc40034 Web: Studio: Fixes, refactoring 2021-12-10 17:22:03 +03:00
055c200b60 Merge branch 'release/v1.1.0' of github.com:ONLYOFFICE/AppServer into release/v1.1.0 2021-12-10 16:31:29 +03:00
1d2750f23b Web: Files: Remove privacy folders from select files/folders dialog. 2021-12-10 16:30:20 +03:00
gectokot
729e695dbc Web: Studio: Moved external link icon from utils to components 2021-12-10 16:16:10 +03:00
gectokot
4e38480b73 Web: Studio: Homepage: Removed hamburger menu 2021-12-10 13:10:36 +03:00
gectokot
85c55cd1ea Web: Studio: Homepage: Redesign 2021-12-10 12:24:35 +03:00
gectokot
49061c8e84 Web: Studio: Homepage: Changed title to new greeting message, swapped tiles and illustration 2021-12-10 10:26:13 +03:00
00ab71280c Merge branch 'release/v1.1.0' into feature/editor-history 2021-12-10 09:36:12 +03:00
878df989d9 Web: Renamed folder zh_CN to zh-CN 2021-12-09 21:51:05 +03:00
0771a54c47 Optimization 2021-12-09 20:23:06 +03:00
gectokot
eecdc3e0b1 Web: Studio: Refactoring 2021-12-09 18:59:52 +03:00
ca7a0f7cb7 WEb: Editor: Fixed file conversion when saving to a folder and opening in an adjacent tab. 2021-12-09 16:16:43 +03:00
ed41326acc Web: socket-io, first version 2021-12-09 15:50:50 +03:00
e8af856c26 Merge branch 'release/v1.1.0' into feature/translate-1.1.0 2021-12-09 13:55:55 +03:00
41681d0c94 Server: Files: Configuration: Fixed logo type for filling form mode 2021-12-09 12:45:52 +03:00
3921fa74f3 Web: Editor: Deleted useless imports. 2021-12-08 17:00:24 +03:00
c41937002f Web: Editor: Added a condition for showing the history restore function. 2021-12-08 16:52:50 +03:00
e771000f8a Web: Editor: Deleted useless code. 2021-12-08 16:46:09 +03:00
3b17a90b1b Web: Editor: Fixed after cherry picking. 2021-12-08 16:45:12 +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
aeb5121331 Web: Editor: Fixed displaying info. 2021-12-08 16:28:30 +03:00
3937082fc9 Web: Editor: Fixed object parameters of history data. 2021-12-08 16:28:30 +03:00
17129ad9d1 Erb: Editor: Renaming. 2021-12-08 16:28:30 +03:00
a3c4577482 Web: Editor: Refactoring. 2021-12-08 16:28:29 +03:00
1983d60e55 Web: Editor: Moved the functionality of converting history and getting the current version into separate functions. 2021-12-08 16:28:29 +03:00
944591cd4d Web: Editor: Added error handler for history function. 2021-12-08 16:28:29 +03:00
71aa1eb474 Web: Editor: Added restore option. 2021-12-08 16:28:29 +03:00
30bd96a4c6 Web: Editor: Fixed opening of revisions. 2021-12-08 16:28:28 +03:00
bc8a7f3dd2 Web: Editor: Removed revisions from versions list. 2021-12-08 16:28:28 +03:00
70cc67b356 Web: Editor: Refactoring. 2021-12-08 16:28:28 +03:00
d20f833889 Web: Editor: Renaming. 2021-12-08 16:28:28 +03:00
d5b2b2a395 Web: Editor: Added error handler for history data. 2021-12-08 16:28:28 +03:00
a79db0fa25 Web: Editor: Added version to the history data. 2021-12-08 16:28:27 +03:00
fcb4e43d55 Web: Editor: Removed side effect - changes of array length. 2021-12-08 16:28:27 +03:00
a6deb7febb Web: Editor: Fixed display of editing date. 2021-12-08 16:28:27 +03:00
7fd1452e81 Web: Editor: Fixed current version of document. 2021-12-08 16:28:27 +03:00
c6265a9cb4 Web: Editor: Fixed getting name and id of user for history. 2021-12-08 16:28:26 +03:00
5fa436eb21 Web: Editor: Fixed getting information of difference of file. 2021-12-08 16:28:26 +03:00
e3eb043c2a Web: Editor: Added new api method for RequestHistory method. 2021-12-08 16:28:26 +03:00
gectokot
ed3a4c85e0 Web: Studio: Moved onItemClick function to utils 2021-12-08 15:25:19 +03:00
674732ee60 Merge branch 'release/v1.1.0' into feature/translate-1.1.0 2021-12-08 15:22:53 +03:00
8441a506af add translations 2021-12-08 15:17:26 +03:00
gectokot
d0a505b844 Web: Studio: HomePage: ModuleTile: Added ability to open unavailable modules in a new tab 2021-12-08 15:17:00 +03:00
gectokot
2e1584f080 Web: Studio: HomePage: Header: Added ability to open unavailable modules in a new tab 2021-12-08 15:16:38 +03:00
gectokot
72666795aa Web: Studio: Homepage: Redesign, added illustration, refactoring 2021-12-08 15:13:29 +03:00
gectokot
b35c06f56e Web: Studio: Homepage: Added styles for external link icon 2021-12-08 15:09:57 +03:00
gectokot
9b604dbd57 Web: Studio: Homepage: Added helper functions for links 2021-12-08 15:09:19 +03:00
gectokot
0ab444b34e Web: Studio: Homepage: Moved sub components to sub-components folder 2021-12-08 15:06:32 +03:00
gectokot
dc621dac89 Web: Studio: Homepage: Added SVG illustration 2021-12-08 15:04:14 +03:00
c87a831b89 Files: optimization 2021-12-08 13:14:44 +03:00
2187cb5331 edit lv 2021-12-08 12:24:54 +03:00
475dd92c30 Web: Editor: Fixed history information. 2021-12-08 09:37:40 +03:00
6d96855e79 Web: Editor: Added list of history and possibility to close history.
# Conflicts:
#	web/ASC.Web.Editor/src/Editor.jsx
2021-12-08 09:37:02 +03:00
bdcb4cd0be moved from 51eb3d88 2021-12-07 16:56:16 +03:00
20a17fca96 rename pt 2021-12-07 16:50:09 +03:00
f9c92a6bd7 edit pt_PT 2021-12-07 12:40:49 +03:00
3607a54cd2 edit vi 2021-12-07 10:38:03 +03:00
7973639195 edit vi 2021-12-07 10:37:30 +03:00
ee935ec401 edit az 2021-12-06 18:21:35 +03:00
f8bdd48db8 add pt_PT 2021-12-06 18:21:13 +03:00
6ef7c23bac add pt_PT 2021-12-06 18:20:48 +03:00
0952d01250 add uk 2021-12-06 17:29:41 +03:00
9126ea393d add uk 2021-12-06 17:29:19 +03:00
40c5a0d6b2 add az 2021-12-06 17:11:54 +03:00
4fef520aba Merge branch 'release/v1.1.0' into feature/translate-1.1.0 2021-12-06 15:09:57 +03:00
d0a4cee8ef edit translations 2021-12-06 13:05:56 +03:00
a059fc9b7c edit translations 2021-12-06 13:05:31 +03:00
af2e95dfd7 edit cs 2021-12-06 11:28:11 +03:00
086cc8efd2 Web: Fixed format of searchParam for files selector 2021-12-03 18:41:57 +03:00
e60c082a1d Web: Client: fixed position profile menu drop down 2021-12-02 18:58:43 +05:00
3a50fca3cc Merge branch 'hotfix/v1.1.1' into bugfix/dropdown-correct-display 2021-12-02 18:32:36 +05:00
a012038f3b Merge branch 'develop' into feature/catalog 2021-12-02 14:59:31 +08:00
edff6e2f40 update pl 2021-12-01 18:32:54 +03:00
bc58174a89 update pl 2021-12-01 18:13:16 +03:00
e1b0164bd3 update cs 2021-12-01 18:04:36 +03:00
00f2e1821e edit cs 2021-12-01 18:03:54 +03:00
0ba91e0100 update cs 2021-12-01 17:54:46 +03:00
870f05fc83 add el 2021-12-01 17:42:50 +03:00
e4ee37660e update el 2021-12-01 17:40:56 +03:00
50a4added2 update el 2021-12-01 17:40:27 +03:00
a17e301cde update bg 2021-12-01 14:36:33 +03:00
7823b9804c update bg 2021-12-01 14:36:04 +03:00
1ea835b0bf Merge branch 'release/v1.1.0' into feature/translate-1.1.0 2021-12-01 12:05:51 +03:00
27e732e9a3 Web: Login: Added usage of new API /authentication.json parameter "session" 2021-12-01 10:56:50 +03:00
626191c5d7 Core: fixed session 2021-11-30 22:16:23 +03:00
39b10cf7b1 edit ro 2021-11-30 17:20:47 +03:00
d5d87a679f update translations 2021-11-30 12:35:00 +03:00
77f86fccdb update translations 2021-11-30 12:31:54 +03:00
4c78667a99 fix Bug 52493 - Welcome page. notify «User with this email is already registered» 2021-11-30 12:09:51 +03:00
b2c123d6f4 Merge branch 'release/v1.1.0' into feature/translate-1.1.0 2021-11-30 11:46:22 +03:00
a032b83a32 Web: Editor: Optimization - Removing unnecessary api requests. 2021-11-30 10:59:41 +03:00
43d04b28de edit uk 2021-11-29 15:27:40 +03:00
5a5169b391 edit cz 2021-11-29 15:22:40 +03:00
bbe874054e update translations 2021-11-29 12:37:32 +03:00
cecfc406c5 Auth: added session param 2021-11-26 21:59:39 +03:00
d297fa0dd1 fix Bug 52071 2021-11-26 21:36:51 +03:00
04a56e57cb Web: Editor: Fixed bug with starting api calls before getting file id 2021-11-26 13:48:15 +03:00
18d0cd0842 Web: Shell: Fix minimization on production build static 2021-11-25 17:39:25 +03:00
384e012c5f net 6: remove TryUseWindowsService 2021-11-25 16:48:08 +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
ff9bb93efd Web: Scripts: Hide shx mkdir errors 2021-11-25 15:06:19 +03:00
58d84912dd fix 2021-11-25 11:23:35 +03:00
038cf92a91 ApiSystemHelper: fix check 2021-11-25 11:00:17 +03:00
13e13f2303 Net: fix requests 2021-11-24 22:34:39 +03:00
fcb6723d1f Fixed Bug 53502 - Client.Editor.Added message about locked file. 2021-11-24 14:12:47 +03:00
b74e4ccfd1 Removed unused dependencies. Fixed tests 2021-11-24 12:39:39 +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
59c88e2006 up to 6.0.0 2021-11-23 17:56:27 +03:00
8ca88e4620 Merge branch 'develop' into feature/net6
# Conflicts:
#	common/ASC.Api.Core/Core/BaseStartup.cs
#	common/ASC.Common/ASC.Common.csproj
#	products/ASC.CRM/BackgroundTasks/ASC.CRM.BackgroundTasks.csproj
#	products/ASC.Files/Core/HttpHandlers/FileHandler.ashx.cs
#	products/ASC.Files/Server/ASC.Files.csproj
#	web/ASC.Web.HealthChecks.UI/ASC.Web.HealthChecks.UI.csproj
2021-11-23 16:40:50 +03:00
3417cb28f4 Merge branch 'release/v1.1.0' of github.com:ONLYOFFICE/AppServer into release/v1.1.0 2021-11-22 11:25:49 +03:00
b632f3a623 Web: Fixed styles according layouts, renaming. 2021-11-22 10:15:24 +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
4cd9d042de Web: Files: fixed styles after Cherry picking. 2021-11-19 16:58:31 +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
cc35174d16 moved from 043e301 2021-11-16 20:40:15 +03:00
2c6e0d45bc Web: Fix wrong braces of variables inside translation files 2021-11-13 19:07:48 +03:00
c7c7267a9a Test: Added new WrongTranslationVariablesTest and fix it's issues 2021-11-13 19:03:10 +03:00
623313e4be Web: Restored missing 'ru' translations 2021-11-12 21:14:44 +03:00
5ff07a8293 Web: Fix UselessTranslationKeysTest translation issues 2021-11-12 20:46:04 +03:00
d8cf12f9d7 translations 2021-11-12 19:00:01 +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
fc42416fea fix config 2021-11-12 10:57:12 +03:00
2ea63910a2 Web: Added encoding/decoding operations for string file ids. Fixed errors with opening folders and files with string ids 2021-11-11 15:37:23 +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
cd897aa8f1 Web: About: Fix DublicatesByContentTest translation issue 2021-11-08 15:33:27 +03:00
a876ce8b67 Web:Common:PageLayout: add catalog in readme and storybook 2021-11-08 17:23:56 +08:00
baccb134a6
Web: Refactoring asyn/promise calls 2021-11-03 18:35:15 +03:00
3ebff769b1 Web: Login: Fixed login function for desktop client 2021-11-03 12:19:28 +03:00
eb1db9eea6 Merge branch 'hotfix/v1.0.1' into feature/desktop-login 2021-11-02 18:15:53 +03:00
dd89318a40 Web: People: Profile: Fixed serialized profile property 2021-11-02 18:12:15 +03:00
d37aa52f09 Merge branch 'develop' into feature/catalog 2021-11-02 21:04:46 +08:00
aa79ef2c9d Merge branch 'hotfix/v1.0.1' into feature/desktop-login 2021-11-02 14:03:26 +03:00
4e018d2d71 Web: Bump version to 1.0.1 2021-11-02 14:02:46 +03: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
26511d9fb7 Merge branch 'develop' into feature/webhooks
# Conflicts:
#	ASC.Tests.sln
2021-10-29 13:18:57 +03:00
3c25ee55b3 Auth: temp fix for plugin 2021-10-28 20:14:20 +03:00
Artem Tarasov
8c6a3f9fcd Web: Editor/Login: changed the way to save the link from sessionStorage to localStorage 2021-10-28 13:32:23 +03:00
0215599566 merge from develop 2021-10-27 19:37:12 +03:00
c0ea857dbf
Merge pull request #435 from ONLYOFFICE/bugfix/Bug-53050
Web: Editor/Login: fixed bug 53050: fixed redirect to editors after l…
2021-10-27 18:54:08 +03:00
Artem Tarasov
82e136b0e0 Web: Login: fixed remove key from session storage 2021-10-27 18:09:46 +03:00
f5d5e92fb8 Web: Client: Added redirect to default page for personal 2021-10-27 17:13:03 +03:00
Artem Tarasov
e42b09d025 Web: Editor/Login: fixed bug 53050: fixed redirect to editors after login when following a direct link to editors 2021-10-27 16:48:09 +03:00
403388fbf1 Added solution filter
Removed unused services
replaced sh with bat
start service from source
2021-10-25 14:29:36 +03:00
09897ffc2b net6: warning SYSLIB0014 2021-10-25 14:03:14 +03:00
e5e4a89e5b Merge branch 'develop' into feature/net6 2021-10-22 16:10:37 +03:00
e310d5e655 net6: httpClient: add using 2021-10-21 17:56:31 +03:00
f6f317ec42 net6: refactoring and bugfix 2021-10-21 16:23:26 +03:00
657e34d474 Web:Studio:NavMenu: fix showing navigation icons 2021-10-21 20:36:25 +08:00
9aa3fd7047 Web:Common:Catalog: update branch 2021-10-20 22:31:39 +08:00
7d511385bc removed unused references 2021-10-19 19:08:47 +03:00
5a5e299d98 Merge branch 'develop' into feature/webhooks
# Conflicts:
#	ASC.Web.sln
#	common/ASC.Api.Core/Core/BaseStartup.cs
#	common/services/ASC.Data.Backup/ASC.Data.Backup.csproj
#	web/ASC.Web.Api/ASC.Web.Api.csproj
2021-10-19 18:30:59 +03:00
4bd4954ad4 Merge branch 'release/1.0.0' into feature/desktop-login 2021-10-19 13:10:47 +03:00
7481f3a2d0 Merge branch 'develop' into feature/catalog 2021-10-19 15:51:12 +08:00
b6461e46f4 net6: replacing System.Drawing with ImageSharp 2021-10-18 14:24:05 +03:00
58fce28bf5 Merge branch 'release/1.0.0' into bugfix/dropdown-correct-display 2021-10-15 16:53:45 +05:00
7c9980b475 Web: Removed index from remoteEntry url (disk cache issue) 2021-10-15 12:49:15 +03:00
9c7207dfe3 Web:Studio:Header: fixed badge style 2021-10-15 17:19:28 +08:00
fb7922f579 Thirdparty: login. Desktop 2021-10-15 11:34:34 +03:00
bc37fcc8ce Merge branch 'release/1.0.0' into bugfix/dropdown-correct-display 2021-10-14 16:06:55 +05:00
6947adcfc8 Personal: fix quota 2021-10-14 13:47:12 +03:00
8033b74ecd Web: Editor: Hide loader on onSDKAppReady 2021-10-13 16:28:40 +03:00
ab6932113c Web: Editor: Replaced loader 2021-10-13 16:14:35 +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
735a9b60cf net6: warning CA1416
also remove unnecessary usings
2021-10-13 11:07:03 +03:00
66d126410c Login: added desktop param 2021-10-13 10:25:19 +03:00
6e4e3d69aa Merge branch 'release/1.0.0' into bugfix/dropdown-correct-display 2021-10-12 20:26:45 +05:00
ae9a3187bc net6: warning SYSLIB0014 2021-10-12 13:14:33 +03:00
a1a4818136 Web: Fix Bug 53050: 404 on primary file link after logout 2021-10-12 12:10:09 +03:00
72b19da283 Files: fix requests 2021-10-08 12:49:29 +03:00
801c5ff561
Merge pull request #389 from ONLYOFFICE/feature/editor-edit-button
Web: Editor: Added edit editor button.
2021-10-07 19:26:36 +03:00
14fd3c82f5 Web: Deleted useless code. 2021-10-07 19:18:55 +03:00
1ee16ce600 Web: Editor: Added error handler. 2021-10-07 19:05:31 +03:00
659a5a409b Web: Editor: Fixed url after converting. 2021-10-07 19:04:22 +03:00
b8f77d4a29 Web: Editor: Added edit editor button. 2021-10-07 18:31:45 +03:00
31570e57d7 Merge branch 'release/1.0.0' into bugfix/fixed-styles-selcted-row 2021-10-07 17:47:54 +03:00
335c580d78 Web: Dev: Downgrade lerna to v3.22.1 and update webpack-dev-server and webpack-cli (yarn start + Ctrl-C stop issue) 2021-10-07 17:32:32 +03:00
b0fe6bd9e2 Merge branch 'release/1.0.0' into bugfix/dropdown-correct-display 2021-10-07 15:17:04 +03:00
7a380542aa net6: warning SYSLIB0023 2021-10-07 12:00:26 +03:00
deffb0c901 Merge branch 'release/1.0.0' into bugfix/fixed-styles-selcted-row 2021-10-06 21:01:53 +03:00
5dbf54c2b3 Web: Fix open '/Products/Files' and '/Products/Files/?desktop=true' (desktop provider 'onlyoffice' issue) 2021-10-06 20:52:22 +03:00
a33d49f356 Web: Files: fixed icons, fixed styles 2021-10-06 15:23:12 +03:00
4dc7977ec7 Web:Studio:NavMenu: deleted comments 2021-10-06 20:07:32 +08:00
435cf08f30 Web:Studio:NavMenu: fixed tablet view 2021-10-06 18:09:45 +08:00
d4fd6c470d Web:Studio:NavMenu: deleted console log 2021-10-06 18:01:37 +08:00
a7f676e92d Web:Studio: edited nav menu v1.2.1 2021-10-06 17:58:57 +08:00
edd967de76 Web:Studio: edited nav menu v1.2.1 2021-10-06 17:58:09 +08:00
aa66baf2b6 Web: Client: fixed header logo 2021-10-06 12:36:42 +03:00
55cb1e875e Web: fixed header height 2021-10-06 12:22:28 +03:00
4a16633734 Merge branch 'release/1.0.0' into bugfix/dropdown-correct-display 2021-10-05 18:14:15 +05:00
ed20953d9c Web: Hide warning overlay 2021-10-05 14:57:42 +03: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
159e284dd0 Web: Added opportunity to show/hide debug info 2021-10-05 09:56:59 +03:00
6e926eceb9 Web: Removed browserslist (loading bundle issues) 2021-10-05 09:48:08 +03:00
ee4b6de3ff Web: Optimizated debuginfo.md loading 2021-10-04 19:43:38 +03:00
dec1c42b71 Web: Fix dialog content height 2021-10-04 19:37:01 +03:00
9ce696e624 Web: Studio: Init Debug Info
+ Added About version from package.json
+ Fix DocumentServer version
2021-10-04 17:08:03 +03:00
027e01ce71 Api: fix document server version 2021-10-03 14:50:33 +03:00
6988c4f997 net6: warning SYSLIB0021 2021-10-01 13:28:15 +03:00
0f833ae1de net6: warning SYSLIB0020 2021-10-01 13:26:36 +03:00
53c77f5214 Files: fix startedit 2021-10-01 11:04:19 +03:00
03774e3500
Merge pull request #364 from ONLYOFFICE/bugfix/insert-editor-image
Bugfix/insert editor image
2021-09-30 19:27:32 +03:00
912b9661c1 Web: Refactoring. 2021-09-30 18:31:18 +03:00
fdeab37e01 Fix bug 52874: letters instead of avatar 2021-09-30 18:19:14 +03:00
b36f141cfb Web:Common: fixed catalog on big screen tablet or mobile 2021-09-30 17:05:04 +08:00
4aa710a833 Fix Bug 52850: Added image replacement. 2021-09-30 11:51:22 +03:00
e5807a43fc Merge develop branch 2021-09-29 20:52:55 +08:00
97b6fdc6e7 Bug 51393 - Personal: Security. There is possible to know email registered users with help "Signup" 2021-09-28 15:17:06 +03:00
74f422ac75 Merge branch 'develop' into release/1.0.0 2021-09-27 16:09:43 +03: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
d2760c26b1 Fix Bug 52778 - Client.Editor.‘Image URL is incorrect’ when pasting an image from the repository. 2021-09-27 12:51:11 +03: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
4531d38e6f Web: Removed duplicates 2021-09-24 21:18:50 +03:00
90bb2ef44a fixed bearer 2021-09-24 12:08:10 +03:00
844b996a66 Web: Client: fixed window height for IOS (Firefox, Safari) 2021-09-22 16:37:11 +03:00
e87329f2d3 Fixed Bug 52646 - iOS.Docs.Mobile. Fixed the type of device for the editor 2021-09-21 12:17:26 +03:00
b75940fe49 fix 2021-09-17 18:18:34 +03:00
737efc3be7 Api: settings. Added recapthca public key 2021-09-17 17:57:22 +03:00
6233ab55a3 Personal: added register method 2021-09-17 17:32:37 +03:00
b1a82ab253 Fix Bug 52610: Client.Clouds.Favorite.Editor.The file is not added to Favorites from the editor in folders of third-party storages. 2021-09-16 18:37:26 +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
1f5554c748 Web: Shell: Fix bad merge 2021-09-15 15:56:15 +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
8857702fcb Web: Client: fix open profile 2021-09-15 13:59:48 +03:00
b92deb5391 Web: Shell: Added key to login route 2021-09-15 11:49:20 +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
8835570193 Settings: added param withpassword 2021-09-13 15:42:09 +03:00
fe6014a440 Web: Update webpack to v5.52.1 2021-09-13 15:08:48 +03:00
6cea372119 Fix Bug 52282 - Client.Files. When grabbing the left mouse button, page elements go beyond their boundaries. 2021-09-13 13:48:30 +03:00
e6e49559a9 Merge branch 'release/1.0.0' into bugfix/dropdown-correct-display 2021-09-13 14:59:06 +05:00
009dc5b7a3 Web: Studio: added ref for drop-down 2021-09-13 14:57:51 +05:00
1fe11360a8 Web: Components: added portals to drop-down 2021-09-13 14:56:02 +05:00
f06e3c076b Fix Bug 52282 - Client.Files. When grabbing the left mouse button, page elements go beyond their boundaries 2021-09-13 12:54:59 +03: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
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
4661dd4344 Web: Editor: Fix WARNING in shared module react-toastify 2021-09-10 11:37:45 +03:00
f7c46a70fa Web: Updates next dev packages:
- @babel/preset-env
- css-loader
- sass
- sass-loader
- serve
- source-map-loader
- style-loader
- terser-webpack-plugin
- webpack-dev-server
+ Fixed css-loader url resolution issues
2021-09-10 11:30:27 +03:00
a5b320764f Web: Removed useless package compression-webpack-plugin 2021-09-09 13:19:58 +03:00
15dab2adaa Web: Updated copy-webpack-plugin package 2021-09-09 13:17:27 +03:00
b4661539ec Merge branch 'release/1.0.0' of github.com:ONLYOFFICE/AppServer into release/1.0.0 2021-09-09 13:06:12 +03:00
5b880d5b6a Web: Updated clean-webpack-plugin package 2021-09-09 12:58:49 +03:00
f73ffec535 Web: Layout: Fixed selection of scroll body for ipad. 2021-09-09 11:55:16 +03:00
d4bd4dcb50 Web: Updated webpack and it's dependencies (new v5.52.0) + moved to new webpack-dev-server v4.1.1 2021-09-09 11:28:52 +03:00
18718aab93 Web: Updated babel packages 2021-09-08 17:40:31 +03:00
bfb85fd05f Web: Removed duplicated dependency declaration (attr-accept) 2021-09-08 17:17:57 +03:00
8c731a1630 Web: Turned off wdyr 2021-09-08 16:57:40 +03:00
618cf7a1ce Api: fix SendJoinInviteMail 2021-09-08 16:28:10 +03:00
fabaaef0f9 Web: Updated react-toastify and extended ModuleFederationPlugin shared section 2021-09-08 16:28:10 +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
11aa89a628 Web: Updated @babel/runtime and extended ModuleFederationPlugin shared section 2021-09-08 16:04:05 +03:00
124df88c58 Merge branch 'release/1.0.0' of github.com:ONLYOFFICE/AppServer into release/1.0.0 2021-09-08 15:47:02 +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
c41eb97a0f Web: Extended ModuleFederationPlugin shared section 2021-09-08 15:41:11 +03:00
67eeb56f16 Web: Removed duplicated dependency declaration (email-addresses) 2021-09-08 13:54:49 +03:00
c3578df58b Web: Editor: fixed document opening for desktop editors 2021-09-08 13:48:28 +03:00
0167083a03 Fixed Bug 51819 - Client.Editor. Fixed file conversion 2021-09-08 12:32:03 +03:00
d66e8a4046 Web: Files: fixed drag files 2021-09-08 11:36:43 +03:00
c0cd0ea269 fix Bug 51444 2021-09-07 22:42:31 +03:00
7684723dd1 Web: Fixed scroll for mobile layout. 2021-09-07 14:22:00 +03:00
a30f75b0b4 Merge branch 'release/1.0.0' of github.com:ONLYOFFICE/AppServer into release/1.0.0 2021-09-07 11:38:30 +03:00
009a801be7 Web: Personal: fixed redirect to login 2021-09-07 11:38:24 +03:00
52ae3d2732 Merge branch 'release/1.0.0' of github.com:ONLYOFFICE/AppServer into release/1.0.0 2021-09-07 09:49:25 +03:00