|
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 |
|
|
257949735f
|
web: components: bump version
|
2020-08-19 10:39:08 +03:00 |
|
|
56af481750
|
Merge branch 'feature/files' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/files
|
2020-08-19 10:38:50 +03:00 |
|
|
8fb4214a1f
|
Web: Files: added aside panel to context-menu-button, added new translation
|
2020-08-19 10:38:43 +03:00 |
|
|
142232d0af
|
Web: People: added aside panel to context-menu-button, added new translation
|
2020-08-19 10:38:34 +03:00 |
|
|
9b491cf1d8
|
Web: Common: added aside panel to context-menu-button
|
2020-08-19 10:37:52 +03:00 |
|
|
8617da3c50
|
Web: Components: added aside panel to context-menu-button
|
2020-08-19 10:36:27 +03:00 |
|
Artem Tarasov
|
7d4b18405e
|
Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
|
2020-08-18 17:27:20 +03:00 |
|
Artem Tarasov
|
1e6a2c37dc
|
added Routing, refactoring
|
2020-08-18 17:23:30 +03:00 |
|
|
49ead142d0
|
web: common: bump version
|
2020-08-18 17:05:11 +03:00 |
|
|
2b37363939
|
Merge branch 'feature/files' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/files
|
2020-08-18 17:04:01 +03:00 |
|
|
32f335ba50
|
Web: Common: added new styles
|
2020-08-18 17:02:20 +03:00 |
|
|
a7aef2667d
|
Web: Files: added translations
|
2020-08-18 17:00:12 +03:00 |
|
Artem Tarasov
|
b4d837320e
|
Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
|
2020-08-18 15:55:50 +03:00 |
|
Ilya Oleshko
|
a23c6c3163
|
web: components: bump version
|
2020-08-18 14:46:08 +03:00 |
|
Ilya Oleshko
|
fc0fbec33e
|
Web: Components: GroupButtonsMenu : Fix tests
|
2020-08-18 14:46:00 +03:00 |
|
TatianaLopaeva
|
19ba763a44
|
added onClick
|
2020-08-18 14:11:34 +03:00 |
|
Ilya Oleshko
|
9703c2bec4
|
web: components: bump version
|
2020-08-18 13:20:17 +03:00 |
|
Ilya Oleshko
|
2a5db42e40
|
Web: Components: GroupButtonsMenu : Fix update menu with uncommon size
|
2020-08-18 13:20:06 +03:00 |
|
|
0cc443b3f8
|
Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
|
2020-08-18 11:18:52 +03:00 |
|
|
7a813247af
|
Web: Clients: fixed url to loading translation.json for products
|
2020-08-18 11:18:44 +03:00 |
|
TatianaLopaeva
|
e359ed7e79
|
update props
|
2020-08-18 10:55:36 +03:00 |
|
|
6fc134f16b
|
web: common: bump version
|
2020-08-18 10:48:34 +03:00 |
|
|
ef34adb788
|
Web: Common: fixed Selector
|
2020-08-18 10:47:33 +03:00 |
|
TatianaLopaeva
|
684667d5de
|
en support
|
2020-08-18 10:32:06 +03:00 |
|
TatianaLopaeva
|
b1f31c5bae
|
en support
|
2020-08-18 10:31:22 +03:00 |
|
TatianaLopaeva
|
fecb7383dd
|
added styled for desktop
|
2020-08-18 08:49:35 +03:00 |
|
|
59f54e0cd5
|
web: common: bump version
|
2020-08-17 16:49:58 +03:00 |
|