Commit Graph

37 Commits

Author SHA1 Message Date
Timofey
f5ae02dfc9 Merge branch 'develop' into feature/catalog 2022-01-21 21:06:40 +08:00
7f39ebd499 Web: Files: SelectFileDialog: Fixed loaders according layouts. 2021-11-30 10:11:49 +03:00
a4e21a2319 Web: Component: Added modal dialog height property. 2021-11-18 15:24:28 +03:00
d37aa52f09 Merge branch 'develop' into feature/catalog 2021-11-02 21:04:46 +08:00
c163576b8b Web: Files: Fixed styles for section header for tablet/mobile view. 2021-10-22 13:03:17 +03:00
94cbac3c02 Merge branch 'develop' into feature/catalog 2021-10-22 15:43:23 +08:00
d7547a11a1 Web: Fix Failed prop type: Invalid prop animate of value 0 supplied to RectangleLoader 2021-10-22 10:17:29 +03:00
fd89092abe Web: Fix Failed prop type: Invalid prop animate of value 0 supplied to RectangleLoader 2021-10-21 11:43:26 +03:00
9aa3fd7047 Web:Common:Catalog: update branch 2021-10-20 22:31:39 +08:00
55cb1e875e Web: fixed header height 2021-10-06 12:22:28 +03:00
88d0c9a5a9 Web:Common:Catalog: removed margin top and fix main button loader 2021-10-05 16:40:31 +08:00
324ca6af20 Web:Common:Catalog: added default width and fix margins 2021-10-04 22:22:06 +08:00
bd56abaa0a Web:Common: fixed z-index 2021-09-30 18:06:00 +08:00
b36f141cfb Web:Common: fixed catalog on big screen tablet or mobile 2021-09-30 17:05:04 +08:00
24772e88ad Web: fixed document catalog loader 2021-09-28 18:25:23 +08:00
a5c57fea52 Web: added catalog layout and document catalog 2021-09-27 20:59:37 +08:00
d51887f642 Web: Common: Fixed Article loaders + added MainButtonLoader 2021-09-07 12:29:55 +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
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
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
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
1a3cfcbf27 Web: Common: added new loaders 2021-06-30 10:22:01 +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
Artem Tarasov
b65c717fd5 Web: Common: Loaders: fixed TilesLoader for Chrome 2021-06-24 19:34:47 +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
65378cc089 Merge branch 'develop' into feature/personal
# Conflicts:
#	products/ASC.CRM/Client/public/index.html
#	products/ASC.Calendar/Client/public/index.html
#	products/ASC.Files/Client/public/index.html
#	products/ASC.Files/Client/src/HOCs/withFileActions.js
#	products/ASC.Files/Client/src/components/panels/UploadPanel/FileRow.js
#	products/ASC.Files/Client/src/pages/Home/index.js
#	products/ASC.Mail/Client/public/index.html
#	products/ASC.People/Client/public/index.html
#	products/ASC.People/Client/src/pages/Profile/Section/Body/ProfileInfo/ProfileInfo.js
#	products/ASC.People/Client/src/pages/Profile/Section/Body/index.js
#	products/ASC.People/Client/src/pages/ProfileAction/Section/Body/updateUserForm.js
#	products/ASC.Projects/Client/public/index.html
2021-06-15 11:49:39 +03:00
Artem Tarasov
ee4760e899 Merge branch 'develop' into feature/thumbnails
# Conflicts:
#	products/ASC.Files/Client/src/HOCs/withFileActions.js
2021-06-11 18:30:44 +03:00
Artem Tarasov
d44f1bee0f Web: fixed loading people/my, fixed Loaders.ProfileView, deleted unnecessary code 2021-06-11 16:57:17 +03:00
d01ef10cc5 Web: NavMenu/PageLayout: Was done:
- fixed loaders: two rectangle loader combined into one
- fixed loaders at index.html: two rectangle loader combined into one
- hide NavItem component
- hide click on Headline component
- fixed article padding style for desktop
- added new logo.
2021-06-04 14:42:21 +03:00
Artem Tarasov
9eb3b2a375 Web: Components/Client: fix tree loader, fix version badge 2021-05-17 12:40:46 +03:00
Artem Tarasov
f8c69fd939 Web: Common: Loaders: added loaders for tiles 2021-04-15 11:47:02 +03:00
Artem Tarasov
487fd2affc Web: Components/Common: fix imports 2021-02-26 00:19:45 +03:00
Artem Tarasov
48b3c6b445 Web: Common: fix after merge, fix imports and hierarchy 2021-02-25 17:20:11 +03:00