|
|
8acb550b08
|
files helpers moved to ASC.Files.Core
|
2022-07-25 14:03:31 +03:00 |
|
Artem Tarasov
|
57fb7ca7e1
|
Web: Doceditor: fixed api requests
|
2022-07-25 13:24:43 +03:00 |
|
|
|
57f797ab24
|
Merge branch 'develop' into feature/migrations-fix
|
2022-07-25 12:59:19 +03:00 |
|
|
|
c01edd78be
|
Api: Capabilities fix
|
2022-07-25 12:57:03 +03:00 |
|
Artem Tarasov
|
06450fe804
|
Merge branch 'develop' into bugfix/doceditor-fix
|
2022-07-25 10:39:06 +03:00 |
|
Artem Tarasov
|
5656eb6072
|
Web: Doceditor: optimized dialog rendering
|
2022-07-25 10:37:57 +03:00 |
|
|
|
61ec4a18da
|
migrations moved to external projects
|
2022-07-24 16:02:00 +03:00 |
|
|
|
ea74b77dcd
|
Web: Client: move toast to shell
|
2022-07-24 00:50:19 +03:00 |
|
|
|
86337271e4
|
Web: Client: IndicatorLoader: fix position
|
2022-07-23 22:07:50 +03:00 |
|
|
|
8152557397
|
Web: Client: Settings: fix article loader
|
2022-07-23 22:07:25 +03:00 |
|
|
|
bcf6faf40d
|
Web: Client: add dialogs wrapper, fix rerender
|
2022-07-23 02:15:16 +03:00 |
|
|
|
7cf51de990
|
Web: Client: ProfileActionsStore: fix open about
|
2022-07-23 02:07:37 +03:00 |
|
Vashchuk Nikita
|
b336eafa37
|
Merge branch 'feature/migrations-fix' of github.com:ONLYOFFICE/AppServer into feature/migrations-fix
# Conflicts:
# common/ASC.Core.Common/Migrations/MySql/VoipDbContextMySql/20220722192649_VoipDbContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/PostgreSql/VoipDbContextPostgreSql/PostgreSqlVoipDbContextModelSnapshot.cs
|
2022-07-22 22:40:58 +03:00 |
|
Vashchuk Nikita
|
8a1a8b809f
|
fix contexts
|
2022-07-22 22:31:42 +03:00 |
|
|
|
e7252c4bc4
|
Web: Moved all clients app to packages directory
|
2022-07-22 22:01:25 +03:00 |
|
|
|
e07e2be900
|
Api: theme method is now anonymous
|
2022-07-22 19:32:51 +03:00 |
|
|
|
12e7d4edbf
|
Merge branch 'develop' into feature/settings-common
|
2022-07-22 13:22:59 +03:00 |
|
|
|
c7ed3ed7bf
|
Web:Studio:Added a toastr.
|
2022-07-22 13:19:30 +03:00 |
|
|
|
82759ba40d
|
Web:Studio:Saving the selected theme.
|
2022-07-22 11:13:06 +03:00 |
|
|
|
61a1862f50
|
Web: Client: ProfileActionsStore: add icon
|
2022-07-22 10:31:32 +03:00 |
|
|
|
180aa03d95
|
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/remove-header
|
2022-07-22 10:22:52 +03:00 |
|
|
|
b0682e5da3
|
Api: fixed colortheme
|
2022-07-21 20:51:01 +03:00 |
|
|
|
9792fcb72f
|
api: fix
|
2022-07-21 18:06:34 +03:00 |
|
Artem Tarasov
|
284f0ef58d
|
Web: Common/Client: deleted unnecessary comment, fix import tryRedirectTo
|
2022-07-21 18:05:23 +03:00 |
|
|
|
4e83c68e4c
|
Api: added themelimit
|
2022-07-21 18:02:32 +03:00 |
|
|
|
fbc4bc000b
|
Web: Login: add docspace logo
|
2022-07-21 17:08:58 +03:00 |
|
|
|
88c23a0453
|
Web: Client: hide header on login page
|
2022-07-21 16:41:29 +03:00 |
|
Artem Tarasov
|
f191e3f3ca
|
Web: Doceditor: fixed logpath
|
2022-07-21 16:01:01 +03:00 |
|
|
|
3bc5f3a6eb
|
Api: added theme methods
|
2022-07-21 14:49:30 +03:00 |
|
|
|
fa5bec9adc
|
Web: Client: NavMenu: fix logo position
|
2022-07-21 14:49:00 +03:00 |
|
Artem Tarasov
|
67e6e54f45
|
Web: Doceditor: fixed timeout clearing before broadcast signal after client build
|
2022-07-21 14:48:50 +03:00 |
|
|
|
80de7c43d4
|
Web: Client: move indicator loader from navmenu
|
2022-07-21 14:37:44 +03:00 |
|
|
|
831bdc578f
|
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/remove-header
# Conflicts:
# packages/asc-web-common/components/Article/styled-article.js
# products/ASC.Files/Client/src/Files.jsx
|
2022-07-21 14:22:28 +03:00 |
|
Artem Tarasov
|
243ccf34a5
|
Web: Doceditor: fixed adding script with src="undefined", client bundle optimization
|
2022-07-21 13:56:59 +03:00 |
|
|
|
77d311b636
|
Merge branch 'develop' into feature/doceditor-ssr
|
2022-07-21 11:41:42 +03:00 |
|
Artem Tarasov
|
166eaadde0
|
Web: Doceditor: changed server hierarchy, optimization of dev and prod server builds, client refactoring
|
2022-07-21 02:50:50 +03:00 |
|
|
|
1495190df7
|
Web:Studio:Modal save button work.
|
2022-07-20 23:47:14 +03:00 |
|
Artem Tarasov
|
36f10d4959
|
Web: Doceditor: refactoring
|
2022-07-20 23:23:53 +03:00 |
|
Artem Tarasov
|
b7ceb047df
|
Web: Doceditor: added winston to initMiddleware
|
2022-07-20 23:14:20 +03:00 |
|
|
|
a5f4435b17
|
fix notify
|
2022-07-20 22:06:33 +03:00 |
|
Artem Tarasov
|
3f4e4f599c
|
Web: Doceditor: fixed webpack production build
|
2022-07-20 14:44:44 +03:00 |
|
Artem Tarasov
|
abdfe934d6
|
Web: Doceditor: fixed process.cwd -> path.join
|
2022-07-20 14:43:27 +03:00 |
|
Artem Tarasov
|
77b7fc884e
|
Web: Doceditor: fixed build and deploy scripts
|
2022-07-20 14:42:35 +03:00 |
|
|
|
68bfe739ca
|
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/remove-header
|
2022-07-20 14:15:42 +03:00 |
|
|
|
5b762545a4
|
Merge branch 'develop' into feature/settings-common
|
2022-07-20 14:00:11 +03:00 |
|
Artem Tarasov
|
20d31cb0c2
|
Web: Doceditor: refactoring, restoring error message display
|
2022-07-20 13:25:09 +03:00 |
|
|
|
cccd0cfc31
|
Web:Studio:Added modal button functionality.
|
2022-07-20 13:00:13 +03:00 |
|
|
|
2c9a4f8181
|
Web: Client: fix t ns and keys
|
2022-07-20 12:27:30 +03:00 |
|
|
|
cf1b168dd6
|
Web: move locales to Common
|
2022-07-20 12:22:38 +03:00 |
|
|
|
75042eedf0
|
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/remove-header
# Conflicts:
# packages/asc-web-common/components/Article/styled-article.js
|
2022-07-20 10:00:32 +03:00 |
|
|
|
df26c82593
|
Tfa: fix reset cookie
|
2022-07-20 09:56:24 +03:00 |
|
Artem Tarasov
|
37dbf5e38f
|
Web: Doceditor: fixed render SelectFolderDialog
|
2022-07-20 02:19:40 +03:00 |
|
Artem Tarasov
|
aafb79500f
|
Web: Doceditor: moved client i18n initialization from developer, fixed render SelectFileDialog
|
2022-07-20 00:52:49 +03:00 |
|
Artem Tarasov
|
3f8a1d9f99
|
Web: Doceditor: fixed render dialogs, added MobxProvider
|
2022-07-20 00:17:37 +03:00 |
|
Artem Tarasov
|
040880d3c7
|
Web: Doceditor: fixed font loading
|
2022-07-19 23:12:38 +03:00 |
|
Artem Tarasov
|
4ddffad7b2
|
Merge branch 'develop' into feature/doceditor-ssr
|
2022-07-19 18:22:16 +03:00 |
|
|
|
66b0e8c303
|
Merge branch 'develop' into bugfix/tfa
|
2022-07-19 18:17:22 +03:00 |
|
|
|
067e105814
|
Merge branch 'develop' into feature/modal-redesign
|
2022-07-19 16:58:02 +03:00 |
|
|
|
b98524532f
|
Merge branch 'develop' into feature/migrations-fix
# Conflicts:
# common/ASC.Core.Common/EF/Model/CRM/DbVoipCall.cs
# common/ASC.Core.Common/EF/Model/CRM/VoipNumber.cs
# common/ASC.Core.Common/Migrations/MySql/VoipDbContextMySql/20220711152836_VoipDbContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/VoipDbContextMySql/MySqlVoipDbContextModelSnapshot.cs
# common/ASC.Core.Common/Migrations/PostgreSql/VoipDbContextPostgreSql/20220711152837_VoipDbContextPostgreSql.Designer.cs
# common/ASC.Core.Common/Migrations/PostgreSql/VoipDbContextPostgreSql/PostgreSqlVoipDbContextModelSnapshot.cs
|
2022-07-19 16:04:29 +03:00 |
|
|
|
c17817eed8
|
Web: Client: NavMenu: delete email
|
2022-07-19 14:35:48 +03:00 |
|
|
|
0c2d54638f
|
Web: Client: NavMenu: fix button size
|
2022-07-19 14:10:36 +03:00 |
|
|
|
7f241f4c90
|
Web: Client: add profile actions
|
2022-07-19 14:08:06 +03:00 |
|
|
|
ad4767d572
|
Web: Client: move debug dialog to shell
|
2022-07-19 12:35:08 +03:00 |
|
Artem Tarasov
|
3da9439f0f
|
Web: Doceditor: fixed webpack config
|
2022-07-19 10:58:50 +03:00 |
|
Artem Tarasov
|
9f19891d0b
|
Web: Doceditor: fix after merge
|
2022-07-19 10:48:26 +03:00 |
|
|
|
a82f4293e7
|
Web: Client: ProfileActionsStore: add urls, fix about
|
2022-07-18 22:09:38 +03:00 |
|
|
|
93fc644a6a
|
Web: Client: NavMenu: use profile actions store
|
2022-07-18 22:09:07 +03:00 |
|
|
|
7b6b252a09
|
Web: Client: create profile actions store, del about store
|
2022-07-18 21:46:43 +03:00 |
|
|
|
8648b588fa
|
Web:Studio:Сolor palette stylization.
|
2022-07-18 18:48:21 +03:00 |
|
Artem Tarasov
|
10f2cde731
|
Merge branch 'develop' into feature/doceditor-ssr
# Conflicts:
# .gitignore
|
2022-07-18 17:05:53 +03:00 |
|
Artem Tarasov
|
d4968b3225
|
Web: Doceditor: refactoring
|
2022-07-18 16:13:45 +03:00 |
|
Artem Tarasov
|
8c46fc661d
|
Web: Doceditor: added i18n initialization
|
2022-07-18 16:07:22 +03:00 |
|
|
|
18c1fdc0d2
|
Web: Added the loader display with a delay so that there are no content jumps.
|
2022-07-18 15:29:16 +03:00 |
|
|
|
24423a2cb4
|
Web: RestoreBackup: Added new loader.
|
2022-07-18 14:39:11 +03:00 |
|
|
|
005b72216d
|
Web: Client: move about dialog to shell
|
2022-07-18 14:09:09 +03:00 |
|
Artem Tarasov
|
d70e2df443
|
Web: Doceditor: added logger
|
2022-07-18 13:56:22 +03:00 |
|
|
|
47f8e166c5
|
Web: RestoreBackup: Added blocking of actions when the option is not enabled.
|
2022-07-18 13:25:45 +03:00 |
|
|
|
f190701f0b
|
Web: Deleted useless code.
|
2022-07-18 12:53:45 +03:00 |
|
|
|
dd57b55be0
|
Web: ManualBackup: The button is disabled if the folder of a third-party account is not selected.
|
2022-07-18 12:52:16 +03:00 |
|
|
|
43d8788558
|
Web: Added URL for each section.
|
2022-07-18 12:50:14 +03:00 |
|
|
|
d94904b6af
|
removed voip
|
2022-07-18 12:24:12 +03:00 |
|
|
|
a31a038b9f
|
Web: AutoBackup: Added blocking of actions when the option is not enabled.
|
2022-07-18 11:16:12 +03:00 |
|
|
|
99aaa3a575
|
Web: Added error handler.
|
2022-07-18 10:56:44 +03:00 |
|
Artem Tarasov
|
e06f4bd7b3
|
Web: Doceditor: modified run dev scripts
|
2022-07-17 13:01:49 +03:00 |
|
Artem Tarasov
|
ca7809ba52
|
Web: Doceditor: refactoring client (fix warnings, optimization component)
|
2022-07-17 12:48:23 +03:00 |
|
Artem Tarasov
|
de7b320f06
|
Web: Doceditor: modified webpack config (deleted unnecessary plugins, optimization)
|
2022-07-17 12:47:03 +03:00 |
|
Artem Tarasov
|
3ac7597ef7
|
Web: Doceditor: refactoring server
|
2022-07-17 12:46:17 +03:00 |
|
|
|
6fa0a14a33
|
Web:Studio:Сolor palette stylization.
|
2022-07-16 22:12:38 +03:00 |
|
|
|
57cef8663e
|
Web:Studio:Adding HexColorPickerComponent, adding props nodeButtonsColor, nodeAccentColor, nodeHexColorPickerAccent, nodeHexColorPickerButtons in ColorSchemeDialog.
|
2022-07-16 17:44:48 +03:00 |
|
Artem Tarasov
|
4d9422ef0d
|
Web: Doceditor: modified webpack config for client
|
2022-07-15 18:50:57 +03:00 |
|
|
|
e2b1e48fa9
|
removed voip service
|
2022-07-15 18:46:52 +03:00 |
|
|
|
42bbecd463
|
Web: Backup: Added loaders.
|
2022-07-15 15:54:30 +03:00 |
|
|
|
bb51d53cc4
|
add new keys-17
|
2022-07-15 15:02:07 +03:00 |
|
Artem Tarasov
|
8172c832bf
|
Web: Doceditor: modified webpack config for server
|
2022-07-15 14:37:58 +03:00 |
|
|
|
a478d7760b
|
Web:Studio:Сolor palette stylization.
|
2022-07-15 10:22:56 +03:00 |
|
|
|
aa17b6d882
|
fix
|
2022-07-14 16:18:23 +03:00 |
|
|
|
5005bfec3d
|
Web: Client: Confirm: use confirmHeader
|
2022-07-14 15:28:14 +03:00 |
|
|
|
5bc309ed11
|
Web:Studio:Add header, selectedAccentColorAndButtonsMain props to ColorSchemeDialog.
|
2022-07-14 15:07:39 +03:00 |
|
|
|
a48dbeaeae
|
fix tfaapp/validate
|
2022-07-14 14:58:49 +03:00 |
|
|
|
fb162af624
|
Web: Client: Settings: use new tfa api
|
2022-07-14 14:43:50 +03:00 |
|
|
|
1f01c06185
|
Tfa: added tfaappwithlink
|
2022-07-14 12:57:57 +03:00 |
|
Vashchuk Nikita
|
6507c4b999
|
Merge branch 'develop' into feature/migrations-fix
# Conflicts:
# products/ASC.Files/Core/Migrations/MySql/FilesDbContextMySql/20211022170840_FilesDbContextMySql.cs
# web/ASC.Web.Core/GlobalUsings.cs
|
2022-07-14 11:56:07 +03:00 |
|
Artem Tarasov
|
b8e4f56862
|
Web: Doceditor: fixed start script
|
2022-07-14 03:41:50 +03:00 |
|
Artem Tarasov
|
c47a265eff
|
Web: Doceditor: added initDoceditor, api, requestManager
|
2022-07-14 03:39:56 +03:00 |
|
Artem Tarasov
|
12ed025fad
|
Web: Doceditor: editor render fix
|
2022-07-14 03:39:09 +03:00 |
|
Artem Tarasov
|
0fe7836f65
|
Web: Doceditor: added global styles
|
2022-07-14 03:38:34 +03:00 |
|
Artem Tarasov
|
5364dceb53
|
Web: Doceditor: added Websocket to implement Live Reloading
|
2022-07-14 00:25:15 +03:00 |
|
|
|
615de2bf19
|
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/remove-header
|
2022-07-13 19:30:50 +03:00 |
|
|
|
3597114325
|
Api: fix tfaappnewapp
|
2022-07-13 18:41:44 +03:00 |
|
|
|
3cb56da496
|
Web:Studio:Сolor palette stylization.
|
2022-07-13 17:59:54 +03:00 |
|
Artem Tarasov
|
1e321859d7
|
Web: Doceditor: added ejs
|
2022-07-13 14:08:20 +03:00 |
|
Artem Tarasov
|
776c0874d1
|
Web: Doceditor: added babel.config.js to be able to use import in server
|
2022-07-13 14:07:49 +03:00 |
|
Artem Tarasov
|
a612c8490a
|
Web: Doceditor: rewrite server to CommonJs
|
2022-07-13 14:06:03 +03:00 |
|
|
|
b1baddce99
|
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/remove-header
|
2022-07-13 13:46:36 +03:00 |
|
|
|
bfac83d53c
|
Web:Adding the react-colorful library.
|
2022-07-13 12:37:22 +03:00 |
|
|
|
4be3a1f937
|
Web:Studio:Adding a theme, editing a theme.
|
2022-07-13 12:32:28 +03:00 |
|
|
|
cad67a6f57
|
Web: RestoreBackup: Refactoring.
|
2022-07-13 12:20:33 +03:00 |
|
|
|
b0eb883e20
|
Web: Fixed saving settings, refactoring.
|
2022-07-13 12:20:33 +03:00 |
|
|
|
48ac6f24d3
|
Web: Moved the function to a shared file.
|
2022-07-13 12:20:33 +03:00 |
|
|
|
20bb2d107d
|
Web: Part of the code moved in a shared file.
|
2022-07-13 12:20:32 +03:00 |
|
|
|
50f8dbd6dd
|
Web: AutoBackup: Fixed width pf toggle wrapper, added the same length if button turn on and turn off.
|
2022-07-13 12:20:31 +03:00 |
|
|
|
57d583687f
|
Web: RestoreBackup: Added new option for third-party accounts.
|
2022-07-13 12:20:31 +03:00 |
|
|
|
51418fc141
|
WEb: AutoBackup: Added new option for third-party accounts.
|
2022-07-13 12:20:30 +03:00 |
|
|
|
05db277f00
|
Web: AutoBackup: Added disable input if folder was deleted, added removing folder when switch between options.
|
2022-07-13 12:20:30 +03:00 |
|
|
|
41a2c421b1
|
Web: ManualBackup: Added new option for Third-party accounts.
# Conflicts:
# web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/DesktopView.js
|
2022-07-13 12:20:29 +03:00 |
|
|
|
1eb930583c
|
Web: Restore: Refactoring storage container.
# Conflicts:
# web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/restore-backup/index.js
|
2022-07-13 12:20:17 +03:00 |
|
|
|
879b8e1dcb
|
Web: Refactoring storage containers.
|
2022-07-13 12:19:59 +03:00 |
|
|
|
7140c667e6
|
Web: AutoBackup: Deleted useless code.
|
2022-07-13 12:19:59 +03:00 |
|
|
|
8f92458307
|
Web: AutoBackup: Moved the parameter to the store.
|
2022-07-13 12:19:58 +03:00 |
|
|
|
c894454bfc
|
Web: Deleted useless state.
|
2022-07-13 12:19:58 +03:00 |
|
|
|
b94989f5a9
|
Web: Optimization amazon container of manual backup.
|
2022-07-13 12:19:57 +03:00 |
|
|
|
fdd467f369
|
Web: Optimization amazon container of auto backup.
|
2022-07-13 12:19:57 +03:00 |
|
|
|
02ec398cc0
|
Web: Rewrote logic of amazon settings container.
|
2022-07-13 12:19:56 +03:00 |
|
|
|
4addb0e64d
|
Web: Fixed settings title.
|
2022-07-13 12:19:56 +03:00 |
|
|
|
d9b20300e2
|
Web: Settings: Added tips.
# Conflicts:
# web/ASC.Web.Client/public/locales/en/Settings.json
# web/ASC.Web.Client/public/locales/ru/Settings.json
|
2022-07-13 12:19:55 +03:00 |
|
|
|
78c9bbbc3e
|
Web: ManualBackup: Added new options for Amazon storage.
|
2022-07-13 12:18:45 +03:00 |
|
|
|
39557164d8
|
Web: Added restore backup to the article.
|
2022-07-13 12:18:45 +03:00 |
|
|
|
10c37ee2d6
|
Web: ManualBackup: Added new input methods.
|
2022-07-13 12:18:44 +03:00 |
|
|
|
bc472af290
|
Web: Redesign manual backup and auto backup modules.
# Conflicts:
# web/ASC.Web.Client/public/locales/en/Settings.json
# web/ASC.Web.Client/public/locales/ru/Settings.json
# web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/auto-backup/index.js
|
2022-07-13 12:12:19 +03:00 |
|
|
|
c9680ae830
|
fix tfaapp
|
2022-07-12 19:36:39 +03:00 |
|
|
|
536282eaf3
|
Merge branch 'develop' into feature/modal-redesign
|
2022-07-12 17:53:37 +03:00 |
|
mushka
|
f99d8784f1
|
fixed RecoverAccess dialog
|
2022-07-12 17:28:13 +03:00 |
|
|
|
c1be6ecb61
|
Settings: ignore id
|
2022-07-12 15:33:46 +03:00 |
|
|
|
72b00ffe94
|
Merge branch 'develop' into feature/modal-redesign
|
2022-07-12 14:24:11 +03:00 |
|
mushka
|
45f2e63836
|
changed ConnectCloud dark theme and fixed ConsumerModalDialolg
|
2022-07-12 14:19:04 +03:00 |
|
|
|
404e014a59
|
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/remove-header
# Conflicts:
# products/ASC.Files/Client/src/Files.jsx
|
2022-07-12 14:18:29 +03:00 |
|
|
|
a9d5080f5d
|
Web: Client: Settings: disabled autofocus
|
2022-07-12 13:50:55 +03:00 |
|
|
|
7b19b2f730
|
Web: Client: Settings: SessionLifetime: fix show reminder
|
2022-07-12 13:41:50 +03:00 |
|
mushka
|
6f5b84308d
|
fixed translation on Register dialog
|
2022-07-12 13:08:29 +03:00 |
|
|
|
0d0eed6d1a
|
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/security-settings
|
2022-07-12 12:57:57 +03:00 |
|
mushka
|
a222f836c4
|
fixed ConsumerModalDialog compennt
|
2022-07-12 12:50:08 +03:00 |
|
mushka
|
96e85f9cb3
|
Merge branch 'develop' into feature/modal-redesign
|
2022-07-12 12:34:43 +03:00 |
|
|
|
e9a15cc2a4
|
added [HttpGet("iprestrictions/settings")]
|
2022-07-12 12:20:59 +03:00 |
|
|
|
fd986320f2
|
Api: fixed maildomainsettings
|
2022-07-12 11:47:05 +03:00 |
|
|
|
61d824db3c
|
Web: Client: Main: fix height
|
2022-07-11 23:11:27 +03:00 |
|
mushka
|
83cb430911
|
small tweaks on DebugInfo
|
2022-07-11 22:15:53 +03:00 |
|
mushka
|
96a2d4530e
|
fixed DebugInfo styles
|
2022-07-11 22:11:55 +03:00 |
|
mushka
|
9d13e3a4c4
|
Merge branch 'develop' into feature/modal-redesign
|
2022-07-11 17:39:20 +03:00 |
|
Artem Tarasov
|
a77f413e9a
|
Web: Doceditor: modified webpack config
|
2022-07-11 17:33:22 +03:00 |
|
Artem Tarasov
|
68b375faf3
|
Web: Doceditor: updated webpack version, updated yarn.lock
|
2022-07-11 17:32:22 +03:00 |
|
|
|
e3c039942d
|
Web: Client: hide header on desktop
|
2022-07-11 15:17:48 +03:00 |
|
|
|
136a0d45bf
|
Web: Client: TfaActivation: fix layout
|
2022-07-11 14:47:57 +03:00 |
|
|
|
65a739d871
|
Removed ASC.Web.Campaigns (moved to separated repository)
|
2022-07-11 14:15:51 +03:00 |
|
|
|
3cbfa3d952
|
Web: Client: TfaAuth: fix layout
|
2022-07-11 13:57:58 +03:00 |
|
mushka
|
2fb38338e5
|
fixed backdrop and Debug dialog
|
2022-07-11 13:30:55 +03:00 |
|
Vashchuk Nikita
|
e49d082fa3
|
Merge branch 'develop' into feature/migrations-fix
# Conflicts:
# common/ASC.Core.Common/EF/Model/Core/Acl.cs
# common/ASC.Core.Common/GlobalUsings.cs
# common/ASC.Core.Common/Messaging/EventMessage.cs
# common/ASC.Core.Common/Messaging/LoginEvent.cs
# common/ASC.Core.Common/Messaging/MessageTarget.cs
# common/ASC.Core.Common/Migrations/MySql/CoreDbContextMySql/20211012145320_CoreDbContextMySql.cs
# common/ASC.Core.Common/Migrations/MySql/FilesDbContextMySql/20220708104408_FilesDbContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/FilesDbContextMySql/20220708104408_FilesDbContextMySql.cs
# common/ASC.Core.Common/Migrations/MySql/FilesDbContextMySql/MySqlFilesDbContextModelSnapshot.cs
# common/ASC.Core.Common/Migrations/MySql/MessagesContextMySql/20211012145334_MessagesContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/MessagesContextMySql/20211012145334_MessagesContextMySql.cs
# common/ASC.Core.Common/Migrations/MySql/MessagesContextMySql/20220708104428_MessagesContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/MessagesContextMySql/20220708104428_MessagesContextMySql.cs
# common/ASC.Core.Common/Migrations/MySql/UserDbContextMySql/20211012145322_UserDbContextMySql.cs
# common/ASC.Core.Common/Migrations/MySql/UserDbContextMySql/20220708104402_UserDbContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/UserDbContextMySql/MySqlUserDbContextModelSnapshot.cs
# common/ASC.Core.Common/Migrations/PostgreSql/CoreDbContextPostgreSql/20211012145321_CoreDbContextPostgreSql.cs
# common/ASC.Core.Common/Migrations/PostgreSql/FilesDbContextPostgreSql/20220708104409_FilesDbContextPostgreSql.Designer.cs
# common/ASC.Core.Common/Migrations/PostgreSql/FilesDbContextPostgreSql/20220708104409_FilesDbContextPostgreSql.cs
# common/ASC.Core.Common/Migrations/PostgreSql/FilesDbContextPostgreSql/PostgreSqlFilesDbContextModelSnapshot.cs
# common/ASC.Core.Common/Migrations/PostgreSql/MessagesContextPostgreSql/20211012145335_MessagesContextPostgreSql.Designer.cs
# common/ASC.Core.Common/Migrations/PostgreSql/MessagesContextPostgreSql/20211012145335_MessagesContextPostgreSql.cs
# common/ASC.Core.Common/Migrations/PostgreSql/MessagesContextPostgreSql/20220708104429_MessagesContextPostgreSql.Designer.cs
# common/ASC.Core.Common/Migrations/PostgreSql/MessagesContextPostgreSql/20220708104429_MessagesContextPostgreSql.cs
# common/ASC.Core.Common/Migrations/PostgreSql/TenantDbContextPostgreSql/20211012145343_TenantDbContextPostgreSql.cs
# common/ASC.Core.Common/Migrations/PostgreSql/UserDbContextPostgreSql/20211012145323_UserDbContextPostgreSql.cs
# common/ASC.Core.Common/Migrations/PostgreSql/UserDbContextPostgreSql/20220708104403_UserDbContextPostgreSql.Designer.cs
# common/ASC.Core.Common/Migrations/PostgreSql/UserDbContextPostgreSql/PostgreSqlUserDbContextModelSnapshot.cs
# common/ASC.Data.Backup.Core/Migrations/MySql/BackupsContextMySql/20220708104422_BackupsContextMySql.Designer.cs
# common/ASC.Data.Backup.Core/Migrations/PostgreSql/BackupsContextPostgreSql/20220708104423_BackupsContextPostgreSql.Designer.cs
# common/ASC.MessagingSystem/Migrations/MySql/MessagesContextMySql/20211012145334_MessagesContextMySql.Designer.cs
# common/ASC.MessagingSystem/Migrations/PostgreSql/MessagesContextPostgreSql/20211012145335_MessagesContextPostgreSql.Designer.cs
# common/ASC.Resource.Manager/ResourceData.cs
# common/services/ASC.AuditTrail/GlobalUsings.cs
# products/ASC.Files/Core/Core/EF/DbFilesThirdpartyAccount.cs
# products/ASC.Files/Core/Migrations/MySql/FilesDbContextMySql/20211022170840_FilesDbContextMySql.cs
# products/ASC.Files/Core/Migrations/MySql/FilesDbContextMySql/MySqlFilesDbContextModelSnapshot.cs
# products/ASC.Files/Core/Migrations/PostgreSql/FilesDbContextPostgreSql/20211022170841_FilesDbContextPostgreSql.cs
# products/ASC.Files/Core/Migrations/PostgreSql/FilesDbContextPostgreSql/PostgreSqlFilesDbContextModelSnapshot.cs
# web/ASC.Web.Api/GlobalUsings.cs
|
2022-07-11 13:28:49 +03:00 |
|
|
|
b3324ad875
|
Web: Client: NavMenu: fix namespace
|
2022-07-11 11:28:25 +03:00 |
|
Artem Tarasov
|
05cf3b7d18
|
Web: Doceditor: fixed deletion of initial state
|
2022-07-10 13:01:18 +03:00 |
|
Artem Tarasov
|
a9c9649197
|
Web: Doceditor: refactoring server, deleted unnecessary code
|
2022-07-10 12:57:07 +03:00 |
|
Artem Tarasov
|
a1d599ee43
|
Web: Doceditor: modified webpack dev config
|
2022-07-10 12:53:58 +03:00 |
|
Artem Tarasov
|
2a74e0e8cd
|
Web: Doceditor: deleted unnecessary files
|
2022-07-10 12:47:15 +03:00 |
|
Artem Tarasov
|
120f5f7b17
|
Web: Files/People/Client/Login: updated version webpack-cli 4.9.0 -> 4.10.0
|
2022-07-10 12:34:16 +03:00 |
|
Artem Tarasov
|
55198d0e7f
|
Merge branch 'develop' into feature/doceditor-ssr
# Conflicts:
# web/ASC.Web.Editor/src/i18n.js
# web/ASC.Web.Editor/webpack.config.js
# yarn.lock
|
2022-07-10 11:23:44 +03:00 |
|
mushka
|
58e68c1c12
|
Merge branch 'develop' into feature/modal-redesign
|
2022-07-08 17:23:02 +03:00 |
|
|
|
1f3dfb9ccc
|
Web: Client: AdminMessage: fix save
|
2022-07-08 16:46:26 +03:00 |
|
|
|
f69194b034
|
Web: Client: TfaActivation: fix error
|
2022-07-08 16:22:30 +03:00 |
|
|
|
6a690fc175
|
Web: Client: fix confirmLinkData
|
2022-07-08 16:22:08 +03:00 |
|
Vashchuk Nikita
|
4628769136
|
fix Contexts,
fix migrations,
removed MailDbContext.cs,
moved ResourceDbContext.cs
|
2022-07-08 14:24:18 +03:00 |
|
|
|
0da612710d
|
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/security-settings
|
2022-07-07 19:39:12 +03:00 |
|
|
|
7af929fee8
|
Merge branch 'release/v1.2' into develop
# Conflicts:
# common/ASC.Core.Common/Notify/Engine/DispatchEngine.cs
# common/ASC.Core.Common/Notify/Engine/NotifyEngine.cs
# products/ASC.Files/Core/Core/FileStorageService.cs
# products/ASC.Files/Core/Core/Thirdparty/IThirdPartyProviderDao.cs
# products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderDaoBase.cs
# products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderFileDao.cs
# products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderFolderDao.cs
# products/ASC.People/Server/Controllers/PeopleController.cs
# products/ASC.People/Server/Models/MemberModel.cs
# web/ASC.Web.Api/Controllers/SettingsController.cs
|
2022-07-07 17:41:41 +03:00 |
|
|
|
47371fc82d
|
Push: api
|
2022-07-07 16:58:59 +03:00 |
|
|
|
cac16ace79
|
Push: api
|
2022-07-07 14:46:35 +03:00 |
|
|
|
baa72db316
|
removed referencies
|
2022-07-06 18:47:16 +03:00 |
|
|
|
a615053d88
|
Fix Bug 58025 - Client.Profile. The languages listed in the profile are not in alphabetical order.
|
2022-07-06 18:26:25 +03:00 |
|
mushka
|
3fd65e887d
|
Merge branch 'release/v1.2' into feature/modal-redesign
|
2022-07-06 18:13:33 +03:00 |
|
TimofeyBoyko
|
545e4c0142
|
Web:Client:ProfileMenu: delete useless code
|
2022-07-05 19:48:46 +03:00 |
|
TimofeyBoyko
|
02938b9486
|
Fixed Bug 57943 - Mobile. Available to scroll an inactive section with the 'Profile' menu open
|
2022-07-05 18:57:36 +03:00 |
|
|
|
aeac8613a8
|
Merge branch 'develop' into features/enum_generator
|
2022-07-05 17:22:43 +03:00 |
|
|
|
1218d31a42
|
enum generator
|
2022-07-05 16:58:11 +03:00 |
|
mushka
|
6566ca8645
|
removed unnecessary extra margin from second button on several dialogs
|
2022-07-05 15:31:17 +03:00 |
|
mushka
|
9f002e3249
|
Merge branch 'release/v1.2' into feature/modal-redesign
|
2022-07-05 12:17:58 +03:00 |
|
TimofeyBoyko
|
6acc0ac769
|
Fixed Bug 57976 - Mobile. Blur effect for all portal page content after screen rotation with 'Profile' menu open
|
2022-07-05 11:18:29 +03:00 |
|
|
|
90fe1383b7
|
Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2
|
2022-07-04 18:04:06 +03:00 |
|
|
|
596ae3b06e
|
Web: Client: Fix Error pages translation
|
2022-07-04 17:48:06 +03:00 |
|
|
|
d8a459f397
|
Web: i18n: Replaced i18next-http-backend package with custom realization from @appserver/common/utils/i18next-http-backend (fix issue: too many same translations files are loading at once)
|
2022-07-04 17:47:12 +03:00 |
|
|
|
9a5e05a1f9
|
Fixed Bug 57948 - Mobile. Hid the click area on the burger
|
2022-07-04 17:16:02 +03:00 |
|
|
|
fb09f62881
|
Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2
|
2022-07-04 11:39:38 +03:00 |
|
|
|
0f901bf6e3
|
added hy-AM
|
2022-07-04 11:38:57 +03:00 |
|
|
|
d6b7db91e3
|
Web: Translations: Added translations minimization
|
2022-07-03 13:25:41 +03:00 |
|
Artem Tarasov
|
5fec344fe1
|
Web: Doceditor: fix after merge
|
2022-07-02 00:01:07 +03:00 |
|
Artem Tarasov
|
2ef94f75da
|
Merge branch 'develop' into feature/doceditor-ssr
# Conflicts:
# products/ASC.Files/Client/src/components/panels/SelectFolderDialog/index.js
# web/ASC.Web.Editor/package.json
# web/ASC.Web.Editor/src/Editor.jsx
# web/ASC.Web.Editor/webpack.config.js
# yarn.lock
|
2022-07-01 23:41:10 +03:00 |
|
Artem Tarasov
|
afce89dda2
|
Web: Doceditor: refactoring, changed hierarchy, added hmr, global styles
|
2022-07-01 23:33:35 +03:00 |
|
|
|
a289f9594a
|
modified LdapNotifyHelper to BackgroundService
|
2022-07-01 14:49:59 +03:00 |
|
Vashchuk Nikita
|
5a0acc8eaa
|
Renaming folders for contexts and models
|
2022-07-01 14:23:07 +03:00 |
|
|
|
329ec57aa2
|
Merge branch 'develop' into feature/LDAP-new
|
2022-07-01 13:15:52 +03:00 |
|
|
|
6226340b3b
|
Web: Client: add locales for Help center key
|
2022-07-01 13:00:57 +03:00 |
|
|
|
942030614f
|
Fix Bug 57840: add community forum and help center buttons
|
2022-07-01 12:33:46 +03:00 |
|
|
|
ba6c4069c9
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2
|
2022-07-01 10:10:52 +03:00 |
|
|
|
224f928ee4
|
Web: Layout: Fixed page shift when focusing in a row when renaming. (iOS, Chrome)
|
2022-07-01 10:10:29 +03:00 |
|
|
|
45cd9434f4
|
fix Bug 57888
|
2022-06-30 19:41:17 +03:00 |
|
|
|
74d238bde8
|
Merge branch 'release/v1.2' into develop
# Conflicts:
# common/ASC.Common/Caching/KafkaCache.cs
# common/ASC.Common/Logging/Log.cs
# common/ASC.Core.Common/Notify/Engine/DispatchEngine.cs
# common/ASC.Core.Common/Notify/Engine/NotifyEngine.cs
# common/ASC.Data.Backup.Core/ASC.Data.Backup.Core.csproj
# common/ASC.Data.Backup.Core/BackupResource.Designer.cs
# common/ASC.Data.Storage/ChunkedUploader/CommonChunkedUploadSession.cs
# common/ASC.Data.Storage/DiscStorage/DiscDataStore.cs
# common/ASC.Data.Storage/GoogleCloud/GoogleCloudStorage.cs
# common/ASC.Data.Storage/RackspaceCloud/RackspaceCloudStorage.cs
# common/ASC.Data.Storage/S3/S3Storage.cs
# common/ASC.Notify.Textile/ASC.Notify.Textile.csproj
# common/services/ASC.AuditTrail/ASC.AuditTrail.csproj
# products/ASC.Files/Core/ASC.Files.Core.csproj
# products/ASC.Files/Core/Core/Compress/CompressToArchive.cs
# products/ASC.Files/Core/Core/Compress/CompressToTarGz.cs
# products/ASC.Files/Core/Core/Compress/CompressToZip.cs
# products/ASC.Files/Core/Core/Compress/ICompress.cs
# products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveStorage.cs
# products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveStorage.cs
# products/ASC.Files/Core/Helpers/Global.cs
# products/ASC.Files/Core/Resources/FilesJSResource.Designer.cs
# products/ASC.Files/Core/Services/DocumentService/DocumentServiceTracker.cs
# products/ASC.Files/Core/Services/WCFService/FileOperations/FileDownloadOperation.cs
# products/ASC.Files/Core/Services/WCFService/FileOperations/FileMarkAsReadOperation.cs
# products/ASC.Files/Core/Utils/EntryManager.cs
# web/ASC.Web.Api/ASC.Web.Api.csproj
# web/ASC.Web.Core/Notify/StudioNotifyServiceHelper.cs
# web/ASC.Web.Core/Notify/StudioNotifyServiceSender.cs
|
2022-06-30 16:13:31 +03:00 |
|
|
|
3871712357
|
Fixed Bug 57873: Scrolling of the page body is disabled.
|
2022-06-30 15:54:58 +03:00 |
|
|
|
35ab5a3531
|
fix order
|
2022-06-29 19:43:29 +03:00 |
|
|
|
605c78f5dd
|
Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2
|
2022-06-29 17:16:18 +03:00 |
|
|
|
11e4595939
|
Fix bug: the site header shifts if you open the keyboard on an android phone
|
2022-06-29 17:16:09 +03:00 |
|
|
|
5f6851253f
|
fix bug 57725
|
2022-06-29 15:10:56 +03:00 |
|
|
|
9e05dc641a
|
notify: temp logs
|
2022-06-28 23:32:33 +03:00 |
|
|
|
4415df375f
|
Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2
|
2022-06-28 19:31:38 +03:00 |
|
|
|
2512820217
|
Web: Editor: Added opportunity to work with created docEditor from window.ASC.Files.Editor.docEditor (Mobile App Back button issue)
|
2022-06-28 19:31:28 +03:00 |
|
|
|
d4a5ec5315
|
notify: logs
|
2022-06-28 16:55:35 +03:00 |
|
|
|
772b42f636
|
Merge pull request #702 from ONLYOFFICE/feature/settings-docspace-mode
feature/settings-docspace-mode
|
2022-06-28 14:51:57 +03:00 |
|
|
|
933b0696ef
|
WebApi: added docspace in settings
|
2022-06-28 14:47:28 +03:00 |
|
|
|
e17f49e344
|
Merge branch 'develop' into feature/LDAP-new
# Conflicts:
# ASC.Web.sln
# common/ASC.Core.Common/EF/Context/WebstudioDbContext.cs
# web/ASC.Web.Api/ASC.Web.Api.csproj
# web/ASC.Web.Api/GlobalUsings.cs
|
2022-06-28 14:30:40 +03:00 |
|
|
|
95a694ac10
|
Web: Client: fixed error two children with the same key, index.
|
2022-06-28 13:12:28 +03:00 |
|
|
|
2b48707f5c
|
sso: fix
|
2022-06-28 12:36:34 +03:00 |
|
|
|
097290e8a2
|
Fix Bug 57787 - Selected user's theme option is used for Desktop Editors
|
2022-06-27 19:22:59 +03:00 |
|
Artem Tarasov
|
e38c15af56
|
Web: Client: Layout: deleted unnecessary code
|
2022-06-27 15:05:49 +03:00 |
|
Artem Tarasov
|
be438745a9
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2
|
2022-06-27 14:57:48 +03:00 |
|
Artem Tarasov
|
bba5c2a07a
|
Web: Client: Layout: Bug 57712 - Mobile. Section title goes outside the workspace when scrolling the page
|
2022-06-27 14:57:29 +03:00 |
|
|
|
6d98440200
|
az resources
|
2022-06-27 14:00:23 +03:00 |
|
|
|
3355c3ce99
|
Fix Bug 57772: add back arrow for about page
|
2022-06-27 11:40:17 +03:00 |
|
|
|
b58422cfee
|
Merge branch 'develop' into feature/branding
|
2022-06-24 18:51:33 +03:00 |
|
mushka
|
a5650bcf48
|
removed unused SystemThemeDetector component
|
2022-06-23 17:06:06 +03:00 |
|
mushka
|
da27de2cac
|
Fixed Bug 57722 - Now app theme will change with system theme without reloading
|
2022-06-23 16:54:22 +03:00 |
|
|
|
45e791a092
|
removed unused code
|
2022-06-23 16:00:24 +03:00 |
|
|
|
96775f7a0a
|
fix for eb896018d4 2b19ec7997
|
2022-06-23 15:43:22 +03:00 |
|
mushka
|
2e187f6605
|
removed unused console.log
|
2022-06-22 14:48:24 +03:00 |
|
mushka
|
c4a0c109e6
|
Fixed Bug 57721: Web: Files: Removed burger menu button from header in OFORM Gallery
|
2022-06-22 14:45:25 +03:00 |
|
|
|
f2da6fc55c
|
Merge pull request #693 from ONLYOFFICE/feature/docspace
Feature/docspace
|
2022-06-22 11:55:36 +04:00 |
|
|
|
bbcd5b7382
|
Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2
|
2022-06-21 19:45:30 +03:00 |
|
|
|
2d9bd5943d
|
fix Bug 57661
|
2022-06-21 18:13:21 +03:00 |
|
Artem Tarasov
|
93b6e3174d
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2
|
2022-06-21 17:45:10 +03:00 |
|
Artem Tarasov
|
96fd3734e4
|
Web: Client: Layout: Fixed Bug 57666 - Mobile. Content is not displayed in the horizontal position of the screen (ios, chrome)
|
2022-06-21 17:44:23 +03:00 |
|
|
|
01a03674ef
|
Web: Client: Wizard: fix translate ns
|
2022-06-21 17:27:22 +03:00 |
|
|
|
d4f459740f
|
Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2
|
2022-06-21 16:30:15 +03:00 |
|
|
|
87839bfb7f
|
Web: Translations: Fix NotFoundKeysTest
|
2022-06-21 13:29:37 +03:00 |
|
|
|
9d82ae8719
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2
|
2022-06-21 13:25:08 +03:00 |
|
|
|
793f999fe9
|
Web:Studio:Added styles to Preview.
|
2022-06-21 13:23:00 +03:00 |
|
|
|
12b6aea843
|
Web:Studio:Added theme selection, Appearance page layout.
|
2022-06-21 13:21:47 +03:00 |
|
|
|
d6ad1325f6
|
Web: Client: fixed double api requests
|
2022-06-20 18:56:12 +03:00 |
|
|
|
03e756277b
|
fixed warnings
|
2022-06-20 17:01:59 +03:00 |
|
|
|
2b19ec7997
|
rebranding
|
2022-06-20 16:59:03 +03:00 |
|
|
|
975db80282
|
Web: Login: applied specific style for login checkbox
|
2022-06-20 15:39:40 +03:00 |
|
|
|
eb896018d4
|
whitelabel
|
2022-06-20 14:09:47 +03:00 |
|
|
|
e68ac70005
|
Merge branch 'develop' into feature/docspace
|
2022-06-20 12:15:08 +03:00 |
|
mushka
|
d4cfd235fc
|
merge with release
|
2022-06-20 11:25:28 +03:00 |
|
|
|
e2cee2c2fc
|
Merge branch 'release/v1.2' into develop
# Conflicts:
# common/ASC.Core.Common/Context/Impl/UserManager.cs
# common/ASC.Core.Common/Notify/Signalr/SignalrServiceClient.cs
# common/ASC.Data.Backup.Core/ASC.Data.Backup.Core.csproj
# common/ASC.Data.Storage/S3/S3Storage.cs
# common/ASC.FederatedLogin/OAuth20Token.cs
# common/ASC.Notify.Textile/ASC.Notify.Textile.csproj
# common/ASC.Resource.Manager/Program.cs
# common/services/ASC.AuditTrail/ASC.AuditTrail.csproj
# config/appsettings.json
# products/ASC.Files/Core/ASC.Files.Core.csproj
# products/ASC.Files/Core/Core/Dao/Interfaces/IFileDao.cs
# products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs
# products/ASC.Files/Core/Core/Dao/TeamlabDao/SecurityDao.cs
# products/ASC.Files/Core/Core/FileStorageService.cs
# products/ASC.Files/Core/Core/Security/ISecurityDao.cs
# products/ASC.Files/Core/Core/Thirdparty/CrossDao.cs
# products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveStorage.cs
# products/ASC.Files/Core/Core/Thirdparty/IThirdPartyProviderDao.cs
# products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderFileDao.cs
# products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderFolderDao.cs
# products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderSecutiryDao.cs
# products/ASC.Files/Core/Core/ThumbnailSettings.cs
# products/ASC.Files/Core/Helpers/Global.cs
# products/ASC.Files/Core/HttpHandlers/FileHandler.ashx.cs
# products/ASC.Files/Core/HttpHandlers/ThirdPartyAppHandler.ashx.cs
# products/ASC.Files/Core/Model/SessionModel.cs
# products/ASC.Files/Core/Services/DocumentService/Configuration.cs
# products/ASC.Files/Core/Services/DocumentService/DocumentServiceTracker.cs
# products/ASC.Files/Core/Services/WCFService/FileOperations/FileDeleteOperation.cs
# products/ASC.Files/Core/Services/WCFService/FileOperations/FileDownloadOperation.cs
# products/ASC.Files/Core/Services/WCFService/FileOperations/FileMarkAsReadOperation.cs
# products/ASC.Files/Core/Services/WCFService/FileOperations/FileMoveCopyOperation.cs
# products/ASC.Files/Core/Services/WCFService/FileOperations/FileOperationsManager.cs
# products/ASC.Files/Core/ThirdPartyApp/BoxApp.cs
# products/ASC.Files/Core/ThirdPartyApp/GoogleDriveApp.cs
# products/ASC.Files/Core/ThirdPartyApp/IThirdPartyApp.cs
# products/ASC.Files/Core/ThirdPartyApp/Token.cs
# products/ASC.Files/Core/Utils/EntryManager.cs
# products/ASC.Files/Core/Utils/FileMarker.cs
# products/ASC.Files/Core/Utils/FileUploader.cs
# products/ASC.Files/Core/Utils/SocketManager.cs
# products/ASC.Files/Server/Controllers/FilesController.cs
# products/ASC.Files/Server/DocStore
# products/ASC.Files/Server/Helpers/FilesControllerHelper.cs
# products/ASC.Files/Server/Startup.cs
# products/ASC.Files/Service/Thumbnail/Builder.cs
# products/ASC.Files/Service/Thumbnail/Worker.cs
# products/ASC.People/Server/ASC.People.csproj
# web/ASC.Web.Api/ASC.Web.Api.csproj
# web/ASC.Web.Api/Controllers/SettingsController.cs
# web/ASC.Web.Api/Models/SettingsWrapper.cs
# web/ASC.Web.Core/PublicResources/CustomModeResource.Designer.cs
# web/ASC.Web.Core/PublicResources/Resource.Designer.cs
# web/ASC.Web.Core/PublicResources/WebstudioNotifyPatternResource.Designer.cs
# web/ASC.Web.Core/PublicResources/WebstudioNotifyPatternResource.resx
# web/ASC.Web.Core/Users/UserPhotoThumbnailManager.cs
# web/ASC.Web.Core/WhiteLabel/TenantWhiteLabelSettings.cs
|
2022-06-19 22:44:48 +03:00 |
|
|
|
8ea04bcc81
|
Merge branch 'develop' into feature/12.0
# Conflicts:
# common/ASC.MessagingSystem/Data/MessagesRepository.cs
# products/ASC.Files/Core/Utils/FileConverter.cs
|
2022-06-17 19:19:00 +03:00 |
|
|
|
2479448c6c
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2
|
2022-06-17 16:16:04 +03:00 |
|
|
|
9bbe797bfc
|
Web:Studio:Added Appearance component to COMMON_URLS.
|
2022-06-17 16:15:24 +03:00 |
|
|
|
c4d4e73c83
|
Web:Studio:Added an Appearance component to the Common Settings Submenu.
|
2022-06-17 16:14:26 +03:00 |
|
|
|
e6c51afc30
|
Web:Studio:Added Preview component.
|
2022-06-17 16:13:11 +03:00 |
|
|
|
cf0acb2179
|
Web:Studio:Added Appearance page.
|
2022-06-17 16:12:09 +03:00 |
|
|
|
3c699266c2
|
Fixed Bug 57622 - Mobile. Hidden hotkeys for mobile devices
|
2022-06-17 11:04:05 +03:00 |
|
|
|
fc93c6336a
|
Files: added email invitation
|
2022-06-16 18:34:38 +03:00 |
|
|
|
56ece27e1b
|
moved from ddf515b8
|
2022-06-16 17:16:46 +03:00 |
|
|
|
d4da3cc82e
|
Fixed Bug 57605 - Mobile. Fixed layout height for mobile devices
|
2022-06-16 15:23:45 +03:00 |
|
|
|
c9fb0d3dac
|
moved from ddf515b8
|
2022-06-16 11:13:53 +03:00 |
|
|
|
6836f2ea64
|
Web: Client: fixed Layout height
|
2022-06-15 15:03:21 +03:00 |
|
|
|
f3f3ed96ae
|
moved from ddf515b8
|
2022-06-15 12:46:21 +03:00 |
|
Artem Tarasov
|
2eebeb3c1a
|
Merge branch 'develop' into feature/doceditor-ssr
|
2022-06-14 11:22:23 +03:00 |
|
|
|
35bebe49f9
|
moved from ddf515b8
|
2022-06-14 11:11:41 +03:00 |
|
|
|
49233efe66
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2
|
2022-06-14 10:35:42 +03:00 |
|
|
|
5d89337132
|
Web:Studio:Added branding page. Added the CompanyInfoSettings and AdditionalResources settings to the Branding page.
|
2022-06-14 10:33:50 +03:00 |
|
|
|
e9b86623d6
|
Web:Studio:Moved WhiteLabel to settingsBranding folder.
|
2022-06-14 10:31:27 +03:00 |
|
|
|
3c077c023d
|
Web:Replaced light_small_general and dark_general logotypes with doc_space for WhiteLabel.
|
2022-06-14 10:31:11 +03:00 |
|
|
|
a49814beff
|
Web:Replaced light_small_general and dark_general logotypes with doc_space for WhiteLabel.
|
2022-06-14 10:28:32 +03:00 |
|
|
|
7ddb0506c9
|
Web: Files: moved Hotkeys translation, added button to open hotkeys
|
2022-06-10 11:30:57 +03:00 |
|
|
|
1df086f408
|
Web: Client: Settings: use help link
|
2022-06-08 17:58:11 +03:00 |
|
|
|
d77b0b6b32
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into feature/security-settings
# Conflicts:
# web/ASC.Web.Client/src/components/pages/Settings/categories/security/access-portal/passwordStrength.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/security/access-portal/tfa.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/security/access-portal/trustedMail.js
|
2022-06-08 17:53:49 +03:00 |
|
|
|
59eee29c61
|
Web: Client: Settings: add session lifetime loader
|
2022-06-08 17:51:26 +03:00 |
|
Artem Tarasov
|
d761598b1f
|
Web: Client: Settings: applied helpLink from settings
|
2022-06-08 17:47:24 +03:00 |
|
|
|
6ec27544aa
|
Web: Client: Settings: add admin message loader
|
2022-06-08 17:46:17 +03:00 |
|
|
|
860db2916f
|
Web: Client: Settings: add ip security loader
|
2022-06-08 17:41:38 +03:00 |
|
|
|
ff30a58480
|
Web: Client: Settings: add trusted mail loader
|
2022-06-08 17:34:59 +03:00 |
|
|
|
921d479639
|
Web: Client: Settings: add tfa loader
|
2022-06-08 17:27:23 +03:00 |
|
|
|
d5c8ab19dd
|
Web: Client: Settings: add password strength loader
|
2022-06-08 17:23:28 +03:00 |
|
|
|
b693779ea1
|
Merge branch 'develop' into feature/docspace-pin
|
2022-06-08 16:38:16 +03:00 |
|
|
|
0af103fdb6
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into feature/security-settings
|
2022-06-08 16:14:12 +03:00 |
|
|
|
749feab8e8
|
Web: Client: Settings: add access loader
|
2022-06-08 16:14:03 +03:00 |
|
|
|
83fc657f4b
|
Web: Client: Settings: add mobile security loader
|
2022-06-08 16:13:44 +03:00 |
|
|
|
1472644f04
|
Web: Client: Settings: add loader
|
2022-06-08 15:35:22 +03:00 |
|
|
|
832a341306
|
fix Bug 57478
|
2022-06-08 13:48:28 +03:00 |
|
Vashchuk Nikita
|
8410299051
|
modified logging
|
2022-06-08 12:42:49 +03:00 |
|
|
|
cbd73be90b
|
moved from ddf515b8
|
2022-06-08 12:02:40 +03:00 |
|
|
|
c1d152becc
|
moved from ddf515b8
|
2022-06-07 21:00:08 +03:00 |
|
|
|
bef003446e
|
Merge branch 'feature/admin-messages' of github.com:ONLYOFFICE/AppServer into feature/session-lifetime
|
2022-06-07 13:40:56 +03:00 |
|
|
|
c534db530c
|
Merge branch 'feature/ip-security' of github.com:ONLYOFFICE/AppServer into feature/admin-messages
|
2022-06-07 13:40:14 +03:00 |
|
|
|
ab0f85d0e3
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into feature/ip-security
|
2022-06-07 13:39:44 +03:00 |
|
|
|
b9c2b046aa
|
Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2
|
2022-06-03 16:33:17 +03:00 |
|
|
|
b0f2892664
|
edit translations
|
2022-06-03 16:32:59 +03:00 |
|
|
|
29fd1b83cf
|
Fixed Bug 53176 - Client.Files.Clouds. Error ‘You cannot update a file which is opened for editing’ at editor
|
2022-06-03 15:52:50 +03:00 |
|
|
|
2cf70f38ca
|
Web: Client: SmartBanner: show only on touch devices
|
2022-06-03 12:37:55 +03:00 |
|
|
|
ef10cbfd01
|
edit translations
|
2022-06-03 10:25:03 +03:00 |
|
|
|
848751220c
|
Files: added logos for rooms
|
2022-06-02 21:41:16 +03:00 |
|
|
|
8d3320d9d4
|
edit translations
|
2022-06-02 18:45:28 +03:00 |
|
|
|
4ed473eed8
|
edit translations
|
2022-06-02 18:42:21 +03:00 |
|
|
|
1d24adba7d
|
edit translations
|
2022-06-02 17:45:25 +03:00 |
|
|
|
e7d3b081ea
|
update translations
|
2022-06-02 17:05:59 +03:00 |
|
|
|
68aeaa83dd
|
edit translations
|
2022-06-02 13:22:24 +03:00 |
|
|
|
1aa605fb98
|
Web: Client: Settings: delete console log
|
2022-06-01 18:27:36 +03:00 |
|
|
|
8fb5f45d10
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into feature/ip-security
|
2022-06-01 18:25:47 +03:00 |
|
|
|
a1b7a47e45
|
Web: Client: Settings: fix logic
|
2022-06-01 18:25:23 +03:00 |
|
|
|
a861268e4f
|
moved from ddf515b8
|
2022-06-01 17:07:08 +03:00 |
|
|
|
d0b74d4c30
|
Web: Client: Settings: fix logic
|
2022-06-01 14:58:34 +03:00 |
|
|
|
9a20c4c93e
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2
|
2022-06-01 14:44:54 +03:00 |
|
|
|
3ebd67f444
|
merge from develop
|
2022-06-01 14:44:30 +03:00 |
|
|
|
1de68d0247
|
Web: Fixed dark theme for backup module.
|
2022-06-01 14:43:43 +03:00 |
|
|
|
8c1cfd2ed8
|
Web: Client: Settings: show error
|
2022-06-01 14:43:00 +03:00 |
|
|
|
98e318ee11
|
Web: Client: Settings: fix init settings
|
2022-06-01 14:35:36 +03:00 |
|
|
|
753d0b0605
|
Merge branch 'feature/admin-messages' of github.com:ONLYOFFICE/AppServer into feature/session-lifetime
# Conflicts:
# packages/asc-web-common/store/SettingsStore.js
# web/ASC.Web.Client/public/locales/en/Settings.json
|
2022-06-01 14:26:24 +03:00 |
|
|
|
c9292331b8
|
Web: Client: add smart banner store, fix layout height
|
2022-06-01 14:11:11 +03:00 |
|
|
|
d7d21f765e
|
Web: Client: Settings: fix init settings
|
2022-06-01 13:47:42 +03:00 |
|
|
|
958e13cbb3
|
Merge branch 'feature/ip-security' of github.com:ONLYOFFICE/AppServer into feature/admin-messages
# Conflicts:
# packages/asc-web-common/store/SettingsStore.js
|
2022-06-01 13:36:25 +03:00 |
|
|
|
349c3cae0e
|
Web: Client: Settings: add support ip range
|
2022-06-01 13:29:23 +03:00 |
|
|
|
e9b4805a00
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into feature/ip-security
|
2022-06-01 12:29:47 +03:00 |
|
|
|
4c2064714d
|
Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2
|
2022-05-31 18:38:13 +03:00 |
|
|
|
e1dbda363c
|
edit translations
|
2022-05-31 18:37:53 +03:00 |
|
|
|
aa7d285025
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into feature/ip-security
|
2022-05-31 18:03:11 +03:00 |
|
|
|
f1225ed3f6
|
Web: Client: fix layout height
|
2022-05-31 14:43:43 +03:00 |
|
|
|
7c511eb4db
|
Web: Client: SmartBanner: decrease z-index
|
2022-05-31 11:33:36 +03:00 |
|
|
|
30b89d1ae0
|
Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2
|
2022-05-30 17:18:53 +03:00 |
|
|
|
e2a705dce2
|
edit translations
|
2022-05-30 17:18:33 +03:00 |
|
|
|
52a6b27083
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into feature/ip-security
|
2022-05-30 16:46:25 +03:00 |
|
|
|
5a26c4f404
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into feature/smart-banner
|
2022-05-30 15:33:17 +03:00 |
|
|
|
e4a8c11602
|
Merge branch 'develop' into feature/LDAP-new
|
2022-05-30 14:20:46 +03:00 |
|
mushka
|
5ad2231fc3
|
Merge branch 'release/v1.2' into feature/modal-redesign
|
2022-05-27 15:24:29 +03:00 |
|
|
|
881a70a540
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2
|
2022-05-27 14:58:43 +03:00 |
|
|
|
c092ae1d13
|
Fixed Bug 57327: Wrong size of icon on mobile shortcut
|
2022-05-27 14:58:32 +03:00 |
|
|
|
96518a2ad5
|
edit translations
|
2022-05-27 14:09:16 +03:00 |
|
|
|
cf8badeea3
|
Api: refactoring
|
2022-05-27 12:32:58 +03:00 |
|
|
|
470c983e2e
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into feature/smart-banner
|
2022-05-26 21:46:36 +03:00 |
|
|
|
325a53579a
|
Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2
|
2022-05-26 19:22:45 +03:00 |
|
|
|
d35ae571e2
|
edit translations
|
2022-05-26 19:21:39 +03:00 |
|
|
|
4bb7ee25e8
|
Web: Client: wait ready translations
|
2022-05-26 18:13:20 +03:00 |
|
|
|
341749d1db
|
Web: Client: SmartBanner: fix cookies
|
2022-05-26 18:07:32 +03:00 |
|
Nikita
|
54341cb203
|
fixed input and output parameters in Api(LdapController)
|
2022-05-26 17:39:02 +03:00 |
|
|
|
f3505e2b4a
|
Web: fix smart banner meta
|
2022-05-26 17:35:59 +03:00 |
|
|
|
dc7d837e46
|
Merge branch 'release/v1.2' into feature/smart-banner
|
2022-05-26 16:57:04 +03:00 |
|
|
|
7a7b83c78e
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2
|
2022-05-26 18:16:23 +05:00 |
|
|
|
6b071a8634
|
Web: Campaigns: added react device detect
|
2022-05-26 18:16:09 +05:00 |
|
|
|
8cb26ba1aa
|
Web: Campaigns: added cross icon
|
2022-05-26 18:15:28 +05:00 |
|
Timofey Boyko
|
1e92d209e1
|
Web:Client:About: fix personal logo color for dark theme
|
2022-05-26 15:33:34 +03:00 |
|
|
|
07c7439687
|
edit translations
|
2022-05-26 15:00:16 +03:00 |
|
|
|
76db35e748
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into feature/smart-banner
|
2022-05-26 13:40:26 +03:00 |
|
|
|
968e4440ea
|
Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2
|
2022-05-26 13:18:06 +03:00 |
|
|
|
0a84d45b58
|
edit translations
|
2022-05-26 13:17:43 +03:00 |
|
|
|
d24d60a5e6
|
Web:fixed snackbar display delay
|
2022-05-26 15:08:41 +05:00 |
|
|
|
e7886aff2c
|
Log: refactoring
|
2022-05-26 12:01:54 +03:00 |
|
|
|
8a935ec96c
|
Web: Client: use translations in SmartBanner
|
2022-05-26 11:29:13 +03:00 |
|
|
|
4bf2d3ec6f
|
Web: Client: add SmartBanner translation
|
2022-05-26 11:28:47 +03:00 |
|
|
|
84af332a63
|
Web: Client: fix
|
2022-05-25 22:37:40 +03:00 |
|
|
|
6c3450e3da
|
Web: Client: add translate for SmartBanner
|
2022-05-25 22:36:07 +03:00 |
|
|
|
c7003c7984
|
Web: Client: move SmartBanner into folder
|
2022-05-25 22:25:19 +03:00 |
|
|
|
0296c1f22c
|
Web: Client: delete console log
|
2022-05-25 22:15:43 +03:00 |
|
|
|
219cd835d3
|
Web: Client: show smart banner only in Documents
|
2022-05-25 22:14:44 +03:00 |
|
|
|
59f1307223
|
Web: Client: SmartBanner: fix show logic
|
2022-05-25 22:07:50 +03:00 |
|
|
|
7d42847f60
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into feature/smart-banner
|
2022-05-25 20:05:01 +03:00 |
|
|
|
d8c870c599
|
edit translations
|
2022-05-25 18:47:28 +03:00 |
|
|
|
1850b9bc1b
|
update translations
|
2022-05-25 18:42:21 +03:00 |
|
|
|
b13fd240ad
|
Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2
|
2022-05-25 18:11:50 +03:00 |
|
|
|
903767b3e8
|
Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2
# Conflicts:
# web/ASC.Web.Client/public/locales/ro/Error403.json
# web/ASC.Web.Client/public/locales/ro/ErrorInvalid.json
# web/ASC.Web.Client/public/locales/ro/Offline.json
|
2022-05-25 18:07:28 +03:00 |
|
|
|
8612f14060
|
Web: Client: Fixed displaying page icon for creating page shortcut, fixed page display mode at manifest
|
2022-05-25 18:01:38 +03:00 |
|
|
|
3276561123
|
edit translations
|
2022-05-25 17:52:59 +03:00 |
|
|
|
e01858d2e8
|
merge from develop
|
2022-05-25 16:58:31 +03:00 |
|
|
|
e6d7979e92
|
dbcontext: EnableRetryOnFailure for MySQL provider
|
2022-05-25 16:55:38 +03:00 |
|
|
|
9a067e524a
|
Merge pull request #678 from ONLYOFFICE/feature/layout-for-banner
Feature/layout for banner
|
2022-05-25 16:19:14 +03:00 |
|
|
|
5674836f6f
|
Web: Client: SmartBanner: fix force
|
2022-05-25 16:03:28 +03:00 |
|
|
|
21ceecee4a
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into feature/smart-banner
|
2022-05-25 15:54:37 +03:00 |
|
|
|
ceb2e395fe
|
Web: Client: add smart banner
|
2022-05-25 15:53:26 +03:00 |
|
|
|
17caec2581
|
Web: Translations: Fix some SingleKeyFilesTest issues
|
2022-05-25 14:53:28 +03:00 |
|
|
|
4789e5e5ce
|
Web: Campaigns: added Docs_7_1 stories
|
2022-05-25 14:56:11 +05:00 |
|
|
|
9485c2e59e
|
Web: Campaigns: fixed origin for NewYear stories
|
2022-05-25 14:55:39 +05:00 |
|
|
|
7055ff083f
|
Web: Campaigns: updated yarn lock
|
2022-05-25 14:54:56 +05:00 |
|
|
|
439d7d8d73
|
Merge branch 'release/v1.2' into feature/layout-for-banner
|
2022-05-25 14:43:51 +05:00 |
|
|
|
1f18ae7194
|
Web: Campaigns: added NewYear stories
|
2022-05-25 14:41:24 +05:00 |
|
|
|
3a74878277
|
Web: Campaigns: created Section
|
2022-05-25 14:40:54 +05:00 |
|
|
|
66a7f48cea
|
Web: Campaigns: created Header
|
2022-05-25 14:40:23 +05:00 |
|
|
|
189687a537
|
Web: Campaigns: added theme
|
2022-05-25 14:39:43 +05:00 |
|
|
|
532b4dd36a
|
Web: Campaigns: created Article
|
2022-05-25 14:39:14 +05:00 |
|
|
|
27c4d9e662
|
Web: Campaigns: created Layout
|
2022-05-25 14:38:49 +05:00 |
|
|
|
b0bd02044c
|
Web: Campaigns: added storybook
|
2022-05-25 14:26:08 +05:00 |
|
|
|
11ad1819f2
|
Web: Campaigns: added storybook and styled components
|
2022-05-25 14:25:11 +05:00 |
|
|
|
1c1aa2b9b6
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2
|
2022-05-25 10:53:54 +03:00 |
|
|
|
70a6a44196
|
Web: Client: Disable PWA feature for mobile devices
|
2022-05-25 10:53:39 +03:00 |
|
|
|
6491009d9e
|
Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2
|
2022-05-25 10:43:27 +03:00 |
|
|
|
2b86d19122
|
Web: Client: Added <AppLoader />
|
2022-05-25 10:43:19 +03:00 |
|
|
|
a66c03aa86
|
Merge branch 'develop' into feature/logger-refactoring
# Conflicts:
# common/ASC.Common/Caching/AscCache.cs
# common/ASC.Common/GlobalUsings.cs
# common/ASC.Core.Common/Notify/Telegram/TelegramHelper.cs
# common/ASC.Data.Backup.Core/Service/ProgressItems/RestoreProgressItem.cs
# common/ASC.Data.Storage/GlobalUsings.cs
# common/services/ASC.Data.Backup.BackgroundTasks/GlobalUsings.cs
# common/services/ASC.Data.Backup.BackgroundTasks/IntegrationEvents/EventHandling/BackupDeleteScheldureRequestedIntegrationEventHandler.cs
# common/services/ASC.Data.Backup.BackgroundTasks/Services/BackupSchedulerService.cs
# common/services/ASC.Notify/GlobalUsings.cs
# common/services/ASC.Notify/IntegrationEvents/EventHandling/NotifyInvokeSendMethodRequestedIntegrationEventHandler.cs
# common/services/ASC.Notify/Services/NotifySenderService.cs
# common/services/ASC.TelegramService/GlobalUsings.cs
# common/services/ASC.TelegramService/TelegramHandler.cs
# products/ASC.Files/Core/Core/FileStorageService.cs
# products/ASC.Files/Core/GlobalUsings.cs
# products/ASC.Files/Service/Thumbnail/IntegrationEvents/EventHandling/ThumbnailRequestedIntegrationEventHandler.cs
# products/ASC.People/Server/Api/UserController.cs
# web/ASC.Web.Api/Api/Settings/StorageController.cs
|
2022-05-24 23:13:57 +03:00 |
|
|
|
7aba8f85ca
|
Web: Client: increase progress indicator z-index
|
2022-05-24 19:52:20 +03:00 |
|
|
|
b411f61ee5
|
Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2
|
2022-05-24 18:31:49 +03:00 |
|
|
|
786ff38a98
|
update editor
|
2022-05-24 18:31:24 +03:00 |
|
|
|
4b6aa555ec
|
Web: Client: Added check of ready prop (Fix translation loading issue)
|
2022-05-24 17:43:25 +03:00 |
|
|
|
02570e12cf
|
Merge branch 'develop' into feature/cluster-services
|
2022-05-24 17:24:25 +03:00 |
|
|
|
907d92fcb6
|
Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2
|
2022-05-24 15:00:26 +03:00 |
|
|
|
95f356adbd
|
edit translations
|
2022-05-24 14:55:28 +03:00 |
|
Nikita
|
1d2521c399
|
fix
|
2022-05-24 12:59:04 +03:00 |
|
|
|
ea4b14ac47
|
Merge branch 'release/v1.2' into feature/multiply-thumb
|
2022-05-24 12:29:49 +03:00 |
|
|
|
6168410931
|
Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2
|
2022-05-24 10:44:15 +03:00 |
|
|
|
587ee6240b
|
Fix Bug 57304 - Client. Errors in the console when clicking on the information banner
|
2022-05-24 10:44:09 +03:00 |
|
|
|
67a235da5c
|
edit ro-variable
|
2022-05-24 10:32:38 +03:00 |
|
|
|
2a673036ff
|
encryption service: migrate from ICacheNotify to RabbitMQ
|
2022-05-23 22:06:22 +03:00 |
|
|
|
13ad4381f7
|
Api: removed CustomHttpMethodAttribute
added AllowNotPaymentAttribute
|
2022-05-23 18:48:23 +03:00 |
|
|
|
d1494ca672
|
Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2
|
2022-05-23 18:10:09 +03:00 |
|
|
|
5dd80c1e6a
|
edit translations (SpellCheck)
|
2022-05-23 18:05:51 +03:00 |
|
|
|
c659e03042
|
update uk
|
2022-05-23 18:04:34 +03:00 |
|
Nikita
|
a7b9b77613
|
fix
|
2022-05-23 16:38:05 +03:00 |
|
|
|
2b9131330c
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2
|
2022-05-23 15:19:07 +03:00 |
|
|
|
de0e722776
|
Fixed Bug 55045: Added scroll to current folder where file located in select folder dialog.
|
2022-05-23 15:15:39 +03:00 |
|
|
|
f791f1206d
|
Merge pull request #674 from ONLYOFFICE/feature/banner-docs_7_1
Feature/banner docs 7 1
|
2022-05-23 14:38:40 +03:00 |
|
|
|
1b9a0b3c30
|
Web: Client: IOS: fixed logo styles
|
2022-05-23 13:11:25 +03:00 |
|
|
|
9903f4c439
|
update cs, edit translations (spellCheck)
|
2022-05-23 10:55:02 +03:00 |
|
|
|
2eaa6bb599
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into feature/ip-security
# Conflicts:
# packages/asc-web-common/store/SettingsStore.js
|
2022-05-22 21:22:59 +03:00 |
|
|
|
cd802863f6
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into feature/admin-messages
# Conflicts:
# packages/asc-web-common/store/SettingsStore.js
|
2022-05-22 21:21:28 +03:00 |
|
|
|
8c68b9fb40
|
edit translations (SpellCheck)
|
2022-05-22 13:36:45 +03:00 |
|
|
|
cefc26b742
|
edit variables
|
2022-05-22 12:29:58 +03:00 |
|
|
|
e3a834649e
|
update translations (web)
|
2022-05-22 12:23:36 +03:00 |
|
|
|
357d1f227a
|
update translations (web)
|
2022-05-22 12:15:53 +03:00 |
|
|
|
5511c14415
|
update translations (web)
|
2022-05-22 11:43:16 +03:00 |
|
|
|
45f9bc472a
|
edit variables
|
2022-05-22 00:46:59 +03:00 |
|
|
|
9d1af6d3da
|
update translations
|
2022-05-22 00:38:14 +03:00 |
|
|
|
dbecb2c72f
|
edit variables
|
2022-05-21 23:38:40 +03:00 |
|
|
|
6bc4035313
|
update translations
|
2022-05-21 15:25:14 +03:00 |
|
|
|
3470e70c5e
|
Web.Campaigns: Fix translation for 0d1a0785d5.
|
2022-05-20 21:00:03 +03:00 |
|
|
|
732afbd67e
|
Merge branch 'release/v1.2' into feature/banner-docs_7_1
|
2022-05-20 19:53:04 +03:00 |
|
|
|
7493fe68e6
|
Merge branch 'release/v1.2' into bugfix/ReleaseBugfixes
|
2022-05-20 19:17:43 +03:00 |
|
|
|
4935dbc8cd
|
Merge branch 'release/v1.2' into feature/update-translation-tests
|
2022-05-20 18:37:42 +03:00 |
|
|
|
91c4e454c5
|
add loggers
|
2022-05-20 18:24:41 +03:00 |
|
|
|
49d416bf07
|
Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2
|
2022-05-20 17:07:13 +03:00 |
|
|
|
dfe412d876
|
update translations (web)
|
2022-05-20 17:03:27 +03:00 |
|
|
|
a585a425bc
|
fix
|
2022-05-20 17:02:09 +03:00 |
|
|
|
75da995099
|
Merge branch 'develop' into feature/logger-refactoring
|
2022-05-20 17:01:51 +03:00 |
|
|
|
6295c0779d
|
Merge pull request #659 from ONLYOFFICE/feature/logger-Web.Core
Feature/logger web.core
|
2022-05-20 16:18:02 +03:00 |
|
|
|
682d55e630
|
Fix Bug 57263: use translations
|
2022-05-20 15:54:58 +03:00 |
|
|
|
cb0879da10
|
update, edit translations
|
2022-05-20 13:48:47 +03:00 |
|
|
|
baf219f0f5
|
Merge branch 'release/v1.2' into feature/multiply-thumb
|
2022-05-20 10:32:45 +03:00 |
|
Timofey Boyko
|
7cb2d922f2
|
Web:Studio: delete console log
|
2022-05-20 10:01:45 +03:00 |
|
|
|
4541fa82d1
|
update translations (web, people)
|
2022-05-19 23:35:37 +03:00 |
|
|
|
b9e98fc3ad
|
update translations (web)
|
2022-05-19 23:07:57 +03:00 |
|
|
|
9c6d1ae5df
|
update translations (Login, ConvertPasswordDialog)
|
2022-05-19 20:56:48 +03:00 |
|
Timofey Boyko
|
494e8cfd10
|
Web:Studio:Tests: hide text when build project for translation tests
|
2022-05-19 18:47:51 +03:00 |
|
|
|
770da06191
|
update pl, el
|
2022-05-19 18:21:23 +03:00 |
|
|
|
9178ec75aa
|
update el, bg, pl
|
2022-05-19 18:06:54 +03:00 |
|
mushka
|
0c69bfdabf
|
Merge branch 'release/v1.2' into bugfix/ReleaseBugfixes
|
2022-05-19 17:56:19 +03:00 |
|
Timofey Boyko
|
15cd2872a6
|
Web:Editor: add build:test.translation:personal script
|
2022-05-19 17:30:41 +03:00 |
|
|
|
b088a42158
|
Web: Editor: delete console log
|
2022-05-19 15:51:27 +03:00 |
|
|
|
60a199d54e
|
Fix Bug 57217: editor favicon
|
2022-05-19 15:44:39 +03:00 |
|
Timofey Boyko
|
6c73ad9bbe
|
Web: add scripts for build and start translation tests on personal
|
2022-05-19 15:26:09 +03:00 |
|
|
|
013532bbb7
|
Fixed Bug 57232 - Client.Files.Share.Editor. Fixed access rights in editor
|
2022-05-19 15:22:52 +03:00 |
|
|
|
dd490105e5
|
edit it (Login)
|
2022-05-19 14:46:55 +03:00 |
|
|
|
15f4fb324e
|
update it, edit fr
|
2022-05-19 14:34:56 +03:00 |
|
|
|
f8a4a7cf7c
|
Merge branch 'release/v1.2' into feature/multiply-thumb
|
2022-05-19 12:27:18 +03:00 |
|
|
|
41ab332458
|
update translations
|
2022-05-18 19:11:50 +03:00 |
|
|
|
018e1504b7
|
Merge branch 'release/v1.2' into feature/multiply-thumb
|
2022-05-18 18:38:18 +03:00 |
|
|
|
9fb495817d
|
update translations
|
2022-05-18 18:25:31 +03:00 |
|
|
|
a809c083a3
|
update translations (Client)
|
2022-05-18 17:26:33 +03:00 |
|
|
|
9886081a2e
|
Thumbnailы: added sizes config
|
2022-05-18 17:23:17 +03:00 |
|
|
|
b37c345985
|
update translations (login)
|
2022-05-18 15:59:18 +03:00 |
|
Nikita
|
b76b97af89
|
Merge branch 'develop' into feature/LDAP-new
|
2022-05-18 13:38:00 +03:00 |
|
Nikita
|
6451ac6329
|
fix
|
2022-05-18 13:36:35 +03:00 |
|
|
|
0fb61a7889
|
Edit translations - fi, sl
|
2022-05-18 13:18:19 +03:00 |
|
|
|
5f4d8b3b4c
|
Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2
|
2022-05-18 12:58:24 +03:00 |
|
|
|
9180fbe42e
|
update ko
|
2022-05-18 12:58:02 +03:00 |
|
|
|
90d4a68946
|
Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2
# Conflicts:
# web/ASC.Web.Client/public/locales/sl/Settings.json
|
2022-05-18 10:09:44 +03:00 |
|
|
|
9c824a0bfa
|
Update translation - sl
|
2022-05-18 09:59:02 +03:00 |
|
|
|
89b607240e
|
edit ro (Confirm)
|
2022-05-17 20:15:19 +03:00 |
|
|
|
b3e14265e3
|
edit ro (Settings)
|
2022-05-17 20:04:11 +03:00 |
|
|
|
f6098aea20
|
Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2
# Conflicts:
# web/ASC.Web.Client/public/locales/ro/Settings.json
|
2022-05-17 19:57:22 +03:00 |
|
|
|
f1130c51d9
|
update ro
|
2022-05-17 19:54:47 +03:00 |
|
|
|
f466fd2fe4
|
Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2
|
2022-05-17 18:17:17 +03:00 |
|
|
|
dad9016695
|
Web: Translations: Moved "NotFoundTitle" key from "studio" to "Common": (EnDublicatesByContentTest33ms issue fix)
|
2022-05-17 18:17:11 +03:00 |
|
|
|
2b804d5ef8
|
edit es, fr, zh-CN, ja, de, ru
|
2022-05-17 17:20:59 +03:00 |
|
|
|
2ed7b96dd9
|
Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2
|
2022-05-17 16:43:15 +03:00 |
|
|
|
cc9d934b13
|
update de, edit en (Confirm)
|
2022-05-17 16:42:54 +03:00 |
|
|
|
43da9f3949
|
Update translation - fi
|
2022-05-17 15:35:03 +03:00 |
|
|
|
be3362dbc3
|
update ja, edit fr, es, zh-CN (Settings)
|
2022-05-17 12:56:56 +03:00 |
|
|
|
36855d656f
|
remove application/x-www-form-urlencoded
|
2022-05-17 12:29:24 +03:00 |
|
|
|
2e33540486
|
Merge branch 'feature/docspace' into feature/docspace-links
|
2022-05-17 11:53:37 +03:00 |
|
|
|
606f0bca2a
|
update es (Home), add zh
|
2022-05-16 21:05:58 +03:00 |
|
|
|
6bfcf86461
|
update es
|
2022-05-16 18:48:11 +03:00 |
|
|
|
0d1a0785d5
|
Web.Campaigns: Add ONLYOFFICE Docs v7.1 banner.
|
2022-05-16 18:43:26 +03:00 |
|
|
|
07cf71b1b7
|
Web.Campaigns: Include gatsby-plugin-google-fonts.
|
2022-05-16 18:42:14 +03:00 |
|
|
|
3818790d1c
|
update ru, fr
|
2022-05-16 18:01:38 +03:00 |
|
|
|
778f26c1fc
|
Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2
|
2022-05-16 17:04:28 +03:00 |
|
|
|
4264a0da16
|
update fr
|
2022-05-16 17:04:04 +03:00 |
|
|
|
16019a283f
|
Web: Client: Settings: Fixed base header menu component on admin`s settings page
|
2022-05-16 15:41:02 +03:00 |
|
|
|
fc74762e0a
|
Web: Client: SelectionStore: Hide header menu if selection empty
|
2022-05-16 15:38:37 +03:00 |
|
|
|
4ad45de4b6
|
Web: Client: NavMenu: fix memory leak
|
2022-05-16 14:37:08 +03:00 |
|
|
|
5915c6e23e
|
update es
|
2022-05-16 12:51:04 +03:00 |
|
|
|
d0525e298c
|
thumbnails, notify, telegram: migrate from ICacheNotify to EventBus
|
2022-05-13 22:14:00 +03:00 |
|
|
|
a962d58b31
|
Web: Translation: Fix WrongTranslationVariablesTest issues
|
2022-05-13 19:44:05 +03:00 |
|
