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
|
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 |
|
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 |
|
|
89df700fb1
|
Files: fix
|
2020-09-25 13:47:21 +03:00 |
|
Alexey Kostenko
|
69dcd77129
|
Web: People: Moved indication of success of link copy in InviteDialog
|
2020-09-24 16:18:37 +03:00 |
|
|
5cef360ade
|
Web: Files: added hideAside prop to PageLayout
|
2020-09-24 15:07:08 +03:00 |
|
|
2c18950df8
|
Web: Files: fixed display of icons for ipad
|
2020-09-24 12:09:01 +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 |
|
Artem Tarasov
|
b4fe26e4fe
|
Web: Files: fixed style of TreeFolders and TreeSettings
|
2020-09-23 14:11:35 +03:00 |
|
Alexey Kostenko
|
95179a967f
|
Web: People: Removed unnecessary request to get invite link when visiting People page
|
2020-09-23 10:16:03 +03:00 |
|
Artem Tarasov
|
b2013f4dc2
|
Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
|
2020-09-22 17:58:17 +03:00 |
|
Artem Tarasov
|
9a6110ea9e
|
Web: People: fixed size of sorting block on tablet
|
2020-09-22 17:57:54 +03:00 |
|
Artem Tarasov
|
a46bdc9b2b
|
Web: Files: fixed size of sorting block on tablet
|
2020-09-22 17:57:36 +03:00 |
|
|
075798b90c
|
moved from release/11 4414f77b
|
2020-09-22 17:17:17 +03:00 |
|
Alexey Kostenko
|
744f7cdfb6
|
Web: People: Removed forced copying of invitation link when opening ModalDialog
|
2020-09-22 16:14:35 +03:00 |
|
Artem Tarasov
|
964cd4a0ec
|
Web: People: deleted unusing variable
|
2020-09-22 15:42:57 +03:00 |
|
Artem Tarasov
|
9a2f04008d
|
Web: People: fixed styles
|
2020-09-22 15:18:36 +03:00 |
|
Artem Tarasov
|
16fbaa1ba6
|
Web: Files: fixed styles(color in row, margin in header)
|
2020-09-22 15:16:46 +03:00 |
|
Alexey Kostenko
|
6689b82d32
|
Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
|
2020-09-22 09:31:59 +03:00 |
|
Artem Tarasov
|
f7afa7ee55
|
Web: Files: fixed rendering error while loading settingsTree
|
2020-09-21 15:36:17 +03:00 |
|
Artem Tarasov
|
caea60046f
|
Web: People: refactoring: added utils.js, replaced changeDocumentTitle() with setDocumentTitle()
|
2020-09-21 14:54:35 +03:00 |
|
Artem Tarasov
|
9df49dc613
|
Web: Files: refactoring: added utils.js, replaced changeDocumentTitle() with setDocumentTitle()
|
2020-09-21 14:54:06 +03:00 |
|
Alexey Kostenko
|
cd7d714476
|
Web: People: Fix loader style
|
2020-09-21 12:17:56 +03:00 |
|
Alexey Kostenko
|
4e1415774d
|
Web: Client: Opening the file immediately after creation
|
2020-09-21 11:06:53 +03:00 |
|
|
0000129b3b
|
Merge branch 'master' into feature/release-11.0.0
# Conflicts:
# common/ASC.Core.Common/Context/WorkContext.cs
# common/ASC.Core.Common/Tenants/TenantControlPanelSettings.cs
# common/ASC.Core.Common/Tenants/TenantQuota.cs
# common/ASC.Data.Storage/DiscStorage/DiscDataStore.cs
# common/ASC.Data.Storage/Encryption/Crypt.cs
# common/ASC.Data.Storage/Encryption/CryptoStreamWrapper.cs
# common/ASC.Data.Storage/Encryption/EncryptionFactory.cs
# common/ASC.Data.Storage/Encryption/EncryptionServiceClient.cs
# common/ASC.Data.Storage/Encryption/EncryptionSettings.cs
# common/ASC.Data.Storage/Encryption/ICrypt.cs
# common/ASC.Data.Storage/Encryption/IEncryptionService.cs
# common/ASC.Data.Storage/Encryption/IMetadata.cs
# common/ASC.Data.Storage/Encryption/IntegrityProtectionException.cs
# common/ASC.Data.Storage/Encryption/Metadata.cs
# common/ASC.Data.Storage/Encryption/StreamWrapper.cs
# config/storage.json
# web/ASC.Web.Api/Controllers/SettingsController.cs
# web/ASC.Web.Core/PublicResources/webstudio_patterns.xml
|
2020-09-20 20:17:12 +03:00 |
|
Artem Tarasov
|
5f3a4c83e8
|
Web: People: fixed replacement of group members when adding
|
2020-09-19 23:26:11 +03:00 |
|
Artem Tarasov
|
16ff0e6386
|
Web: Files: fixed onExpand SettingsTree
|
2020-09-19 21:55:03 +03:00 |
|
|
7b4441676e
|
Update yarn.lock files
|
2020-09-19 18:35:17 +03:00 |
|
|
0f00799480
|
Web: Client: Fixed redirect to defaultPage
|
2020-09-19 18:24:48 +03:00 |
|
|
9a092cb8ec
|
moved from release/11 4414f77b
|
2020-09-18 17:45:59 +03:00 |
|
|
4a09b4b5f2
|
Web: fixed body scroll
|
2020-09-18 17:06:35 +03:00 |
|
Artem Tarasov
|
939a29442f
|
Web: People: refactoring - changing document.title with changeTitleDocument()
|
2020-09-18 11:19:16 +03:00 |
|
Artem Tarasov
|
f3b8e4880c
|
Web: Files: refactoring - changing document.title with changeTitleDocument()
|
2020-09-18 11:18:48 +03:00 |
|
Artem Tarasov
|
2e8a170166
|
Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
|
2020-09-17 16:10:09 +03:00 |
|
Artem Tarasov
|
ba03e55ffc
|
added display of changes in group composition after adding/removing members
|
2020-09-17 16:05:56 +03:00 |
|
Artem Tarasov
|
fcaf136b2c
|
added document title change after group update and deletion
|
2020-09-17 16:04:23 +03:00 |
|
|
d883ef441f
|
Api: moved from release/11 4414f77b
|
2020-09-17 15:04:28 +03:00 |
|
|
9623029d82
|
Web: Files: Speeded up loading first page + refactoring
|
2020-09-17 12:07:36 +03:00 |
|
|
2f4a3141d5
|
Web: People: Speeded up loading first page + refactoring
|
2020-09-17 11:28:23 +03:00 |
|
|
a4cb368513
|
Update yarn.lock files
|
2020-09-16 18:39:06 +03:00 |
|
|
ba7c4db354
|
WebL People: Remove temp prop
|
2020-09-16 18:35:49 +03:00 |
|
|
374e4ece1a
|
WebL People: Remove temp prop
|
2020-09-16 18:32:14 +03:00 |
|
|
e66ca03cbb
|
Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
|
2020-09-16 18:08:41 +03:00 |
|
|
ecb2879a77
|
Web: Components: Styled AvatarEditor + applied changes
|
2020-09-16 18:08:32 +03:00 |
|
Artem Tarasov
|
0fb03ea54a
|
Web: People: fixed double redirect after edit/create group
|
2020-09-16 16:13:03 +03:00 |
|
|
3b691247b2
|
Update yarn.lock files
|
2020-09-15 23:29:13 +03:00 |
|