Vladislav Makhov
|
b75457b3a8
|
web: components: bump version
|
2020-09-29 09:53:27 +03:00 |
|
Artem Tarasov
|
bb905602de
|
Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
|
2020-09-28 16:19:47 +03:00 |
|
|
b05bbc236a
|
Files: fix openedit
|
2020-09-28 16:04:57 +03:00 |
|
|
a4cbb9f386
|
Files: fix openedit
|
2020-09-28 15:45:26 +03:00 |
|
|
9f48311b4b
|
Files: fix openedit
|
2020-09-28 15:13:30 +03:00 |
|
Ilya Oleshko
|
dea73cfbad
|
web: common: bump version
|
2020-09-28 14:48:45 +03:00 |
|
Ilya Oleshko
|
61655a5790
|
Web: Files: App : Fixed initial requests, removed fetchMyFolder
|
2020-09-28 14:48:25 +03:00 |
|
Ilya Oleshko
|
be3a505035
|
Web: Common: Api : Files : Fixed request for folder tree, now request only folders
|
2020-09-28 14:47:20 +03:00 |
|
Artem Tarasov
|
01eae38cec
|
Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
|
2020-09-28 13:48:44 +03:00 |
|
|
c593620865
|
Files: fix count
|
2020-09-28 13:41:48 +03:00 |
|
Artem Tarasov
|
6e832d47c2
|
Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
|
2020-09-28 13:10:23 +03:00 |
|
Artem Tarasov
|
5426089bdb
|
Web: Client: refactoring translate Wizard
|
2020-09-28 13:09:34 +03:00 |
|
Artem Tarasov
|
1328eec01b
|
Web: Files: refactoring translate SettingsTree
|
2020-09-28 12:55:59 +03:00 |
|
Ilya Oleshko
|
ecd18e2a13
|
Web: Files: Editor : Fixed frame height for tablet
|
2020-09-28 12:47:12 +03:00 |
|
|
2c1d473314
|
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
# products/ASC.Files/Server/Controllers/FilesController.cs
|
2020-09-28 12:29:33 +03:00 |
|
|
3c70fba291
|
Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
|
2020-09-28 11:54:13 +03:00 |
|
Alexey Kostenko
|
c8b88c507f
|
Web: People: Updated toast notifications
|
2020-09-28 11:48:35 +03:00 |
|
Alexey Kostenko
|
99026e36be
|
Web: Files: Updated toast notifications
|
2020-09-28 11:34:52 +03:00 |
|
|
0dbae1adfd
|
Merge branch 'master' into feature/files
|
2020-09-28 11:32:13 +03:00 |
|
|
9e83a391e4
|
Merge pull request #83 from ONLYOFFICE/feature/release-11.0.0
Feature/release 11.0.0
|
2020-09-28 11:18:18 +03:00 |
|
Alexey Kostenko
|
10fd501560
|
web: common: bump version
|
2020-09-28 09:13:49 +03:00 |
|
Alexey Kostenko
|
d1c926e3cd
|
Web: Common: Added component Toast to common library (for translate titles)
|
2020-09-25 16:13:28 +03:00 |
|
SuhorukovAnton
|
b1090335d0
|
Telegram: fix
|
2020-09-25 14:36:09 +03:00 |
|
SuhorukovAnton
|
c455419113
|
Telegram: fix Kafka
|
2020-09-25 14:13:43 +03:00 |
|
|
89df700fb1
|
Files: fix
|
2020-09-25 13:47:21 +03:00 |
|
Alexey Kostenko
|
881793cf25
|
web: components: bump version
|
2020-09-25 09:43:03 +03:00 |
|
Alexey Kostenko
|
3a9d6f704d
|
Web: Components: Fix toast styles
|
2020-09-25 09:42:56 +03:00 |
|
Alexey Kostenko
|
aca3543ec1
|
web: components: bump version
|
2020-09-25 09:02:14 +03:00 |
|
Alexey Kostenko
|
ebd67c98e7
|
Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
|
2020-09-25 09:02:02 +03:00 |
|
Alexey Kostenko
|
a8f987cca8
|
Web: Components: Restyle Toast
|
2020-09-25 09:01:05 +03:00 |
|
SuhorukovAnton
|
693e35ac57
|
add ASC.TelegramService
|
2020-09-24 17:30:27 +03:00 |
|
|
0e6f803f0b
|
web: common: bump version
|
2020-09-24 16:54:50 +03:00 |
|
|
7b6d320ebe
|
Web: Common: fixed icons
|
2020-09-24 16:54:31 +03:00 |
|
Alexey Kostenko
|
69dcd77129
|
Web: People: Moved indication of success of link copy in InviteDialog
|
2020-09-24 16:18:37 +03:00 |
|
|
0a52fb4449
|
web: common: bump version
|
2020-09-24 15:32:11 +03:00 |
|
|
a4357170a3
|
Web: Common: fixed image-viewer icons
|
2020-09-24 15:31:53 +03:00 |
|
|
12099717ed
|
web: common: bump version
|
2020-09-24 15:07:26 +03:00 |
|
|
5cef360ade
|
Web: Files: added hideAside prop to PageLayout
|
2020-09-24 15:07:08 +03:00 |
|
|
c6b7a5ac29
|
Web: Files: added hiding aside panel on actions from the main button
|
2020-09-24 15:06:37 +03:00 |
|
|
8094848d05
|
Settings: fix
|
2020-09-24 12:45:02 +03:00 |
|
|
2c18950df8
|
Web: Files: fixed display of icons for ipad
|
2020-09-24 12:09:01 +03:00 |
|
Artem Tarasov
|
202b277f3d
|
web: components: bump version
|
2020-09-23 14:13:02 +03:00 |
|
Artem Tarasov
|
dc57312bf8
|
Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
|
2020-09-23 14:12:26 +03:00 |
|
Artem Tarasov
|
20dc47473c
|
Web: People: fixed style of TreeMenu
|
2020-09-23 14:12:03 +03:00 |
|
|
ec6dc5aa46
|
fix merge
|
2020-09-23 14:11:39 +03:00 |
|
Artem Tarasov
|
b4fe26e4fe
|
Web: Files: fixed style of TreeFolders and TreeSettings
|
2020-09-23 14:11:35 +03:00 |
|
Artem Tarasov
|
b09e770834
|
Web: Components: tree-menu: fixed margin-left of swithcer
|
2020-09-23 14:09:04 +03:00 |
|
|
a085e8ef38
|
Merge branch 'master' into feature/release-11.0.0
# Conflicts:
# web/ASC.Web.Api/Controllers/SettingsController.cs
# web/ASC.Web.Core/Utility/TenantExtra.cs
|
2020-09-23 14:00:24 +03:00 |
|
|
6f5cc4a447
|
Api: fix
|
2020-09-23 13:55:39 +03:00 |
|
|
4c7983fe7c
|
Settings: fix
|
2020-09-23 13:22:23 +03:00 |
|