Artem Tarasov
|
e2bb4a8405
|
Web: Files: TreeSettings: fixed render of settings before receiving a response from the server
|
2020-10-13 13:15:17 +03:00 |
|
|
|
a504251359
|
Merge pull request #99 from ONLYOFFICE/feature/fix-changing-language
Feature/fix changing language
|
2020-10-13 12:55:37 +03:00 |
|
|
|
02f39a9c71
|
Merge branch 'master' into feature/files
# Conflicts:
# common/ASC.Core.Common/Migrations/MySql/WebstudioDbContextMySql/20201006101804_WebstudioDbContextMySql.cs
# common/ASC.Core.Common/Migrations/Npgsql/WebstudioDbContextNpgsql/20200929102646_WebstudioDbContextNpgsql.cs
# 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
# web/ASC.Web.Core/Files/FileUtility.cs
|
2020-10-13 12:52:28 +03:00 |
|
Artem Tarasov
|
33d0322fb4
|
Web: Files: TreeSettings: refactoring
|
2020-10-13 12:50:39 +03:00 |
|
TatianaLopaeva
|
579d543292
|
Merge branch 'feature/files' into feature/fix-changing-language
|
2020-10-13 12:38:46 +03:00 |
|
TatianaLopaeva
|
4ef2db2ed0
|
Web: Update yarn.lock
|
2020-10-13 12:37:34 +03:00 |
|
TatianaLopaeva
|
dbdc134ef0
|
web: common: bump version
|
2020-10-13 12:18:48 +03:00 |
|
TatianaLopaeva
|
ac697d28fc
|
Web: Added getLanguage selector
|
2020-10-13 12:17:45 +03:00 |
|
Ilya Oleshko
|
abee1c8a8e
|
Merge branch 'feature/files' into feature/selectors-refactoring
|
2020-10-13 12:10:55 +03:00 |
|
Ilya Oleshko
|
2f88af1137
|
Web: Files : Home : Added isEdit condition for render share button
|
2020-10-13 11:58:28 +03:00 |
|
|
|
9a2fde062d
|
Merge pull request #86 from ONLYOFFICE/feature/fix-messages
Feature/fix messages
|
2020-10-13 11:28:46 +03:00 |
|
|
|
a1bcf2eb3e
|
Merge branch 'master' into feature/fix-messages
|
2020-10-13 11:28:19 +03:00 |
|
|
|
b1d50e5702
|
Core: fix DI
|
2020-10-13 11:26:17 +03:00 |
|
TatianaLopaeva
|
2f72748f2b
|
Web: Added getLanguage selector
|
2020-10-13 11:19:24 +03:00 |
|
TatianaLopaeva
|
f0299db016
|
Update yarn.lock
|
2020-10-13 11:14:09 +03:00 |
|
|
|
65fd5ee2f3
|
Api: fix DI
|
2020-10-13 11:13:24 +03:00 |
|
|
|
fb5a6b9926
|
Api: fix DI
|
2020-10-13 11:11:03 +03:00 |
|
|
|
bead971061
|
Api: fix DI
|
2020-10-13 11:09:22 +03:00 |
|
TatianaLopaeva
|
8d09a45fab
|
web: common: bump version
|
2020-10-13 10:54:49 +03:00 |
|
TatianaLopaeva
|
6a0e34a7a2
|
Web: Common: Added language into array of useEffect
|
2020-10-13 10:52:44 +03:00 |
|
|
|
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 |
|
