|
|
b4a0a302e6
|
Files: fix di
|
2020-10-13 10:28:13 +03:00 |
|
|
|
cefc64422e
|
Files: fix di
|
2020-10-13 10:23:53 +03:00 |
|
|
|
ae8fd12b35
|
Files: fix di
|
2020-10-13 10:21:02 +03:00 |
|
Alexey Kostenko
|
72ac2f5875
|
Web: People: Fixed avatar editor when creating user
|
2020-10-13 10:06:05 +03:00 |
|
Artem Tarasov
|
1173410695
|
Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
|
2020-10-13 10:05:53 +03:00 |
|
TatianaLopaeva
|
f6a5c8a30b
|
Web: People: added deleting cache and refactoring
|
2020-10-13 09:45:23 +03:00 |
|
|
|
c622be89a3
|
revert discard
|
2020-10-12 22:39:23 +03:00 |
|
|
|
5e11f96a0c
|
fix
|
2020-10-12 22:15:27 +03:00 |
|
|
|
a8b838b4ce
|
fix
|
2020-10-12 22:12:03 +03:00 |
|
|
|
beeeaf3c3d
|
fix
|
2020-10-12 20:43:31 +03:00 |
|
|
|
f6f65f5968
|
fix
|
2020-10-12 20:40:14 +03:00 |
|
|
|
5e14bbb8cc
|
fix
|
2020-10-12 20:20:19 +03:00 |
|
|
|
43b9c33979
|
fix formating
|
2020-10-12 19:23:15 +03:00 |
|
|
|
383478d3bd
|
fix
|
2020-10-12 19:13:51 +03:00 |
|
|
|
26bb1567f7
|
ProductSecurityFilter: fix
|
2020-10-12 19:00:04 +03:00 |
|
|
|
b120d801aa
|
Confirm: fix
|
2020-10-12 18:58:38 +03:00 |
|
|
|
6f23d92ee8
|
editorconfig
|
2020-10-12 18:50:36 +03:00 |
|
TatianaLopaeva
|
a01b1e6430
|
Web: Files: Added data-format
|
2020-10-12 18:25:39 +03:00 |
|
Ilya Oleshko
|
989a854d32
|
Web: Files : Home : Fixed ShareButton after merge
|
2020-10-12 17:40:26 +03:00 |
|
TatianaLopaeva
|
7fef9285ce
|
Web: Files: Added data-format
|
2020-10-12 17:20:36 +03:00 |
|
TatianaLopaeva
|
df8fbcc050
|
Web: Components: Update icon by layout
|
2020-10-12 16:58:06 +03:00 |
|
TatianaLopaeva
|
1010886262
|
Web: Refactoring
|
2020-10-12 16:56:34 +03:00 |
|
|
|
36034bf97a
|
fix warnings
|
2020-10-12 16:52:31 +03:00 |
|
Ilya Oleshko
|
cdaef9e76f
|
Web: Files : Home : Fixed MediaViewer collection with selectors
|
2020-10-12 16:40:11 +03:00 |
|
TatianaLopaeva
|
6557261ac8
|
Web: Files: Changed margin by layout
|
2020-10-12 16:20:06 +03:00 |
|
TatianaLopaeva
|
4b81c0adfd
|
Web: Files: Added images by layout
|
2020-10-12 16:15:35 +03:00 |
|
Alexey Kostenko
|
54f68cb02a
|
Web: People: Fixed adding avatar then create user
|
2020-10-12 16:13:14 +03:00 |
|
Vladislav Makhov
|
cdddef441a
|
merge fix
|
2020-10-12 15:50:46 +03:00 |
|
Artem Tarasov
|
a6257d7006
|
Web: Files: Settings: fixed blinking of Settings page when jump from Folders page
|
2020-10-12 15:40:11 +03:00 |
|
|
|
577fc5ac70
|
Merge branch 'feature/files' into feature/selectors-refactoring
# Conflicts:
# products/ASC.Files/Client/src/components/pages/DocEditor/index.js
|
2020-10-12 15:36:26 +03:00 |
|
Artem Tarasov
|
ba8564ffe5
|
Web: Files: Settings: applied SettingsFiles loader
|
2020-10-12 15:34:46 +03:00 |
|
Vladislav Makhov
|
22da8b836d
|
fix after merge
|
2020-10-12 15:31:21 +03:00 |
|
|
|
824961ddec
|
Web: Files: added upload files-converter, fixed upload filer for tree folders, refactoring
|
2020-10-12 15:28:36 +03:00 |
|
Artem Tarasov
|
8453611714
|
Web: Common: added SettingsFiles loader
|
2020-10-12 14:52:49 +03:00 |
|
Vladislav Makhov
|
a179ae0e6c
|
Merge branch 'feature/files' into feature/files-favorites
# Conflicts:
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/index.js
# web/ASC.Web.Common/src/api/files/index.js
|
2020-10-12 14:45:53 +03:00 |
|
Vladislav Makhov
|
7aaeddedb2
|
Add pushing to recently viewed
|
2020-10-12 14:37:52 +03:00 |
|
Artem Tarasov
|
8621f9f321
|
Web: People: profileView: fixed loader
|
2020-10-12 13:06:00 +03:00 |
|
|
|
358d53e2be
|
Merge branch 'master' into feature/files
|
2020-10-12 12:22:54 +03:00 |
|
|
|
a3f36c2796
|
Nginx: fix
|
2020-10-12 12:22:23 +03:00 |
|
Artem Tarasov
|
947feef4cf
|
Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
|
2020-10-12 12:02:47 +03:00 |
|
Artem Tarasov
|
679413c7b1
|
Web: Client: wizard: fixed layout
|
2020-10-12 12:01:27 +03:00 |
|
|
|
17e0de56da
|
Merge branch 'master' into feature/files
# Conflicts:
# products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
|
2020-10-12 11:31:24 +03:00 |
|
|
|
344acefa9b
|
Files: fix filter
|
2020-10-12 11:26:15 +03:00 |
|
Vladislav Makhov
|
9ea5a648e9
|
Fix code after merge
|
2020-10-12 11:02:22 +03:00 |
|
SuhorukovAnton
|
5e6ad050ab
|
Merge branch 'master' into feature/fix-messages
|
2020-10-12 10:43:19 +03:00 |
|
Alexey Kostenko
|
fd2c71dce2
|
Web: People: Fixed avatar editor page (the path to the avatar was put into storage)
|
2020-10-12 10:04:40 +03:00 |
|
Vladislav Makhov
|
2476b306f9
|
Merge branch 'feature/files' into feature/files-recent
# Conflicts:
# web/ASC.Web.Common/src/api/files/index.js
# web/ASC.Web.Components/package.json
|
2020-10-12 10:04:24 +03:00 |
|
Alexey Kostenko
|
99262bdae6
|
Web: People: fix desktop avatarEditor
|
2020-10-12 08:59:17 +03:00 |
|
Alexey Kostenko
|
5838cd617c
|
Web: People: Return to profile editor after save avatar
|
2020-10-12 07:12:32 +03:00 |
|
Alexey Kostenko
|
237f737ba7
|
Merge branch 'feature/files' into feature/avatar-editor-redesign
|
2020-10-11 20:04:18 +03:00 |
|
