IlyaSobolev/DocSpace-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
13,196 Commits 40 Branches 22 Tags 420 MiB
d7b5f504ed
Commit Graph

13196 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Viktor Fomin
be88eae6bf Web: Components: added campaigns banner 2021-06-30 18:10:16 +03:00
gopienkonikita
c93a4eda8e Merge branch 'develop' into feature/privacy-rooms-page 
# Conflicts:
#	products/ASC.Files/Client/src/pages/Home/Section/Filter/index.js
 2021-06-30 17:20:54 +03:00
Ilya Oleshko
2e8ae2fb65
Merge pull request #293 from ONLYOFFICE/bugfix/fix-filter-input 
Bugfix/fix filter input
 2021-06-30 17:17:05 +03:00
Artem Tarasov
e7e0f55403 Web: Files: deleted unnecessary code 2021-06-30 17:06:57 +03:00
Artem Tarasov
ef25c07ddc Web: Common: FilterInput: fixed transfer viewSettings 2021-06-30 17:05:11 +03:00
gopienkonikita
69889cab4c Merge branch 'develop' into feature/privacy-rooms-page 
# Conflicts:
#	packages/asc-web-common/components/PageLayout/index.js
#	products/ASC.Files/Client/src/HOCs/withFileActions.js
#	products/ASC.Files/Client/src/helpers/constants.js
#	products/ASC.Files/Client/src/pages/Home/Section/Filter/index.js
#	products/ASC.Files/Client/src/store/FilesStore.js
 2021-06-30 16:28:37 +03:00
AlexeySafronov
1083fd8416 Merge branch 'develop' into feature/personal 
# Conflicts:
#	products/ASC.Files/Client/src/pages/Home/Section/Filter/index.js
#	products/ASC.Files/Client/src/store/FilesStore.js
 2021-06-30 16:09:53 +03:00
Alexey Safronov
b7d834d3c6
Merge pull request #289 from ONLYOFFICE/feature/thumbnails 
Feature/thumbnails
 2021-06-30 15:41:59 +03:00
Artem Tarasov
0f19f240d1 Web: Files: fixed reset selection 2021-06-30 15:02:29 +03:00
gopienkonikita
d9eca86efa Web: People: added tReady to file dialogs 2021-06-30 14:11:52 +03:00
Viktor Fomin
f905d72caa Web: Files: fixed article max width 2021-06-30 13:58:00 +03:00
Viktor Fomin
dae7215376 Web: Common: fixed article max width 2021-06-30 13:57:48 +03:00
Viktor Fomin
567d3b46ed Web: Common: fixed button height on mobile 2021-06-30 13:49:33 +03:00
Artem Tarasov
4f963784d3 Merge branch 'develop' into feature/thumbnails 2021-06-30 13:47:41 +03:00
Viktor Fomin
2d718c33f8 Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into bugfix/v1.0.0 2021-06-30 13:39:02 +03:00
Viktor Fomin
0a82baea4c WebL Common: fixed article max width 2021-06-30 13:38:53 +03:00
Pavel Bannov
55e603f906
Merge pull request #287 from ONLYOFFICE/feature/remove_itemList 
Feature/remove item list
 2021-06-30 13:06:56 +03:00
gopienkonikita
2576784207 Web: Common: added borderRadius prop 2021-06-30 12:57:05 +03:00
gopienkonikita
f915deeaf0 Web: Files: added translation loaders to the file module 2021-06-30 12:55:52 +03:00
Artem Tarasov
51e17e5510 Web: Files: fixed reset selection when open aside 2021-06-30 12:55:10 +03:00
gopienkonikita
2a013c9c5c Web: Common: refactoring tree menu loader 2021-06-30 12:54:10 +03:00
pavelbannov
bf31efc939 Files: removed ItemDictionary 2021-06-30 12:39:08 +03:00
pavelbannov
f219216dfe Merge branch 'develop' into feature/remove_itemList 2021-06-30 11:24:27 +03:00
pavelbannov
8ee188346b Api: setphone can be authorized by confirm link 2021-06-30 11:20:55 +03:00
Artem Tarasov
4da80d3f0c Web: Files: deleted unnecessary code 2021-06-30 10:50:06 +03:00
gopienkonikita
41f7a87ad1 Web: Files: added tReady to file panels 2021-06-30 10:29:48 +03:00
gopienkonikita
fff65d1ee9 Web: Files: added tReady to file dialogs 2021-06-30 10:28:13 +03:00
gopienkonikita
d163e09a1c Web: Components: added isLoading prop to modal-dialog 2021-06-30 10:23:49 +03:00
gopienkonikita
1a3cfcbf27 Web: Common: added new loaders 2021-06-30 10:22:01 +03:00
Artem Tarasov
8d1be25dbc Web: Component: ViewSelector: fixed styled 2021-06-29 22:02:12 +03:00
gopienkonikita
67f3782a41 Web: Files: fixed dragging 2021-06-29 18:57:55 +03:00
gopienkonikita
f327f42bf8 Web: Common: added filed encrypted to startUploadSession function 2021-06-29 17:54:24 +03:00
Artem Tarasov
9de3ebe20b Web: Files: deleted unnecessary code 2021-06-29 17:00:52 +03:00
Artem Tarasov
4613940d15 Wb: Common: FileteInput: fixed display ViewSelector on mobile 2021-06-29 16:54:30 +03:00
Artem Tarasov
6466432c9c Merge branch 'develop' into feature/thumbnails 2021-06-29 15:49:11 +03:00
Artem Tarasov
3385d367d4 Web: Files: refactoring 2021-06-29 15:48:17 +03:00
Artem Tarasov
0cae3990cc Web: Files: added usage ViewSelector 2021-06-29 15:32:48 +03:00
Artem Tarasov
2ae591f839 Web: added svg for view 2021-06-29 15:28:44 +03:00
Artem Tarasov
d73bb73dab Web: Components: rewrited component SwitchButton to ViewSelector 2021-06-29 15:27:46 +03:00
AlexeySafronov
b0f64ca924 Merge branch 'develop' into feature/personal 2021-06-29 14:50:51 +03:00
gopienkonikita
9870859fe1 Web: Files: fixed dragging 2021-06-29 13:36:04 +03:00
gopienkonikita
73cdaad3fb Web: Files: added hiding group file menu 2021-06-29 13:13:05 +03:00
SuhorukovAnton
c6ede6fff7 Merge branch 'develop' into feature/remove_itemList 2021-06-29 12:47:56 +03:00
SuhorukovAnton
c906c2c419 remove itemList in tests 2021-06-29 12:47:32 +03:00
gopienkonikita
6590529260 Web: Files: removed margin for privacy folder 2021-06-29 12:32:59 +03:00
gopienkonikita
78595cf513 Web: Files: fixed PrivateRoomSupport translation 2021-06-29 12:27:46 +03:00
Artem Tarasov
4d7fe086b5 Web: Files: fixed reset seletion 2021-06-28 14:38:17 +03:00
gopienkonikita
e47e43afcd Merge branch 'develop' into feature/privacy-rooms-page 2021-06-28 14:37:23 +03:00
gopienkonikita
2cd83d0897 Web: Files: refactoring private rooms page 2021-06-28 14:36:38 +03:00
Artem Tarasov
42f30be69c Web: Files: fixed display of the canWebEditIcon if the file is already open 2021-06-28 14:29:06 +03:00