Alexey Kostenko
|
3cad7a62ad
|
Web: Common: FilterInput: Changed the width calculated method
|
2020-11-11 12:36:07 +03:00 |
|
TatianaLopaeva
|
58ee96df1f
|
Web: Common: Fixed display of header
|
2020-11-11 12:09:19 +03:00 |
|
Viktor Fomin
|
e8954feadf
|
Web: Common: delete x, y props, added border radius knobs
|
2020-11-11 11:38:30 +03:00 |
|
Viktor Fomin
|
fea69360b7
|
Web: Common: fix ProfileAction loader opacity
|
2020-11-11 11:19:29 +03:00 |
|
Alexey Kostenko
|
eb58b76024
|
Web: Common: FilterInput: Fixed filter when change orientation on mobile devices
|
2020-11-11 10:42:28 +03:00 |
|
TatianaLopaeva
|
b8cb6f2508
|
Merge branch 'develop' into feature/fix-hide/show-header
# Conflicts:
# web/ASC.Web.Common/src/components/PageLayout/sub-components/section-header.js
|
2020-11-11 10:13:03 +03:00 |
|
Alexey Kostenko
|
71e4989f5a
|
Web: Common: FilterInput: fixed sort comboBox
|
2020-11-11 10:02:00 +03:00 |
|
Alexey Kostenko
|
b81dc68ef7
|
Web: Common: FilterInput: Fixed sort comboBox
|
2020-11-11 09:48:33 +03:00 |
|
Alexey Kostenko
|
b6d0ebad21
|
Web: Common: FilterInput: Small refactoring
|
2020-11-11 09:36:19 +03:00 |
|
Alexey Kostenko
|
4ee688427f
|
Web: Common: FilterInput: Page resize is tracked through a prop
|
2020-11-11 07:42:38 +03:00 |
|
Alexey Kostenko
|
e29eeb2f4b
|
Web: Common/Client: FilterInput: Added sectionWidth prop
|
2020-11-11 07:27:42 +03:00 |
|
TatianaLopaeva
|
77f0bc0493
|
Web: Common: Added padding for section-header
|
2020-11-10 19:45:29 +03:00 |
|
Viktor Fomin
|
df4c89cb91
|
Merge branch 'develop' into feature/filter-loader
|
2020-11-10 18:09:58 +03:00 |
|
Viktor Fomin
|
cfa08f5f25
|
Web: Common: fix circular dependency
|
2020-11-10 18:02:03 +03:00 |
|
Viktor Fomin
|
deb1168683
|
Web: Common: divided RowLoader and RowsLoader into two components
|
2020-11-10 17:58:19 +03:00 |
|
Viktor Fomin
|
81ca31c1b8
|
Web: Common: take styles out of components
|
2020-11-10 17:54:38 +03:00 |
|
Viktor Fomin
|
ba420d2ad6
|
Web: Common: fix props
|
2020-11-10 17:31:25 +03:00 |
|
Viktor Fomin
|
710c169bf0
|
Web: Common: destructuring props
|
2020-11-10 17:29:11 +03:00 |
|
Alexey Kostenko
|
a52f07e4e0
|
Web: Common: FilterInput: Decreased the minimum size of the search field
|
2020-11-10 14:28:49 +03:00 |
|
Alexey Kostenko
|
8825610fb5
|
Merge branch 'develop' into hotfix/filter-input-hotfix
|
2020-11-10 13:59:55 +03:00 |
|
Artem Tarasov
|
4031a609b8
|
Merge branch 'develop' into hotfix/documents-bugfix
# Conflicts:
# web/ASC.Web.Common/package.json
# web/ASC.Web.Components/src/components/icons/svg/index.js
|
2020-11-10 13:34:04 +03:00 |
|
Alexey Kostenko
|
8d43d5efaa
|
Web: Common: FilterInput: Fixed transition between mobile and desktop state, and change direction bug
|
2020-11-10 12:44:04 +03:00 |
|
TatianaLopaeva
|
67cf0a4364
|
Web: Common: Return position fixed for pin-panel
|
2020-11-10 11:14:36 +03:00 |
|
Viktor Fomin
|
9cbe89d4b5
|
Merge branch 'develop' into feature/filter-loader
|
2020-11-10 11:02:29 +03:00 |
|
TatianaLopaeva
|
326d2e50a9
|
Web: Common: Changed height and deleted position fixed for article
|
2020-11-10 10:52:06 +03:00 |
|
Viktor Fomin
|
0a59504ccc
|
Web: Common: fix opacity const
|
2020-11-10 10:41:21 +03:00 |
|
Vladislav Makhov
|
9cc469a51c
|
Merge branch 'develop' into feature/third-party-settings
|
2020-11-10 08:39:33 +03:00 |
|
Viktor Fomin
|
d34beb7caf
|
Web: Common: created profile view loader
|
2020-11-10 02:56:30 +03:00 |
|
Viktor Fomin
|
796059bbfa
|
Web: Common: added propTypes
|
2020-11-10 01:03:19 +03:00 |
|
Viktor Fomin
|
515bd0d05f
|
Merge branch 'feature/filter-loader' of github.com:ONLYOFFICE/AppServer into feature/filter-loader
|
2020-11-09 23:02:18 +03:00 |
|
Viktor Fomin
|
f553257760
|
Web: Common: fix colors
|
2020-11-09 22:56:21 +03:00 |
|
|
d012aa6071
|
Merge branch 'develop' into feature/filter-loader
# Conflicts:
# web/ASC.Web.Common/package.json
|
2020-11-09 22:15:04 +03:00 |
|
TatianaLopaeva
|
e65c62a282
|
Web: Common: Added margin-top
|
2020-11-09 20:57:13 +03:00 |
|
TatianaLopaeva
|
5eca305fdc
|
Merge branch 'develop' into feature/fix-hide/show-header
# Conflicts:
# web/ASC.Web.Common/src/components/PageLayout/sub-components/article.js
|
2020-11-09 20:53:25 +03:00 |
|
TatianaLopaeva
|
c458c2d4fd
|
Web: Common: Changed styles by layout
|
2020-11-09 20:50:02 +03:00 |
|
Ilya Oleshko
|
b16448bea3
|
Web: Common: Article: Fixed after merge
|
2020-11-09 18:30:57 +03:00 |
|
Alexey Kostenko
|
56bdfb9826
|
Web: Common: FilterInput: Fixed reset filter
|
2020-11-09 17:52:24 +03:00 |
|
Viktor Fomin
|
372db7f819
|
Web: Common: added isRectangle props in readme
|
2020-11-09 16:49:37 +03:00 |
|
Viktor Fomin
|
8b72b19401
|
Web: Common: fix column gap
|
2020-11-09 16:38:13 +03:00 |
|
Viktor Fomin
|
3d5b3a9784
|
Web: Common: added rectangle or circle props in rows loader
|
2020-11-09 16:25:59 +03:00 |
|
Vladislav Makhov
|
078bb238fd
|
Add url to store
|
2020-11-09 16:15:36 +03:00 |
|
Alexey Kostenko
|
c19be92b35
|
Web: Common: FilterInput: Fixed component initialization
|
2020-11-09 16:05:53 +03:00 |
|
Viktor Fomin
|
a6352c87ee
|
Web: Common: added title props for loaders
|
2020-11-09 16:02:08 +03:00 |
|
Alexey Kostenko
|
6bfaae5d2f
|
Web: Common: FilterInput: Fixed filter when selected new item filter items, fixed infinite rendering in small mobile devices
|
2020-11-09 16:01:29 +03:00 |
|
TatianaLopaeva
|
78113a8168
|
Web: Common: Changed styles by layout
|
2020-11-09 15:42:48 +03:00 |
|
Vladislav Makhov
|
fee439b390
|
Refactoring
|
2020-11-09 15:11:46 +03:00 |
|
Viktor Fomin
|
86c5962621
|
Web: Common: added readme for stories
|
2020-11-09 14:45:57 +03:00 |
|
Viktor Fomin
|
d12dbd797c
|
Web: Common: fix loaders if not auth
|
2020-11-09 13:08:51 +03:00 |
|
Artem Tarasov
|
3c557194df
|
Web: Common: SelectedFrame: fixed selection of el at the start of selection on the border between rows
|
2020-11-09 12:38:35 +03:00 |
|
Viktor Fomin
|
adc6347d21
|
Web: Common: fix story for header loader
|
2020-11-09 12:35:48 +03:00 |
|
Viktor Fomin
|
a7da70bb8b
|
Web: Common: fix loader style opacity constant
|
2020-11-09 12:35:06 +03:00 |
|
Viktor Fomin
|
950dca9a2a
|
Web: Common: added prop types
|
2020-11-09 12:34:25 +03:00 |
|
Viktor Fomin
|
55143dfbd0
|
Web: Common: fix props
|
2020-11-09 12:33:59 +03:00 |
|
Viktor Fomin
|
ac7b6bf362
|
Web: Common: fix header loader opacity
|
2020-11-09 12:33:13 +03:00 |
|
Alexey Kostenko
|
433d0d399f
|
Web: Common: FilterInput: Fixed filter when added/removed filter items
|
2020-11-09 12:12:26 +03:00 |
|
Alexey Kostenko
|
20f92245f4
|
Web: Common: FilterInput: Fixed adding elements when screen zooms in
|
2020-11-09 09:26:03 +03:00 |
|
Viktor Fomin
|
d8e541498c
|
Web: Common: add header loader
|
2020-11-06 18:26:32 +03:00 |
|
Viktor Fomin
|
24bdcdf04d
|
Web: Common: create header loader stories
|
2020-11-06 18:25:40 +03:00 |
|
Viktor Fomin
|
0134d7a2d8
|
Web: Common: fix logo
|
2020-11-06 17:45:54 +03:00 |
|
Viktor Fomin
|
eaa7e270bb
|
Web: Common: add logoUrl setting
|
2020-11-06 17:44:51 +03:00 |
|
Viktor Fomin
|
916d8f9b0c
|
Web: Common: create header loader
|
2020-11-06 17:43:59 +03:00 |
|
Artem Tarasov
|
612661a22b
|
Web: Files/Common: MainButton: fixed line-height
|
2020-11-06 16:43:14 +03:00 |
|
Artem Tarasov
|
c791fa29aa
|
Web: Files/Common: PageLayout: fixed margin-top in Header
|
2020-11-06 16:15:03 +03:00 |
|
Viktor Fomin
|
98dabb19ab
|
Web: Common: use ternary operator
|
2020-11-06 15:58:30 +03:00 |
|
Viktor Fomin
|
2d78e10011
|
Web: Common: hide AddonPanel
|
2020-11-06 15:51:31 +03:00 |
|
Viktor Fomin
|
ffd23c59b4
|
Web: Common: create stories
|
2020-11-06 15:39:31 +03:00 |
|
Viktor Fomin
|
2f8ecce840
|
Web: Common: add props
|
2020-11-06 15:38:53 +03:00 |
|
Viktor Fomin
|
b9a0c235b3
|
Web: Common: add props
|
2020-11-06 15:38:36 +03:00 |
|
Viktor Fomin
|
1a384ae0cd
|
Web: Common: add props
|
2020-11-06 15:38:20 +03:00 |
|
Viktor Fomin
|
b5fb1e583e
|
Web: Common: add props
|
2020-11-06 15:38:05 +03:00 |
|
Viktor Fomin
|
a7be2b8ab7
|
Web: Common: fix and add new loader style constants
|
2020-11-06 15:21:01 +03:00 |
|
Viktor Fomin
|
8f5490d1c3
|
Web: Common: refactoring loaders
|
2020-11-06 15:20:06 +03:00 |
|
Viktor Fomin
|
c298711379
|
Web: Common: fix props circle
|
2020-11-06 15:00:11 +03:00 |
|
Viktor Fomin
|
3c52b86599
|
Web: Common: fix props rectangle
|
2020-11-06 14:59:37 +03:00 |
|
Alexey Kostenko
|
3f77abc3c9
|
Web: Common: FilterInput: Refactoring, removed unused methods
|
2020-11-06 13:28:31 +03:00 |
|
Alexey Kostenko
|
8d10326c44
|
Web: Common: FilterInput: Fixed hidden elements when screen zooms out
|
2020-11-06 13:07:08 +03:00 |
|
Artem Tarasov
|
173017ddbb
|
Web: Common: AdvancedSelector: fixed layout
|
2020-11-06 12:48:08 +03:00 |
|
Artem Tarasov
|
678d31cc32
|
Web: Common: GroupSelector: fixed placeholder
|
2020-11-05 23:59:44 +03:00 |
|
TatianaLopaeva
|
9289acdb51
|
Web: Common: Fixed the problem with show header scrolling horizontally
|
2020-11-05 19:04:24 +03:00 |
|
TatianaLopaeva
|
3cdc31a39b
|
Web: Common: Fixed width of section-body for tablet/mobile
|
2020-11-05 16:17:59 +03:00 |
|
Viktor Fomin
|
63015ca2bd
|
Web: Common: fix color
|
2020-11-05 12:23:50 +03:00 |
|
TatianaLopaeva
|
160c5ced25
|
Web: Common: Added window width in comparison condition for people module
|
2020-11-05 11:40:42 +03:00 |
|
Artem Tarasov
|
481abf40f8
|
Web: Common: applied prop size for Avatar Component
|
2020-11-05 11:39:09 +03:00 |
|
Viktor Fomin
|
e2a32c10d6
|
Web: Common: added one row
|
2020-11-05 11:16:55 +03:00 |
|
Viktor Fomin
|
e4f6dd255e
|
Web: Common: rename headers components
|
2020-11-05 11:15:15 +03:00 |
|
TatianaLopaeva
|
7e034e60de
|
Web: Common: Added display condition for section-header when group button menu is visible
|
2020-11-05 10:39:53 +03:00 |
|
Viktor Fomin
|
1c2e8e5c67
|
Web: Common: create headline loader
|
2020-11-04 12:27:56 +03:00 |
|
Viktor Fomin
|
37fc3fff7c
|
Web: Common: added x, y props
|
2020-11-04 12:24:52 +03:00 |
|
Viktor Fomin
|
46a9fe2e45
|
Web: Common: Create head loader
|
2020-11-04 12:21:13 +03:00 |
|
Viktor Fomin
|
0efd774bba
|
Web: Common: Create rows loader
|
2020-11-04 01:54:44 +03:00 |
|
Viktor Fomin
|
a591a48e13
|
Web: Common: create tree folder loader
|
2020-11-03 23:00:43 +03:00 |
|
Viktor Fomin
|
234b323633
|
Web: Common: fix coordinate x
|
2020-11-03 22:59:36 +03:00 |
|
Viktor Fomin
|
c58a22748c
|
Web: Common: Create circle loader
|
2020-11-03 20:22:32 +03:00 |
|
Viktor Fomin
|
f02e32894b
|
Web: Common: added rectangle loader
|
2020-11-03 18:37:08 +03:00 |
|
Viktor Fomin
|
e99cdff1ad
|
Web: Common: fix column size
|
2020-11-03 18:35:44 +03:00 |
|
Viktor Fomin
|
e9d3fe1775
|
Web: Common: added props for rectangle loader
|
2020-11-03 18:34:39 +03:00 |
|
Viktor Fomin
|
6ffd937480
|
Web: Common: fix loader style constant
|
2020-11-03 18:33:32 +03:00 |
|
TatianaLopaeva
|
c36f79b526
|
web: Common: Added window width in comparison condition
|
2020-11-03 16:02:20 +03:00 |
|
Viktor Fomin
|
8ec67a1c03
|
Web: Common: Create FilterLoader stories
|
2020-11-03 15:56:33 +03:00 |
|
Viktor Fomin
|
f1d5b08521
|
Web: Common: Fix filter loader
|
2020-11-03 15:55:51 +03:00 |
|
Viktor Fomin
|
1e4558a646
|
Web: Common: Create rectangle loader
|
2020-11-03 15:55:14 +03:00 |
|
Viktor Fomin
|
354fbe6038
|
Web: Common: added loader style constant
|
2020-11-03 15:54:21 +03:00 |
|
Vladislav Makhov
|
1e483de4ba
|
Merge branch 'develop' into feature/third-party-settings
# Conflicts:
# web/ASC.Web.Client/src/components/pages/Settings/locales/en/translation.json
# web/ASC.Web.Client/src/components/pages/Settings/locales/ru/translation.json
# web/ASC.Web.Client/src/components/pages/Settings/utils/settingsTree.js
# web/ASC.Web.Client/src/store/settings/actions.js
# web/ASC.Web.Client/src/store/settings/reducer.js
# web/ASC.Web.Common/src/api/settings/index.js
# web/ASC.Web.Components/src/components/icons/svg/index.js
|
2020-11-03 15:29:09 +03:00 |
|
Artem Tarasov
|
8507650485
|
Web: Common: PageLayout: fixed selection items
|
2020-11-03 12:23:46 +03:00 |
|
TatianaLopaeva
|
e876d2939a
|
Merge branch 'develop' into feature/fix-hide/show-header
# Conflicts:
# web/ASC.Web.Common/src/components/Main/index.js
# web/ASC.Web.Common/src/components/PageLayout/index.js
# web/ASC.Web.Common/src/components/PageLayout/sub-components/article.js
|
2020-11-02 16:41:52 +03:00 |
|
Artem Tarasov
|
5f6e0e60e8
|
Merge branch 'develop' into hotfix/documents-bugfix
# Conflicts:
# web/ASC.Web.Common/src/components/PageLayout/index.js
# web/ASC.Web.Components/package.json
|
2020-11-02 13:36:03 +03:00 |
|
TatianaLopaeva
|
5c89eabc81
|
Web: Common/Components: Added Hide Header on Scroll Down & Show on Scroll Up
|
2020-11-02 11:55:59 +03:00 |
|
|
440395d341
|
Web: Common: fixed update main height timeout
|
2020-10-30 17:22:49 +03:00 |
|
Ilya Oleshko
|
797afe5c72
|
Web: Common: changed ReactResizeDetector refreshRate
|
2020-10-30 14:24:24 +03:00 |
|
|
ea21d49ddc
|
Web: Common: fixed main container height
|
2020-10-30 12:08:34 +03:00 |
|
|
13c690e183
|
Web: Common: fixed main container height
|
2020-10-29 18:18:00 +03:00 |
|
|
bc725f29df
|
Web: Common: added re-resizable package, added new acticle
|
2020-10-29 17:33:05 +03:00 |
|
TatianaLopaeva
|
aca906db56
|
Web:Common: Refactoring
|
2020-10-29 13:23:21 +03:00 |
|
Alexey Kostenko
|
55830ab25c
|
Web: Common/Files: PeopleSelector: Added counter to footer button
|
2020-10-29 10:55:06 +03:00 |
|
Alexey Kostenko
|
19f1984e73
|
Web: Common/Files: GroupSelector: Added counter to footer button
|
2020-10-29 10:54:10 +03:00 |
|
Alexey Kostenko
|
638eacd052
|
Web: Common: AdvancesSelector: Added showCounter prop to AdvancesSelector
|
2020-10-29 10:44:17 +03:00 |
|
TatianaLopaeva
|
d7a8226671
|
Merge branch 'develop' into feature/fix-hide/show-header
# Conflicts:
# web/ASC.Web.Common/src/components/Main/index.js
|
2020-10-28 19:02:51 +03:00 |
|
TatianaLopaeva
|
2c991fcfd7
|
Web:Common Deleted unnecessary import
|
2020-10-28 16:36:16 +03:00 |
|
TatianaLopaeva
|
c553d8990b
|
Web: Common: Added context for passing ref to section-body
|
2020-10-28 16:34:56 +03:00 |
|
Artem Tarasov
|
e9144b7f67
|
Merge branch 'develop' into hotfix/documents-bugfix
# Conflicts:
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/index.js
# web/ASC.Web.Common/package.json
# web/ASC.Web.Components/package.json
|
2020-10-28 14:07:50 +03:00 |
|
|
c53446f5bc
|
Web: Common: fixed main container height
|
2020-10-28 13:35:06 +03:00 |
|
Artem Tarasov
|
e4599f8279
|
Web: Files: VersionHistory: added props borderBottom for header(tablet)
|
2020-10-27 15:15:57 +03:00 |
|
Vladislav Makhov
|
3b6883595a
|
Move selector to auth
|
2020-10-27 14:47:07 +03:00 |
|
|
b548870886
|
Web: Files: Removed useless calls of API by Privacy folder + Added isEncryptionSupport selector
|
2020-10-27 13:15:06 +03:00 |
|
TatianaLopaeva
|
ee82a0d064
|
Web: Common: Added styles and function scrolledTheVerticalAxis
|
2020-10-27 11:16:59 +03:00 |
|
TatianaLopaeva
|
9c95aa4362
|
Web: Common: Refactoring
|
2020-10-27 11:13:42 +03:00 |
|
TatianaLopaeva
|
1c09c48152
|
Merge branch 'develop' into feature/fix-hide/show-header
|
2020-10-27 10:52:12 +03:00 |
|
Artem Tarasov
|
5c07f4a631
|
Web: Common: PageLayout: fixed padding between filter and row
|
2020-10-26 14:24:09 +03:00 |
|
Artem Tarasov
|
faf0adf664
|
Web: Common: PageLayout: fixed layout section-header
|
2020-10-26 13:53:42 +03:00 |
|
Artem Tarasov
|
61443b6e0a
|
Web: Common: PageLayout: fixed position SectionToggler
|
2020-10-26 13:02:52 +03:00 |
|
Artem Tarasov
|
5f59dc385b
|
Web: Common: PageLayout: fix article layout
|
2020-10-26 12:32:51 +03:00 |
|
Artem Tarasov
|
ebc9ae958b
|
Web: Common: PageLayout: fixed article-pin-panel size
|
2020-10-26 11:59:46 +03:00 |
|
TatianaLopaeva
|
ae5520a56b
|
Web: Common: Fixed display menu and header
|
2020-10-26 11:55:34 +03:00 |
|
TatianaLopaeva
|
d5bc77b554
|
Web: Common: Increasing header length
|
2020-10-26 10:41:36 +03:00 |
|
TatianaLopaeva
|
6f45c53522
|
Web:Common: Made the header of NavMenu and header of section fixed on top for tablet and mobile
|
2020-10-26 10:31:04 +03:00 |
|
Artem Tarasov
|
b787b58b6c
|
Merge branch 'develop' into hotfix/documents-bugfix
# Conflicts:
# products/ASC.Files/Client/src/components/Article/Body/TreeFolders.js
# web/ASC.Web.Common/package.json
# web/ASC.Web.Components/package.json
|
2020-10-26 09:32:29 +03:00 |
|
Vladislav Makhov
|
7b458a72c9
|
Merge branch 'develop' into feature/private-room
# Conflicts:
# products/ASC.Files/Client/src/components/Article/Body/TreeFolders.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/index.js
|
2020-10-23 15:49:10 +03:00 |
|
TatianaLopaeva
|
ccc8a60f87
|
Web: Common: Disabled body scrolling for mobile (for full scroll page)
|
2020-10-23 12:35:38 +03:00 |
|
TatianaLopaeva
|
b74a6a11a0
|
Web: Common: Changed Layout with full page scroll for mobile
|
2020-10-23 12:31:58 +03:00 |
|
|
dc667af6ad
|
Web: Common: Fixed login error handling
|
2020-10-23 11:51:53 +03:00 |
|
TatianaLopaeva
|
ce6f879f67
|
Web: People/Common added Layout
|
2020-10-22 20:09:44 +03:00 |
|
|
9df3a1cf64
|
Web: Files: Fixed display folder icon
|
2020-10-22 19:32:45 +03:00 |
|
|
2f86aef863
|
Web: Common: Applied display order on getRootForlders
|
2020-10-22 19:19:44 +03:00 |
|
|
6f8ed00dff
|
Web: Common: Replaced getFoldersTree with single @root request
|
2020-10-22 18:51:31 +03:00 |
|
TatianaLopaeva
|
e307e0c1c0
|
Web: Common: Added min-height for mobile
|
2020-10-22 16:10:31 +03:00 |
|
Alexey Kostenko
|
bb00498c44
|
Web: Common/Components/Files: Fixed filter and file create field styles
|
2020-10-22 14:10:58 +03:00 |
|
TatianaLopaeva
|
cf62d42532
|
Web:Added styled
|
2020-10-22 13:15:02 +03:00 |
|
TatianaLopaeva
|
9bb4abfd5f
|
Web: Common: Changed styles of article for tablet and mobile
|
2020-10-22 10:55:30 +03:00 |
|
TatianaLopaeva
|
8a62445203
|
Web: People/Common Added full page scroll
|
2020-10-22 10:52:42 +03:00 |
|
Vladislav Makhov
|
06ecce0ca5
|
Add "isEncryptionSupport" mock.
|
2020-10-21 17:08:36 +03:00 |
|
Alexey Kostenko
|
5f4921d341
|
Web: Files/Components/Common: Fixed row styles
|
2020-10-21 16:54:22 +03:00 |
|
Alexey Kostenko
|
d8fa9b1b60
|
Web: Common/Components: Style fix in filter and rowContainer
|
2020-10-21 15:05:08 +03:00 |
|
Vladislav Makhov
|
967a01061a
|
Merge branch 'develop' into feature/files-recent
# Conflicts:
# products/ASC.Files/Client/src/components/Article/Body/TreeFolders.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/index.js
# products/ASC.Files/Client/src/components/pages/Home/locales/en/translation.json
# products/ASC.Files/Client/src/components/pages/Home/locales/ru/translation.json
# products/ASC.Files/Client/src/store/files/selectors.js
# web/ASC.Web.Common/src/api/files/index.js
# web/ASC.Web.Components/src/components/icons/svg/index.js
|
2020-10-20 09:23:58 +03:00 |
|
Vladislav Makhov
|
e0dacb3a60
|
Merge branch 'develop' into feature/files-recent
# 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
# web/ASC.Web.Common/src/api/files/index.js
|
2020-10-19 18:20:36 +03:00 |
|
Vladislav Makhov
|
2757a785a0
|
Merge branch 'develop' into feature/files-favorites
# Conflicts:
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesRowContent.js
# web/ASC.Web.Common/src/api/files/index.js
|
2020-10-19 17:54:41 +03:00 |
|
|
f2fcf077a2
|
Web: Common: Fixed start PageLayout story and README
|
2020-10-16 15:56:35 +03:00 |
|
|
0181514267
|
Web: Common: Fixed self link
|
2020-10-16 15:55:47 +03:00 |
|
|
1a484f1805
|
Web: Common: Applied prettier style fix
|
2020-10-16 15:38:04 +03:00 |
|
|
7251a1e4d8
|
Web: Common: Fixed error handling
|
2020-10-16 15:24:37 +03:00 |
|
Vladislav Makhov
|
3491938aa4
|
Merge branch 'feature/files' into feature/files-favorites
# Conflicts:
# products/ASC.Files/Client/src/components/Article/Body/TreeFolders.js
# 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/Section/Header/index.js
# products/ASC.Files/Client/src/components/pages/Home/index.js
# products/ASC.Files/Client/src/components/panels/OperationsPanel/index.js
# products/ASC.Files/Client/src/store/files/selectors.js
# web/ASC.Web.Common/src/api/files/index.js
|
2020-10-16 14:33:20 +03:00 |
|
Vladislav Makhov
|
ccab1949d5
|
Merge branch 'feature/files' into feature/files-recent
# Conflicts:
# products/ASC.Files/Client/src/components/Article/Body/TreeFolders.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/index.js
# products/ASC.Files/Client/src/store/files/selectors.js
|
2020-10-16 11:28:31 +03:00 |
|
Ilya Oleshko
|
3e66f95546
|
Merge branch 'feature/files' into feature/selectors-refactoring
|
2020-10-15 13:39:31 +03:00 |
|
TatianaLopaeva
|
d4d7c9db0d
|
Web: Common: fixed changing language of title toastr
|
2020-10-15 10:55:47 +03:00 |
|
Vladislav Makhov
|
02faf2a407
|
Refactoring
|
2020-10-14 19:01:53 +03:00 |
|
|
53c77d1a81
|
Web: Common: Removed useless folder param from API Files->getFolder with filter
|
2020-10-14 17:46:40 +03:00 |
|
Vladislav Makhov
|
4531619362
|
Merge branch 'feature/files' into feature/files-favorites
|
2020-10-14 13:45:13 +03:00 |
|
|
bac77e0ebd
|
Merge branch 'feature/files' into feature/selectors-refactoring
# Conflicts:
# products/ASC.Files/Client/src/components/Article/MainButton/index.js
|
2020-10-13 18:17:31 +03:00 |
|
|
746ecc7f40
|
Web: Clients: Fixed applying single cursor on loading
|
2020-10-13 16:20:49 +03:00 |
|
|
5d76e7e6b0
|
Web: Redesigned displaying of loading processes
|
2020-10-13 15:51:14 +03:00 |
|
|
bcbefb8f26
|
Merge branch 'feature/files' into feature/selectors-refactoring
# Conflicts:
# products/ASC.Files/Client/src/components/Article/Body/TreeSettings.js
# products/ASC.Files/Client/src/components/pages/Settings/Section/Body/index.js
# products/ASC.Files/Client/src/components/pages/Settings/index.js
# products/ASC.Files/Client/src/store/files/actions.js
# products/ASC.Files/Client/src/store/files/reducers.js
# products/ASC.Files/Client/src/store/files/selectors.js
|
2020-10-13 15:08:22 +03:00 |
|
Vladislav Makhov
|
632f83927b
|
Merge branch 'feature/files' into feature/files-favorites
|
2020-10-13 14:26:31 +03:00 |
|
Artem Tarasov
|
a4a959f972
|
Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
|
2020-10-13 13:43:16 +03:00 |
|
|
3d34978bf0
|
Merge branch 'feature/files' into feature/selectors-refactoring
|
2020-10-13 13:39:10 +03:00 |
|
|
1d4b3785bb
|
Merge branch 'feature/files' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/files
|
2020-10-13 13:31:24 +03:00 |
|
|
0712677297
|
Web: Common: fixed MediaViewer close, fixed share dropdown styles
|
2020-10-13 13:30:26 +03:00 |
|
TatianaLopaeva
|
ac697d28fc
|
Web: Added getLanguage selector
|
2020-10-13 12:17:45 +03:00 |
|
TatianaLopaeva
|
6a0e34a7a2
|
Web: Common: Added language into array of useEffect
|
2020-10-13 10:52:44 +03:00 |
|
|
577fc5ac70
|
Merge branch 'feature/files' into feature/selectors-refactoring
# Conflicts:
# products/ASC.Files/Client/src/components/pages/DocEditor/index.js
|
2020-10-12 15:36:26 +03:00 |
|
Vladislav Makhov
|
22da8b836d
|
fix after merge
|
2020-10-12 15:31:21 +03:00 |
|
Artem Tarasov
|
8453611714
|
Web: Common: added SettingsFiles loader
|
2020-10-12 14:52:49 +03:00 |
|
Vladislav Makhov
|
a179ae0e6c
|
Merge branch 'feature/files' into feature/files-favorites
# Conflicts:
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/index.js
# web/ASC.Web.Common/src/api/files/index.js
|
2020-10-12 14:45:53 +03:00 |
|
Vladislav Makhov
|
7aaeddedb2
|
Add pushing to recently viewed
|
2020-10-12 14:37:52 +03:00 |
|
Vladislav Makhov
|
9ea5a648e9
|
Fix code after merge
|
2020-10-12 11:02:22 +03:00 |
|
Vladislav Makhov
|
2476b306f9
|
Merge branch 'feature/files' into feature/files-recent
# Conflicts:
# web/ASC.Web.Common/src/api/files/index.js
# web/ASC.Web.Components/package.json
|
2020-10-12 10:04:24 +03:00 |
|
|
f4ed52d985
|
Web: Added and applied new API method getDocServiceUrl
|
2020-10-09 19:06:50 +03:00 |
|
|
a01fb879a4
|
Web: Common: remove duplicate getIsLoaded selector
|
2020-10-09 18:28:02 +03:00 |
|
|
615f514bfd
|
Merge branch 'feature/files' into feature/selectors-refactoring
# Conflicts:
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/index.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Filter/index.js
# web/ASC.Web.Common/src/store/auth/selectors.js
|
2020-10-09 17:24:50 +03:00 |
|
Artem Tarasov
|
421d71c4fe
|
Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
# Conflicts:
# web/ASC.Web.Common/src/components/Loaders/index.js
|
2020-10-09 15:58:50 +03:00 |
|
Artem Tarasov
|
5a5fb5b036
|
Web: Common: added ProfileViewLoader
|
2020-10-09 15:57:04 +03:00 |
|
|
065c8daaa0
|
Web: People: Applied Filter loader
|
2020-10-09 14:57:43 +03:00 |
|
|
226d4c6cc5
|
Web: Files: Add and applied Filter loader
|
2020-10-09 14:23:40 +03:00 |
|
|
a969f26f05
|
Web: Common: fixed getFoldersTree api
|
2020-10-09 00:23:36 +03:00 |
|
|
cedca7b3c3
|
Web: Common: added rootFolderType to getFoldersTree api
|
2020-10-08 23:56:57 +03:00 |
|
|
4e84d5f5ae
|
Merge branch 'feature/files' into feature/selectors-refactoring
# Conflicts:
# web/ASC.Web.Common/package.json
|
2020-10-08 16:58:09 +03:00 |
|
Vladislav Makhov
|
b4d3dc0114
|
Fix code after merge
|
2020-10-08 16:23:57 +03:00 |
|
|
34575dab83
|
Merge branch 'feature/files' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/files
|
2020-10-08 12:43:07 +03:00 |
|
|
e3fde6fd77
|
Web: Common: fixed main height
|
2020-10-08 12:42:59 +03:00 |
|
Vladislav Makhov
|
c59be4f0dd
|
Fix code after merge
|
2020-10-08 11:08:58 +03:00 |
|
Artem Tarasov
|
e1fd3f211a
|
Web: Client: confirm: added paswordHash to createUser, activateUser, changePassword
|
2020-10-08 10:28:36 +03:00 |
|
|
6cf7358b92
|
Merge branch 'feature/files' into feature/selectors-refactoring
# Conflicts:
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/index.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Filter/index.js
# web/ASC.Web.Common/src/api/files/index.js
|
2020-10-08 10:25:37 +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 |
|
|
cbcf6bef85
|
Web: Files: removed auth selectors from files
|
2020-10-07 17:23:02 +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 |
|
|
ca37d2134d
|
Web: Files: Applied API changes on server in files filtering
|
2020-10-07 16:41:05 +03:00 |
|
Vladislav Makhov
|
e7fc2fef13
|
Add Recent to the tree node.
|
2020-10-07 14:26:08 +03:00 |
|
|
63f6e26eea
|
Web: Common: added new selectors, added rootFolderName field to getFoldersTree api
|
2020-10-07 14:06:28 +03:00 |
|
|
cbde3120aa
|
Web: Common: Removed Layout and StudioLayout components
|
2020-10-07 12:48:38 +03:00 |
|
|
7fb3ce6c09
|
Web: People: Added groups for API people loading
|
2020-10-06 19:07:10 +03:00 |
|
|
f9bf1dc7d7
|
Web: Common: Removed useless code
|
2020-10-06 18:18:36 +03:00 |
|
Vladislav Makhov
|
e265dbf7c5
|
fix index by agreement
|
2020-10-06 15:03:29 +03:00 |
|
|
3ad873f1c8
|
Web: People: Restored fields in filtering data
|
2020-10-06 12:46:10 +03:00 |
|
|
fcc1ca32dd
|
Web: Fixed showing Error404 before user not loaded
|
2020-10-06 11:53:56 +03:00 |
|
Vladislav Makhov
|
1992be53b8
|
Merge branch 'feature/files' into feature/files-favorites
# Conflicts:
# products/ASC.Files/Client/yarn.lock
|
2020-10-06 11:40:12 +03:00 |
|
|
af756a1e76
|
Web: Fixed opening @self profile view
|
2020-10-06 11:33:53 +03:00 |
|
|
8f086d1183
|
Web: Fixed NavMenu crash on currentProduct equals null
|
2020-10-06 10:10:42 +03:00 |
|
|
8d7cf4f2dc
|
Web: Replaced getCurrentModule with getCurrentProduct selector
|
2020-10-05 20:56:36 +03:00 |
|
|
a6bc650da6
|
Web: Common: NavMenu refactoring
|
2020-10-05 18:25:01 +03:00 |
|
|
63ee865d98
|
Merge branch 'feature/files' into feature/loading-acceleration
# Conflicts:
# products/ASC.People/Client/src/components/pages/Profile/Section/Body/ProfileInfo/ProfileInfo.js
# products/ASC.People/Client/src/components/pages/Profile/Section/Body/index.js
# web/ASC.Web.Common/package.json
# web/ASC.Web.Common/src/pages/login/index.js
# web/ASC.Web.Common/src/utils/index.js
|
2020-10-05 15:37:09 +03:00 |
|
|
d00d16ee02
|
Merge branch 'master' into feature/files
# Conflicts:
# products/ASC.Files/Client/yarn.lock
# products/ASC.People/Client/yarn.lock
# web/ASC.Web.Client/src/components/pages/Wizard/index.js
# web/ASC.Web.Client/yarn.lock
# web/ASC.Web.Common/package.json
# web/ASC.Web.Common/src/api/settings/index.js
# web/ASC.Web.Common/src/pages/login/index.js
# web/ASC.Web.Common/src/store/auth/reducer.js
# web/ASC.Web.Common/src/utils/index.js
# web/ASC.Web.Common/yarn.lock
|
2020-10-05 13:32:26 +03:00 |
|
Vladislav Makhov
|
e697ae9cff
|
Minor fixes
|
2020-10-02 10:41:24 +03:00 |
|
|
7bbba5f158
|
Web: People: Re-written Home/Body with selectors and reselect + refactoring
|
2020-10-01 22:01:52 +03:00 |
|
Artem Tarasov
|
b4c144df74
|
Web: Common: refactoring createPasswordHash
|
2020-10-01 19:04:10 +03:00 |
|
|
c008acee57
|
Merge branch 'feature/files' into feature/loading-acceleration
# Conflicts:
# products/ASC.Files/Client/yarn.lock
# products/ASC.People/Client/src/components/Article/MainButton/index.js
# products/ASC.People/Client/src/components/pages/Profile/index.js
# products/ASC.People/Client/yarn.lock
# web/ASC.Web.Client/yarn.lock
# web/ASC.Web.Common/package.json
|
2020-10-01 17:32:12 +03:00 |
|
|
3b2648b18c
|
Web: Common: fixed main wrapper height
|
2020-10-01 13:16:31 +03:00 |
|
Artem Tarasov
|
053b3c902c
|
refactoring getPortalSettings
|
2020-10-01 11:42:59 +03:00 |
|
Artem Tarasov
|
db7ac80645
|
refactoring getPortalSettings
|
2020-10-01 09:56:22 +03:00 |
|
TatianaLopaeva
|
2261880855
|
Added language into array of useEffect(StudioLayout) and refactoring changeLanguage function
|
2020-10-01 09:08:25 +03:00 |
|
|
ccd1aef9f8
|
Web: Re-written NavMenu with selectors and reselect
|
2020-10-01 01:25:08 +03:00 |
|
Artem Tarasov
|
45e70f6d11
|
fixed missing hashSettings after logout
|
2020-10-01 00:46:33 +03:00 |
|
Artem Tarasov
|
17d999f538
|
refactoring
|
2020-10-01 00:44:49 +03:00 |
|
Artem Tarasov
|
f7064f3baa
|
Web: Common: login: added hashPassword
|
2020-09-30 21:20:51 +03:00 |
|
Artem Tarasov
|
bfdfcbb4b5
|
Web: Client: Wizard: added password hash
|
2020-09-30 14:22:14 +03:00 |
|
Artem Tarasov
|
b7cda3333e
|
Web: Common: added function createHashPassword
|
2020-09-30 11:43:19 +03:00 |
|
Vladislav Makhov
|
490fb4ee3e
|
Add func's to work with api
|
2020-09-30 11:28:46 +03:00 |
|
Vladislav Makhov
|
731a8b8504
|
Add working with GET /@favorites
|
2020-09-29 16:52:54 +03:00 |
|
|
86207e27fc
|
Web: Applied prettier styled and removed debugger
|
2020-09-29 14:46:28 +03:00 |
|
|
981e7646ca
|
Web: Files: Fixed opening DocEditor
|
2020-09-29 14:21:37 +03:00 |
|
|
ad4b28d1f2
|
Merge branch 'feature/files' into feature/loading-acceleration
# Conflicts:
# products/ASC.Files/Client/public/index.html
# products/ASC.Files/Client/src/App.js
# products/ASC.Files/Client/src/components/Article/Body/TreeFolders.js
# products/ASC.Files/Client/src/components/Article/Body/index.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/index.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Header/index.js
# products/ASC.Files/Client/src/components/pages/Home/index.js
# products/ASC.People/Client/src/components/pages/Home/Section/Body/index.js
# products/ASC.People/Client/src/components/pages/Home/Section/Header/index.js
# products/ASC.People/Client/src/components/pages/Profile/Section/Body/ProfileInfo/ProfileInfo.js
# web/ASC.Web.Client/src/App.js
# web/ASC.Web.Common/src/components/index.js
|
2020-09-29 11:48:36 +03:00 |
|
|
5ad8730c46
|
Web: People: Fixed open @self profile
|
2020-09-28 16:20:16 +03:00 |
|
TatianaLopaeva
|
eaa24436db
|
Merge branch 'feature/files' into feature/payments-enterprise
|
2020-09-28 16:04:54 +03:00 |
|
Ilya Oleshko
|
be3a505035
|
Web: Common: Api : Files : Fixed request for folder tree, now request only folders
|
2020-09-28 14:47:20 +03:00 |
|
|
056fefcd40
|
Web: Common: Added ProfileMenu actions to NavMenu
|
2020-09-28 11:26:21 +03:00 |
|
TatianaLopaeva
|
48854fcb5e
|
Merge branch 'feature/files' into feature/payments-enterprise
|
2020-09-28 10:14:35 +03:00 |
|
|
a6180afa35
|
Web: Normalize routing + refactoring
|
2020-09-25 19:14:50 +03:00 |
|
Alexey Kostenko
|
d1c926e3cd
|
Web: Common: Added component Toast to common library (for translate titles)
|
2020-09-25 16:13:28 +03:00 |
|
TatianaLopaeva
|
eac4556983
|
Merge branch 'feature/files' into feature/payments-enterprise
|
2020-09-25 10:44:31 +03:00 |
|
|
72cf8e4f2b
|
Web: Moved RowsLoader to ASC.Web.Common
|
2020-09-25 10:36:13 +03:00 |
|
|
7b6d320ebe
|
Web: Common: fixed icons
|
2020-09-24 16:54:31 +03:00 |
|
|
a4357170a3
|
Web: Common: fixed image-viewer icons
|
2020-09-24 15:31:53 +03:00 |
|
|
c6b7a5ac29
|
Web: Files: added hiding aside panel on actions from the main button
|
2020-09-24 15:06:37 +03:00 |
|