|
|
21f3c390bb
|
Web: Studio: fixed file name
|
2022-01-18 14:45:45 +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 |
|
|
|
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 |
|
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 |
|
|
|
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 |
|
|
|
0a786bbfa3
|
analizators/s4830
|
2021-12-28 15:00:48 +03:00 |
|
|
|
605e7eba35
|
Fix bad merge febf172875
|
2021-12-28 14:56:00 +03: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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
d1fe0950a1
|
Web: AutoBackup: Added disable use of buttons at the time of saving, refactoring.
|
2021-11-01 12:20:40 +03:00 |
|
|
|
7b083aad4b
|
Web: Refactoring, fixed non-update stateю
|
2021-11-01 11:27:21 +03:00 |
|
|
|
cafbe52e7b
|
Web: Backup: Optimization.
|
2021-11-01 11:26:25 +03:00 |
|
|
|
28cb2e5519
|
Web: Deleted disabling cancel button.
|
2021-11-01 11:26:02 +03:00 |
|
|
|
6dadf809bf
|
Web: Backup: Fixed translation.
|
2021-10-29 17:13:02 +03:00 |
|
|
|
94d0cd1afd
|
Web: Refactoring.
|
2021-10-29 16:13:31 +03:00 |
|
|
|
59eee87d55
|
Web: Backup: Deleted useless code.
|
2021-10-29 15:32:24 +03:00 |
|
|
|
aa165a7098
|
Web: Added common styles.
|
2021-10-29 14:25:06 +03:00 |
|
|
|
3eaff28c47
|
Web: Fixed month and weekday options.
|
2021-10-29 14:12:26 +03:00 |
|
|
|
300791d509
|
Web: Deleted useless code.
|
2021-10-29 14:11:51 +03:00 |
|
|
|
26511d9fb7
|
Merge branch 'develop' into feature/webhooks
# Conflicts:
# ASC.Tests.sln
|
2021-10-29 13:18:57 +03:00 |
|
|
|
33fa8b9dc8
|
Web: Fixed day of month.
|
2021-10-29 11:55:00 +03:00 |
|
|
|
3c25ee55b3
|
Auth: temp fix for plugin
|
2021-10-28 20:14:20 +03:00 |
|
|
|
424c536ecf
|
Web: RestoreBackup: Fixed styles.
|
2021-10-28 17:18:33 +03:00 |
|
|
|
ffa27f357e
|
Web: Fixed import
|
2021-10-28 17:18:10 +03:00 |
|
|
|
3d8a4a1a22
|
Web: Refactoring.
|
2021-10-28 16:26:00 +03:00 |
|
|
|
d114f5c9c6
|
Web: RestoreBackup: Renamed files.
|
2021-10-28 16:23:02 +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 |
|
|
|
07c5dcf5ec
|
Web: Refactoring.
|
2021-10-28 12:17:01 +03:00 |
|
|
|
33245ac05d
|
Web: Bakup: Optimization, added a flag about the ability to show the automatic backup moduleю
|
2021-10-28 12:15:52 +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 |
|
|
|
25d5e0f41f
|
Web: AutoBackup: Fixed error handler.
|
2021-10-27 17:16:33 +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 |
|
|
|
184975e729
|
Web: RestoreBackup: Fixed redirect to preparation page when restore from backup list.
|
2021-10-27 15:53:01 +03:00 |
|
|
|
f6e362d9b5
|
Web: Files: RestoreBackup: Disabled restore button when is restoring process.
|
2021-10-27 15:29:14 +03:00 |
|
|
|
e1a7d5f256
|
Web: Refactoring, added error handlers.
|
2021-10-27 14:20:44 +03:00 |
|
|
|
29ee1eabc6
|
Web: PreparationPortal: Added error message.
|
2021-10-27 13:34:56 +03:00 |
|
|
|
86eb4533d9
|
Web :Files: fixed translation.
|
2021-10-25 15:11:46 +03:00 |
|
|
|
ffe9049e3f
|
Web: Files: Fixed styles.
|
2021-10-25 15:06:56 +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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
b6461e46f4
|
net6: replacing System.Drawing with ImageSharp
|
2021-10-18 14:24:05 +03:00 |
|
|
|
1803681aef
|
Web: Backup: Renamed files.
|
2021-10-16 18:52:58 +03:00 |
|
|
|
f98e866571
|
Web: Settings: Renamed files.
|
2021-10-16 18:50:02 +03:00 |
|
|
|
be77a8231b
|
Web: Settings: ManualBackup: Canceled switching to a new tab when downloading a backup.
|
2021-10-16 18:46:34 +03:00 |
|
|
|
c5ebdb333b
|
Web: settings: Renamed manual backup.
|
2021-10-16 18:44:04 +03:00 |
|
|
|
17628fd641
|
Web: Settings: AutoBackup: Added correct allocation of the maximum number of copies.
|
2021-10-16 18:42:24 +03:00 |
|
|
|
58fce28bf5
|
Merge branch 'release/1.0.0' into bugfix/dropdown-correct-display
|
2021-10-15 16:53:45 +05:00 |
|
