Artem Tarasov
|
54b96e8aa0
|
Merge branch 'develop' into feature/thumbnails
# Conflicts:
# packages/asc-web-common/components/PageLayout/sub-components/SelectedFrame.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesContent.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesRow/FilesRowContainer.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesRow/SimpleFilesRow.js
|
2021-04-15 15:05:15 +03:00 |
|
Artem Tarasov
|
53a8300a86
|
Web: Files: Tiles: added temporaryIcon
|
2021-04-15 13:52:32 +03:00 |
|
Artem Tarasov
|
972ad2fb96
|
Web: Files: Tiles: fixed layout, image size
|
2021-04-15 13:32:04 +03:00 |
|
Artem Tarasov
|
a4aa89564c
|
Web: Files: applied Loaders.Tiles, layout fix
|
2021-04-15 11:47:38 +03:00 |
|
Artem Tarasov
|
f8c69fd939
|
Web: Common: Loaders: added loaders for tiles
|
2021-04-15 11:47:02 +03:00 |
|
Sergey Kirichenko
|
69fb52026f
|
Add feature to run single notify service (#223)
* Modify building docker images
* Add argument to build script
* Modify build images
* Add feature build from oficial dotnet image
* Add feature build from oficial dotnet image
* Rename notify yml file
* Fix conflict
* Fix conflict
* Fix conflict
* Del RID aprument in build scripts
* Cosmetic modify
|
2021-04-14 15:45:16 +03:00 |
|
Artem Tarasov
|
74a5bf33dc
|
Web: Files: fix drag, deleted console.log
|
2021-04-14 12:41:08 +03:00 |
|
Artem Tarasov
|
838bf8798f
|
Web: Files: deleted BadgesFIleTile
|
2021-04-14 00:11:26 +03:00 |
|
Artem Tarasov
|
4be1db4c9a
|
Web: Files: added calling the context menu when right-clicking on a tile
|
2021-04-14 00:09:51 +03:00 |
|
|
|
ad534bbc2f
|
ResManager: fix
|
2021-04-13 22:49:43 +03:00 |
|
|
|
3600151c4f
|
ResManager: fix
|
2021-04-13 21:19:48 +03:00 |
|
Ilya Oleshko
|
ab6dc4b690
|
Merge pull request #222 from ONLYOFFICE/feature/react-selectable
Feature/react selectable
|
2021-04-13 17:21:54 +03:00 |
|
|
|
4b5c73b3e7
|
Web: fixed input user-select
|
2021-04-13 17:05:23 +03:00 |
|
|
|
a321619c98
|
Web: fixed input select
|
2021-04-13 15:18:33 +03:00 |
|
|
|
cfd58847f9
|
Merge branch 'develop' into feature/react-selectable
|
2021-04-13 14:11:20 +03:00 |
|
|
|
c324404767
|
Web: fixed firefox frame
|
2021-04-13 14:07:44 +03:00 |
|
|
|
176a46de65
|
Merge branch 'develop' of https://github.com/ONLYOFFICE/AppServer into develop
|
2021-04-13 13:15:50 +03:00 |
|
|
|
7c412aa42a
|
Merge branch 'master' into develop
|
2021-04-13 13:15:36 +03:00 |
|
Artem Tarasov
|
999722ada7
|
Web: Files: icons moved to separate file
|
2021-04-13 13:13:29 +03:00 |
|
|
|
0a8c9cf10d
|
Merge pull request #221 from ONLYOFFICE/hotfix/0.1.5
Files: fixed root query
|
2021-04-13 13:08:23 +03:00 |
|
|
|
c7017920e8
|
Web: fixed selection for mobile devices
|
2021-04-13 12:56:03 +03:00 |
|
|
|
5daf690ffb
|
Web: fixed selection
|
2021-04-13 12:49:37 +03:00 |
|
Artem Tarasov
|
6467a66773
|
Web: Files: fix layout Editing WrapperComponent for tile view
|
2021-04-13 12:48:58 +03:00 |
|
|
|
9b3d0b8d39
|
Files: fixed root query
|
2021-04-13 12:46:25 +03:00 |
|
|
|
5936640ce2
|
Web: fixed selection
|
2021-04-13 12:43:17 +03:00 |
|
Artem Tarasov
|
ccce8e38b0
|
Web: Files: badges style fix
|
2021-04-13 10:24:03 +03:00 |
|
|
|
8cfd5eb644
|
Web: Added SelectedFrame
|
2021-04-13 09:35:07 +03:00 |
|
Artem Tarasov
|
170d6c4066
|
Web: Files: fix badges position in tile
|
2021-04-12 22:52:28 +03:00 |
|
Artem Tarasov
|
fbbb5a34ef
|
Web: Files: added view saving to localStorage, refactoring
|
2021-04-12 18:40:27 +03:00 |
|
Artem Tarasov
|
352cfaf2f1
|
Web: Files: fix layout
|
2021-04-12 18:02:53 +03:00 |
|
|
|
830beacf9d
|
Merge pull request #220 from ONLYOFFICE/bugfix/v0.1.2
Bugfix/v0.1.2
|
2021-04-12 17:47:55 +03:00 |
|
Ilya Oleshko
|
57a878df50
|
Merge branch 'develop' into bugfix/v0.1.2
|
2021-04-12 12:56:23 +03:00 |
|
|
|
2c89dd483b
|
Merge pull request #216 from ONLYOFFICE/bugfix/files-panel
Bugfix/files panel
|
2021-04-12 12:32:07 +03:00 |
|
|
|
2c0dd28ad4
|
Merge branch 'develop' into bugfix/files-panel
|
2021-04-12 12:09:33 +03:00 |
|
Ilya Oleshko
|
12255e771f
|
Merge branch 'develop' into bugfix/v0.1.2
|
2021-04-12 11:42:34 +03:00 |
|
|
|
4d644aff17
|
Merge branch 'master' into develop
|
2021-04-12 10:34:56 +03:00 |
|
Artem Tarasov
|
9cc5b30634
|
Web: Files: file badges moved to a separate file
|
2021-04-12 10:25:01 +03:00 |
|
Artem Tarasov
|
b820dc0491
|
Web: Files: fix after merge
|
2021-04-10 01:05:04 +03:00 |
|
TatianaLopaeva
|
ed1dcfa4a4
|
Merge branch 'bugfix/v0.1.2' of github.com:ONLYOFFICE/AppServer into bugfix/v0.1.2
|
2021-04-09 17:49:51 +03:00 |
|
TatianaLopaeva
|
7073d0cd61
|
Web: Files: Fixed upload files.
|
2021-04-09 17:39:11 +03:00 |
|
|
|
9bb02d2d72
|
Merge pull request #219 from ONLYOFFICE/hotfix/v0.1.4
Fix version mismach
|
2021-04-09 16:31:59 +03:00 |
|
|
|
be66f17d92
|
Fix version mismach
|
2021-04-09 16:29:45 +03:00 |
|
Ilya Oleshko
|
c681036143
|
Web: Files: FilesStore: Fixed files context options access for context-menu
|
2021-04-09 15:53:52 +03:00 |
|
Ilya Oleshko
|
e2e65b4683
|
Merge branch 'bugfix/v0.1.2' of github.com:ONLYOFFICE/AppServer into bugfix/v0.1.2
|
2021-04-09 14:15:30 +03:00 |
|
|
|
b4506b73e4
|
Web: Files: fixed NewFiles panel
|
2021-04-09 14:11:33 +03:00 |
|
|
|
6f8641cc41
|
Merge branch 'master' into develop
|
2021-04-09 13:08:44 +03:00 |
|
Vladislav Makhov
|
73ca8656bf
|
web: files: fix loader view via mobile
|
2021-04-09 12:35:11 +03:00 |
|
Artem Tarasov
|
f8b36757ae
|
Merge branch 'develop' into feature/thumbnails
# Conflicts:
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesContent.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesRow/SimpleFilesRow.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesTileContent.js
# products/ASC.Files/Client/src/store/index.js
|
2021-04-09 11:51:39 +03:00 |
|
Artem Tarasov
|
14a1c5b727
|
Web: Files: fix rename file
|
2021-04-09 11:32:38 +03:00 |
|
Artem Tarasov
|
d35c801850
|
Web: Files: fix rename file
|
2021-04-09 11:32:08 +03:00 |
|
