Vladislav Makhov
|
aef6e4035f
|
Fix code after merge
|
2020-10-08 11:16:08 +03:00 |
|
Vladislav Makhov
|
c59be4f0dd
|
Fix code after merge
|
2020-10-08 11:08:58 +03:00 |
|
Vladislav Makhov
|
a72c087e2a
|
Merge branch 'feature/files' into feature/files-favorites
# Conflicts:
# web/ASC.Web.Common/src/api/files/index.js
|
2020-10-08 10:18:06 +03:00 |
|
Vladislav Makhov
|
716a9f387e
|
Fix code after merge
|
2020-10-08 10:14:38 +03:00 |
|
Artem Tarasov
|
2547a70498
|
Web: Client: confirm: fixed the name of the passed parameter in /people
|
2020-10-07 19:10:35 +03:00 |
|
Artem Tarasov
|
5806daa594
|
Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
|
2020-10-07 18:23:34 +03:00 |
|
Artem Tarasov
|
5e0e8e9b3b
|
Web: Client: confirm: added transfer of hash instead of password
|
2020-10-07 18:23:14 +03:00 |
|
Ilya Oleshko
|
be48e703b9
|
Web: Files : Home : Fixed context menu separator key
|
2020-10-07 17:31:59 +03:00 |
|
Artem Tarasov
|
17daf4e847
|
Web: Files: settings: fix warning
|
2020-10-07 17:15:40 +03:00 |
|
Vladislav Makhov
|
b24bc1f05a
|
Merge branch 'feature/files' into feature/files-favorites
# Conflicts:
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesRowContent.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesTileContent.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/index.js
# products/ASC.Files/Client/src/components/pages/Home/index.js
# products/ASC.Files/Client/src/store/files/selectors.js
|
2020-10-07 17:11:40 +03:00 |
|
|
|
9d87b8de09
|
Merge pull request #94 from ONLYOFFICE/feature/empty-screen
Feature/empty screen
|
2020-10-07 16:52:54 +03:00 |
|
|
|
3bf8bd5103
|
Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
|
2020-10-07 16:41:24 +03:00 |
|
|
|
ca37d2134d
|
Web: Files: Applied API changes on server in files filtering
|
2020-10-07 16:41:05 +03:00 |
|
TatianaLopaeva
|
da23f36f09
|
Merge branch 'feature/files' into feature/empty-screen
|
2020-10-07 16:02:18 +03:00 |
|
TatianaLopaeva
|
34506827b5
|
Update yarn.lock
|
2020-10-07 15:53:29 +03:00 |
|
TatianaLopaeva
|
5c328f596e
|
web: components: bump version
|
2020-10-07 15:38:27 +03:00 |
|
TatianaLopaeva
|
449bc0e0b2
|
Web: Files: Deleted unnecessary fontSize
|
2020-10-07 15:32:03 +03:00 |
|
TatianaLopaeva
|
17b8a00a62
|
Web: Files: Deleted unnecessary box
|
2020-10-07 15:21:46 +03:00 |
|
TatianaLopaeva
|
de7e4fe062
|
Merge branch 'feature/files' into feature/empty-screen
# Conflicts:
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/index.js
|
2020-10-07 15:14:54 +03:00 |
|
Artem Tarasov
|
84bb49c0e3
|
Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
|
2020-10-07 15:14:26 +03:00 |
|
Ilya Oleshko
|
c0d798c141
|
Web: Client: Confirm : Fixed min password length property, now it get from settings
|
2020-10-07 15:02:56 +03:00 |
|
Ilya Oleshko
|
94d2ae1d07
|
Web: Files : Selectors : Added missing property
|
2020-10-07 14:46:59 +03:00 |
|
TatianaLopaeva
|
9ac0d6f73a
|
Web: Files: Changed margin
|
2020-10-07 14:42:09 +03:00 |
|
Artem Tarasov
|
36158ded1d
|
Web: Files: fixed inability to navigate from TreeSettings to TreeFolders
|
2020-10-07 14:12:45 +03:00 |
|
|
|
803041cbda
|
Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
|
2020-10-07 13:48:34 +03:00 |
|
|
|
ed47263adf
|
Merge branch 'master' into feature/files
|
2020-10-07 13:48:11 +03:00 |
|
|
|
08590b6b58
|
Fix confirm
|
2020-10-07 13:45:53 +03:00 |
|
|
|
e76e50dc79
|
Web: ServiceWorkers: Turned off debug mode
|
2020-10-07 13:43:51 +03:00 |
|
|
|
7d958b7f9b
|
Web: Files: Restored Suspense
|
2020-10-07 13:39:07 +03:00 |
|
Artem Tarasov
|
a49b2581d9
|
Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
# Conflicts:
# products/ASC.Files/Client/src/components/Article/Body/index.js
# products/ASC.Files/Client/src/store/files/reducers.js
|
2020-10-07 13:24:20 +03:00 |
|
|
|
5171e4fb66
|
Merge pull request #90 from ONLYOFFICE/feature/loading-acceleration
Feature/loading acceleration
|
2020-10-07 13:10:30 +03:00 |
|
|
|
11348e5fba
|
Update yarn.lock files
|
2020-10-07 12:58:38 +03:00 |
|
|
|
1475af5f28
|
web: common: bump version
|
2020-10-07 12:49:50 +03:00 |
|
|
|
5738e82451
|
web: components: bump version
|
2020-10-07 12:49:14 +03:00 |
|
|
|
cbde3120aa
|
Web: Common: Removed Layout and StudioLayout components
|
2020-10-07 12:48:38 +03:00 |
|
|
|
2e74a1bde3
|
Web: Replaced some code tot selectors
|
2020-10-07 12:47:55 +03:00 |
|
Ilya Oleshko
|
19f5206e3f
|
Web: Files : Home : Fixed existing items check on add temp item on create
|
2020-10-07 11:45:20 +03:00 |
|
Ilya Oleshko
|
066a396dbd
|
Web: Files : Home : Fixed double add temp item on create
|
2020-10-07 11:33:10 +03:00 |
|
|
|
0a7eb28989
|
Reassign: fix scope
|
2020-10-07 11:23:43 +03:00 |
|
TatianaLopaeva
|
ee6f71d6ae
|
Web: Files: Refactoring
|
2020-10-07 11:03:19 +03:00 |
|
TatianaLopaeva
|
ee460787d5
|
Web: Components: Refactoring
|
2020-10-07 10:59:31 +03:00 |
|
TatianaLopaeva
|
da9611bd4b
|
Merge branch 'feature/files' into feature/empty-screen
|
2020-10-07 10:58:27 +03:00 |
|
TatianaLopaeva
|
650b5d076a
|
Web: Files: Refactoring
|
2020-10-07 10:57:05 +03:00 |
|
|
|
ac7eda1b93
|
Web: Files: fixed filter
|
2020-10-06 22:56:22 +03:00 |
|
Ilya Oleshko
|
2632a0d3da
|
Web: Files : Home : Fixed loopTree after create or update items at row
|
2020-10-06 21:48:55 +03:00 |
|
|
|
b8d2407530
|
Merge branch 'feature/loading-acceleration' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/loading-acceleration
|
2020-10-06 19:33:57 +03:00 |
|
|
|
201126834f
|
Web: Files: fixed url filter, fixed selectedFolder error
|
2020-10-06 19:33:41 +03:00 |
|
|
|
42d7ffae45
|
Web: People: Fixed loading Profile info after change People filter fields
|
2020-10-06 19:26:01 +03:00 |
|
|
|
7fb3ce6c09
|
Web: People: Added groups for API people loading
|
2020-10-06 19:07:10 +03:00 |
|
|
|
6cd15ef176
|
Merge branch 'feature/loading-acceleration' of github.com:ONLYOFFICE/AppServer into feature/loading-acceleration
|
2020-10-06 18:18:46 +03:00 |
|
