|
42e5f2bd71
|
Merge branch 'develop' into bugfix/refactoring-table-view
|
2022-02-24 17:39:25 +03:00 |
|
|
d40d73a3a5
|
GoogleAuth: fix 94 issue
|
2022-02-24 17:36:44 +03:00 |
|
|
7995f38ef9
|
Web: Files: Badges/QuickButtons: Restored show logic after merge
|
2022-02-24 16:36:06 +03:00 |
|
|
ba0bfe7260
|
Merge branch 'develop' into bugfix/fixed-dates-in-profile
# Conflicts:
# packages/asc-web-components/calendar/index.js
# products/ASC.People/Client/src/pages/ProfileAction/Section/Body/updateUserForm.js
|
2022-02-24 15:59:56 +03:00 |
|
|
2e000f1d9d
|
Web: People: fixed profile dates
|
2022-02-24 15:48:02 +03:00 |
|
|
0814ce13cc
|
Merge branch 'develop' into bugfix/refactoring-table-view
|
2022-02-24 14:53:43 +03:00 |
|
|
6fb3547652
|
Files: fix sql
|
2022-02-24 14:45:58 +03:00 |
|
|
51f79fa0e9
|
Files: fix track
|
2022-02-24 14:35:14 +03:00 |
|
|
d4e48004bc
|
added socketio
|
2022-02-24 13:47:18 +03:00 |
|
|
9d0f1500e6
|
Files: fix routing
|
2022-02-24 13:24:39 +03:00 |
|
|
13a9a220b3
|
Merge branch 'bugfix/refactoring-table-view' of https://github.com/ONLYOFFICE/AppServer into bugfix/refactoring-table-view
|
2022-02-24 12:04:42 +03:00 |
|
|
f59fbe71ba
|
Merge branch 'develop' into bugfix/refactoring-table-view
|
2022-02-24 12:04:15 +03:00 |
|
|
c179e70bcc
|
Merge branch 'develop' into bugfix/refactoring-table-view
|
2022-02-24 11:57:02 +03:00 |
|
|
fab67e575c
|
Web: Files: fixed files loader styles
|
2022-02-24 11:44:40 +03:00 |
|
|
34f6570027
|
Web: Files: fixed files loader
|
2022-02-24 11:42:33 +03:00 |
|
|
902b2b54eb
|
Web: People: fixed table style
|
2022-02-24 11:33:58 +03:00 |
|
|
d7f16aa96d
|
Web: Table: fixed table styles
|
2022-02-24 11:20:32 +03:00 |
|
|
32d73f902e
|
Web: Restore: Rename folder.
|
2022-02-24 10:03:24 +03:00 |
|
|
c0a1f20984
|
Web: ManualBackup: Rename folder.
|
2022-02-24 09:46:39 +03:00 |
|
|
ac595bb1e5
|
Web: Auto: Rename folder.
|
2022-02-24 09:44:59 +03:00 |
|
|
dd183de11d
|
Web: Moved files to separate folder.
|
2022-02-24 09:35:27 +03:00 |
|
|
bbb01a96d1
|
WEb: Files: Restore: Fixed page fall.
|
2022-02-24 09:02:53 +03:00 |
|
|
a700e70d86
|
Merge pull request #532 from ONLYOFFICE/feature/async
Feature/async
|
2022-02-23 17:20:28 +03:00 |
|
|
d65d30ec24
|
Test: disable socketio
|
2022-02-23 17:10:04 +03:00 |
|
|
81b33e673a
|
Files: fix warnings
|
2022-02-23 17:09:32 +03:00 |
|
|
3cfb10d4d2
|
Socketio: fix
|
2022-02-23 17:08:00 +03:00 |
|
|
3d4e000778
|
Merge branch 'develop' into feature/async
# Conflicts:
# products/ASC.Files/Core/Core/FileStorageService.cs
# products/ASC.Files/Core/HttpHandlers/FileHandler.ashx.cs
# products/ASC.Files/Core/Services/DocumentService/DocumentServiceHelper.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/FileMoveCopyOperation.cs
# products/ASC.Files/Core/Utils/FileConverter.cs
# products/ASC.Files/Core/Utils/FileUploader.cs
# products/ASC.Files/Server/Controllers/FilesController.cs
# products/ASC.Files/Server/Helpers/FilesControllerHelper.cs
|
2022-02-23 16:01:55 +03:00 |
|
|
1379800971
|
Files: fix async
|
2022-02-23 13:42:14 +03:00 |
|
|
75a8ed209f
|
Merge pull request #562 from ONLYOFFICE/refactoring/frontend-workspaces
Refactoring/frontend workspaces
|
2022-02-22 18:39:25 +03:00 |
|
|
ae680c6a1c
|
Fix package.json version
|
2022-02-22 18:27:53 +03:00 |
|
|
fab9e17f6f
|
Update lerna.json
|
2022-02-22 18:27:20 +03:00 |
|
|
ffaea6ae2c
|
nginx: Remove old products locations
|
2022-02-22 18:24:54 +03:00 |
|
|
d157dd637e
|
Build: Removed old products nginx configs
|
2022-02-22 18:23:56 +03:00 |
|
|
e4557b1dec
|
Web: Removed old products from yarn workspaces
|
2022-02-22 18:21:08 +03:00 |
|
|
9613f4c3ae
|
Merge branch 'master' into develop
|
2022-02-22 16:19:38 +03:00 |
|
|
297ccb3f73
|
Merge pull request #547 from ONLYOFFICE/feature/update-readme
Update README.md
|
2022-02-22 16:18:10 +03:00 |
|
|
412bba955c
|
Merge branch 'master' into feature/update-readme
|
2022-02-22 16:13:47 +03:00 |
|
|
deeff80f26
|
Web: TabLe: refactoring table view
|
2022-02-22 16:00:26 +03:00 |
|
|
27254146ae
|
Web: Files: Restore: Added new loader.
|
2022-02-22 15:38:36 +03:00 |
|
|
b5bcfa03b9
|
Web: common: Added list loader to the Loaders file.
|
2022-02-22 15:36:52 +03:00 |
|
|
877783cf71
|
Web: Common: Added list loader.
|
2022-02-22 15:35:58 +03:00 |
|
|
85d6f3541e
|
Web: Files: Changed styles for empty backup list.
|
2022-02-22 12:37:16 +03:00 |
|
|
c29d35c36d
|
Web: Files: Added possibility to delete backup elem without selected file.
|
2022-02-22 12:30:30 +03:00 |
|
|
a797b3490e
|
Files: async fixes
|
2022-02-22 12:22:15 +03:00 |
|
|
de0040e7a6
|
Merge branch 'develop' of https://github.com/ONLYOFFICE/AppServer into develop
|
2022-02-22 12:15:08 +03:00 |
|
|
b12ec986fc
|
Merge pull request #561 from ONLYOFFICE/bugfix/fixed-table-view
Web: Components: fixed table view
|
2022-02-22 12:14:51 +03:00 |
|
|
2a7616585e
|
Web: Components: fixed table view
|
2022-02-22 12:10:27 +03:00 |
|
|
570fa10ca5
|
Merge branch 'develop' of https://github.com/ONLYOFFICE/AppServer into develop
|
2022-02-22 11:44:34 +03:00 |
|
|
c0cd257700
|
Merge pull request #560 from ONLYOFFICE/bugfix/fix-table-display
Web: Components: fix display table after merge
|
2022-02-22 11:44:12 +03:00 |
|
|
88a2934409
|
Web: Components: fix display table after merge
|
2022-02-22 11:34:13 +03:00 |
|