|
|
0297620036
|
Fix SnackBar usage
|
2021-07-09 17:25:20 +03:00 |
|
|
|
3556497de6
|
Merge branch 'develop' into feature/personal
|
2021-07-08 14:38:26 +03:00 |
|
|
|
84fa1f8eb3
|
Web: Common: fixed height
|
2021-07-08 13:59:48 +03:00 |
|
|
|
523fb66248
|
Web: Common: fixed buttons height
|
2021-07-07 13:20:16 +03:00 |
|
|
|
2e2f121d26
|
Web: Common: disabled hover
|
2021-07-07 12:47:01 +03:00 |
|
|
|
04173a1426
|
Web: Common: fixed
|
2021-07-07 11:05:18 +03:00 |
|
|
|
a9ed86fee7
|
Web: Common: open selector on button
|
2021-07-06 17:37:07 +03:00 |
|
|
|
db7ea5c88f
|
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into bugfix/v1.0.0
# Conflicts:
# products/ASC.Files/Client/src/pages/Home/index.js
|
2021-07-06 11:38:02 +03:00 |
|
|
|
a31dc583c1
|
Merge branch 'develop' into feature/personal
# Conflicts:
# products/ASC.Files/Client/src/HOCs/withFileActions.js
# products/ASC.Files/Client/src/components/panels/SharingPanel/index.js
# products/ASC.Files/Client/src/pages/Home/Section/Filter/index.js
# products/ASC.Files/Client/src/pages/Settings/index.js
|
2021-07-02 16:26:45 +03:00 |
|
|
|
c940aae128
|
Web: refactoring translation loaders
|
2021-07-02 12:25:36 +03:00 |
|
|
|
513ec04e33
|
Merge branch 'develop' into feature/translations-loaders
# Conflicts:
# products/ASC.Files/Client/src/components/dialogs/DeleteDialog/index.js
# products/ASC.Files/Client/src/components/panels/SharingPanel/index.js
# products/ASC.People/Client/src/components/Article/MainButton/index.js
# products/ASC.People/Client/src/pages/Home/Section/Header/index.js
|
2021-07-01 16:47:34 +03:00 |
|
|
|
bcf7ceb568
|
Merge branch 'develop' into feature/translations-loaders
# Conflicts:
# packages/asc-web-common/components/Loaders/index.js
|
2021-07-01 09:13:17 +03:00 |
|
|
|
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 |
|
Artem Tarasov
|
ef25c07ddc
|
Web: Common: FilterInput: fixed transfer viewSettings
|
2021-06-30 17:05:11 +03:00 |
|
|
|
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 |
|
|
|
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 |
|
|
|
dae7215376
|
Web: Common: fixed article max width
|
2021-06-30 13:57:48 +03:00 |
|
|
|
567d3b46ed
|
Web: Common: fixed button height on mobile
|
2021-06-30 13:49:33 +03:00 |
|
|
|
0a82baea4c
|
WebL Common: fixed article max width
|
2021-06-30 13:38:53 +03:00 |
|
|
|
2576784207
|
Web: Common: added borderRadius prop
|
2021-06-30 12:57:05 +03:00 |
|
|
|
2a013c9c5c
|
Web: Common: refactoring tree menu loader
|
2021-06-30 12:54:10 +03:00 |
|
Artem Tarasov
|
4da80d3f0c
|
Web: Files: deleted unnecessary code
|
2021-06-30 10:50:06 +03:00 |
|
|
|
1a3cfcbf27
|
Web: Common: added new loaders
|
2021-06-30 10:22:01 +03:00 |
|
Artem Tarasov
|
4613940d15
|
Wb: Common: FileteInput: fixed display ViewSelector on mobile
|
2021-06-29 16:54:30 +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
|
879aaf1ffd
|
Web: Common: Loaders: fixed description for Loaders.Tile, Loaders.Tiles
|
2021-06-28 11:42:38 +03:00 |
|
Artem Tarasov
|
ff5a165638
|
Web: Files: Thumbnails: fixed position of TileCOntainer, fixed readme ThileLoader
|
2021-06-28 11:25:23 +03:00 |
|
|
|
a1dec7cd2d
|
Web: Common: disabled sort by button
|
2021-06-28 08:14:40 +03:00 |
|
Artem Tarasov
|
547e4a1a26
|
Web: Common: Filter: fixed select view
|
2021-06-25 16:38:57 +03:00 |
|
Artem Tarasov
|
52cd157d8d
|
Web: Common: FilterInpt: deleted unnecessary code
|
2021-06-25 15:56:44 +03:00 |
|
Artem Tarasov
|
50556cb428
|
Web: Thumbnails: deleted unnecessary code, refactoring
|
2021-06-25 14:30:14 +03:00 |
|
Artem Tarasov
|
b65c717fd5
|
Web: Common: Loaders: fixed TilesLoader for Chrome
|
2021-06-24 19:34:47 +03:00 |
|
|
|
c8184e9dc0
|
Web: Files: fixed privacy bugs
|
2021-06-23 15:39:43 +03:00 |
|
Artem Tarasov
|
01fb0a6621
|
Web: Files: Thumbnails: deleted unnecessary code
|
2021-06-23 15:34:30 +03:00 |
|
Artem Tarasov
|
f894d4593f
|
Web: Common: Loaders: fixed TilesLoader
|
2021-06-23 15:00:49 +03:00 |
|
Artem Tarasov
|
1430dace28
|
Web: fix after merdge
|
2021-06-23 00:00:42 +03:00 |
|
Artem Tarasov
|
2d9c33a8c6
|
Merge branch 'develop' into feature/thumbnails
# Conflicts:
# packages/asc-web-common/components/PageLayout/index.js
|
2021-06-22 23:46:35 +03:00 |
|
|
|
282738cb13
|
Merge branch 'develop' into feature/personal
|
2021-06-22 18:44:12 +03:00 |
|
|
|
8963df11c3
|
Merge branch 'feature/personal' of https://github.com/ONLYOFFICE/AppServer into feature/personal
|
2021-06-22 13:41:22 +03:00 |
|
|
|
b1662e7ac6
|
Web: Init maintenance displaying
|
2021-06-22 13:41:11 +03:00 |
|
|
|
e27cee4535
|
Web: Common: fixed selection
|
2021-06-22 09:56:48 +03:00 |
|
|
|
a55544454a
|
Web: Common: added support scroll to selectbox, fixed styles
|
2021-06-18 17:17:59 +03:00 |
|
|
|
0005169b2b
|
Web: Common: fixed dragCondition
|
2021-06-18 14:10:20 +03:00 |
|
|
|
7905b07c0c
|
Web: Files: added dragCondition to Selecto
|
2021-06-18 13:53:32 +03:00 |
|
Artem Tarasov
|
83549b62cd
|
Merge branch 'develop' into feature/thumbnails
# Conflicts:
# packages/asc-web-common/api/files/index.js
# products/ASC.Files/Client/src/pages/Home/index.js
|
2021-06-18 12:02:10 +03:00 |
|
|
|
249af955d1
|
Web: Files: added onSelect function for selectbox
|
2021-06-17 18:46:22 +03:00 |
|
|
|
df70473ce5
|
Merge branch 'develop' into feature/changing-selectbox-library
|
2021-06-17 17:19:17 +03:00 |
|
|
|
b088c925d6
|
Merge branch 'develop' into feature/personal
# Conflicts:
# products/ASC.Files/Client/src/components/dialogs/ConnectDialog/index.js
# products/ASC.Files/Client/src/pages/Home/index.js
# products/ASC.Files/Client/src/store/FilesStore.js
|
2021-06-17 15:47:33 +03:00 |
|
Artem Tarasov
|
a8fe50142c
|
Web: Tree: fixed position of scrollbar on tablet
|
2021-06-17 15:01:35 +03:00 |
|
