|
|
10376475e9
|
Sln: removed *_ubuntu
|
2020-08-21 17:15:13 +03:00 |
|
|
|
b372705c3f
|
web: components: bump version
|
2020-08-21 16:20:15 +03:00 |
|
|
|
f29fad894f
|
web: common: bump version
|
2020-08-21 16:20:01 +03:00 |
|
|
|
fd587b7f6b
|
Merge branch 'feature/files' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/files
|
2020-08-21 16:19:52 +03:00 |
|
|
|
7982449828
|
Web: Components: fixed the display of the context-menu-button
|
2020-08-21 16:19:09 +03:00 |
|
|
|
76d48fabdd
|
Web: Common: fixed the display and closing of the filter
|
2020-08-21 16:18:17 +03:00 |
|
|
|
b06a4b4991
|
Merge branch 'master' into feature/socket.io
# Conflicts:
# ASC.Web.sln
# thirdparty.sln
# thirdparty/AppLimit.CloudComputing.SharpBox/AppLimit.CloudComputing.SharpBox.csproj
|
2020-08-21 15:25:07 +03:00 |
|
Artem Tarasov
|
503acfeea1
|
fixed translate SettingsTree
|
2020-08-21 13:38:55 +03:00 |
|
maksim
|
280604e41d
|
ASC.Data.Storage.Migration: adding protocol buffers and event listening
|
2020-08-21 11:05:27 +03:00 |
|
|
|
cff1a01f70
|
Docker: fix build
|
2020-08-20 19:04:13 +03:00 |
|
Artem Tarasov
|
d01dfb0aae
|
Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
|
2020-08-20 18:43:20 +03:00 |
|
|
|
af9166d5ec
|
Merge branch 'master' into feature/files
|
2020-08-20 18:20:42 +03:00 |
|
|
|
51ed3a8089
|
ASC.Resource.Manager.sln
|
2020-08-20 18:16:41 +03:00 |
|
|
|
fd5a9a74f0
|
Merge branch 'master' into feature/files
|
2020-08-20 17:51:14 +03:00 |
|
|
|
4501d3229a
|
Nuget: replaced thirdparty
|
2020-08-20 17:50:08 +03:00 |
|
|
|
c480404b22
|
web: components: bump version
|
2020-08-20 17:42:09 +03:00 |
|
|
|
28b6f56aee
|
web: common: bump version
|
2020-08-20 17:41:50 +03:00 |
|
|
|
603a8bbbc5
|
Merge branch 'feature/files' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/files
|
2020-08-20 17:40:52 +03:00 |
|
|
|
2c17848368
|
Web: Components: fixed context menu displayType state
|
2020-08-20 17:40:35 +03:00 |
|
|
|
d58cdc3cc5
|
Web: Common: fixed selector styles
|
2020-08-20 17:39:57 +03:00 |
|
|
|
2fc42a79e5
|
Web: Files: fixed sharing panels styles
|
2020-08-20 17:39:23 +03:00 |
|
maksim
|
326d352a7c
|
Migration: registering dependencies in program
|
2020-08-20 16:53:39 +03:00 |
|
Artem Tarasov
|
141e4ffaec
|
fix style
|
2020-08-20 16:09:46 +03:00 |
|
|
|
49f77646a5
|
web: common: bump version
|
2020-08-20 12:46:31 +03:00 |
|
|
|
9620f56594
|
Merge branch 'feature/files' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/files
|
2020-08-20 12:46:06 +03:00 |
|
|
|
14abe9c3f4
|
Web: Common: fixed profile menu
|
2020-08-20 12:45:59 +03:00 |
|
|
|
22a2cd3e4b
|
Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
|
2020-08-20 12:43:27 +03:00 |
|
|
|
15ba6828c5
|
Merge branch 'master' into feature/files
# Conflicts:
# products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs
# products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
# products/ASC.Files/Core/Core/FileStorageService.cs
|
2020-08-20 12:43:12 +03:00 |
|
|
|
f2a50f60e2
|
Settings: fix
|
2020-08-20 12:41:03 +03:00 |
|
|
|
1415d7e881
|
WebSocketSharp to nuget
|
2020-08-20 12:38:57 +03:00 |
|
|
|
6ce83a9d3f
|
Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
|
2020-08-20 12:17:46 +03:00 |
|
|
|
d5942241e8
|
Web: Clients: Parallelized initial API queries
|
2020-08-20 12:17:36 +03:00 |
|
Artem Tarasov
|
4eace9bae1
|
Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
|
2020-08-20 11:27:47 +03:00 |
|
Artem Tarasov
|
f2c39cd592
|
added common settings, translation
|
2020-08-20 11:27:00 +03:00 |
|
|
|
96ec887ffa
|
Web: Files: fixed sharing panel styles
|
2020-08-20 11:19:54 +03:00 |
|
|
|
05bc905831
|
Web: Clients: Fixed regex to transltaion.json files for serviceWorker
|
2020-08-19 21:18:23 +03:00 |
|
|
|
27f52a2dc2
|
Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
|
2020-08-19 20:00:57 +03:00 |
|
|
|
8d11e1b0c8
|
Web: Clients: Changed interaction with serviceWorker
|
2020-08-19 20:00:41 +03:00 |
|
|
|
f837b3aa24
|
Merge branch 'master' into feature/socket.io
# Conflicts:
# ASC.Web.sln
|
2020-08-19 19:53:13 +03:00 |
|
Artem Tarasov
|
d7133d88d2
|
Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
|
2020-08-19 18:17:02 +03:00 |
|
Artem Tarasov
|
cdbeea4741
|
added translation, admin settings
|
2020-08-19 18:16:31 +03:00 |
|
|
|
b7b7cfeeb7
|
web: components: bump version
|
2020-08-19 17:45:26 +03:00 |
|
|
|
0f1ecd1ae2
|
Web: Components: update ContextMenuButton styles
|
2020-08-19 17:45:06 +03:00 |
|
Artem Tarasov
|
6130af291e
|
Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
|
2020-08-19 16:14:59 +03:00 |
|
Artem Tarasov
|
4754a84483
|
fixed routing
|
2020-08-19 16:14:21 +03:00 |
|
Ilya Oleshko
|
c34ecd5ecb
|
web: components: bump version
|
2020-08-19 15:38:52 +03:00 |
|
Ilya Oleshko
|
53da5042f8
|
Web: Components: GroupButtonsMenu : Added orientationchange event listener
|
2020-08-19 15:38:46 +03:00 |
|
|
|
eb19b4ee38
|
web: common: bump version
|
2020-08-19 14:58:46 +03:00 |
|
|
|
d7b5444385
|
Web: Common: fixed selector styles
|
2020-08-19 14:58:23 +03:00 |
|
|
|
140c79ad16
|
web: common: bump version
|
2020-08-19 10:39:21 +03:00 |
|
