|
|
11348e5fba
|
Update yarn.lock files
|
2020-10-07 12:58:38 +03:00 |
|
|
|
1475af5f28
|
web: common: bump version
|
2020-10-07 12:49:50 +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 |
|
|
|
978b67f7a7
|
Update yarn.lock files
|
2020-10-05 14:46:07 +03:00 |
|
|
|
3de5601671
|
web: common: bump version
|
2020-10-05 14:28:41 +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 |
|
|
|
e936ab4fc0
|
web: common: bump version
|
2020-10-01 13:16:53 +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
|
b33328218a
|
Update yarn.lock files
|
2020-10-01 09:37:25 +03:00 |
|
TatianaLopaeva
|
2261880855
|
Added language into array of useEffect(StudioLayout) and refactoring changeLanguage function
|
2020-10-01 09:08:25 +03:00 |
|
TatianaLopaeva
|
2c1adaadde
|
web: common: bump version
|
2020-10-01 09:04:56 +03:00 |
|
TatianaLopaeva
|
015b985755
|
web: common: bump version
|
2020-10-01 09:01:15 +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
|
235193fb6b
|
web: common: bump version
|
2020-09-30 11:45:47 +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 |
|
Artem Tarasov
|
c68b6d6b7f
|
update yarn.lock
|
2020-09-30 10:53:51 +03:00 |
|
Artem Tarasov
|
5b5018a214
|
web: common: bump version
|
2020-09-30 10:44:06 +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
|
dea73cfbad
|
web: common: bump version
|
2020-09-28 14:48:45 +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 |
|
Alexey Kostenko
|
10fd501560
|
web: common: bump version
|
2020-09-28 09:13:49 +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 |
|
|
|
0e6f803f0b
|
web: common: bump version
|
2020-09-24 16:54:50 +03:00 |
|
|
|
7b6d320ebe
|
Web: Common: fixed icons
|
2020-09-24 16:54:31 +03:00 |
|
|
|
0a52fb4449
|
web: common: bump version
|
2020-09-24 15:32:11 +03:00 |
|
|
|
a4357170a3
|
Web: Common: fixed image-viewer icons
|
2020-09-24 15:31:53 +03:00 |
|
|
|
12099717ed
|
web: common: bump version
|
2020-09-24 15:07:26 +03:00 |
|
|
|
c6b7a5ac29
|
Web: Files: added hiding aside panel on actions from the main button
|
2020-09-24 15:06:37 +03:00 |
|
|
|
b04f22b6e5
|
Web: Moved TreeFolderLoader to ASC.Web.Common
|
2020-09-24 13:58:18 +03:00 |
|
|
|
f2b0cdf1af
|
Web: Moved HeadlineLoader to ASC.Web.Common
|
2020-09-24 13:37:54 +03:00 |
|
|
|
885eb4a691
|
Web: Clients: Added #temp-content markup on load and opportunity to hide it + router refactoring
|
2020-09-23 18:42:47 +03:00 |
|
TatianaLopaeva
|
32b76b88f6
|
Hiding the payments module
|
2020-09-23 17:59:01 +03:00 |
|
TatianaLopaeva
|
1849e3712d
|
Merge branch 'feature/files' into feature/payments-enterprise
|
2020-09-23 15:25:23 +03:00 |
|
|
|
a2be460357
|
Merge branch 'feature/files' into feature/loading-acceleration
# Conflicts:
# products/ASC.Files/Client/src/components/Article/Body/index.js
# products/ASC.Files/Client/src/store/files/actions.js
|
2020-09-22 19:11:45 +03:00 |
|
Alexey Kostenko
|
634534afbb
|
Web: Common: Bump version
|
2020-09-22 15:49:42 +03:00 |
|
Alexey Kostenko
|
16ed13b745
|
Web: Common: Fix mobile ArticleBody styles
|
2020-09-22 15:49:09 +03:00 |
|
Artem Tarasov
|
33903723fd
|
web: common: bump version
|
2020-09-22 15:44:05 +03:00 |
|
Artem Tarasov
|
8748a0fc52
|
Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
|
2020-09-22 15:43:15 +03:00 |
|
|
|
5e8ae65235
|
web: common: bump version
|
2020-09-22 15:33:31 +03:00 |
|
|
|
6101dc32db
|
Web: Common: fixed main styles
|
2020-09-22 15:33:12 +03:00 |
|
Artem Tarasov
|
9632515ea1
|
Web: Common: fixed color of label in sort-combobox
|
2020-09-22 15:10:55 +03:00 |
|
|
|
fe0d4a16b5
|
web: common: bump version
|
2020-09-22 14:15:22 +03:00 |
|
|
|
c65fa43050
|
Web: Common: fixed main style
|
2020-09-22 14:14:30 +03:00 |
|
|
|
2c3a8dfc44
|
web: common: bump version
|
2020-09-22 10:16:38 +03:00 |
|
|
|
6936c060e5
|
Web: Common: fixed MediaViewer styles
|
2020-09-22 10:15:37 +03:00 |
|
|
|
1b2776aecc
|
Web: Common: Added defaultPage
|
2020-09-21 19:31:24 +03:00 |
|
|
|
04b223d681
|
Web: Common: Show content after userLoaded
|
2020-09-21 19:27:39 +03:00 |
|
|
|
86bcde60b1
|
Web: Common: Extracted Main and NavMenu as separated components from Layout
|
2020-09-21 18:27:22 +03:00 |
|
Artem Tarasov
|
ff84c7cbf1
|
web: common: bump version
|
2020-09-21 14:54:54 +03:00 |
|
TatianaLopaeva
|
ca420104fc
|
Merge branch 'feature/files' into feature/payments-enterprise
# Conflicts:
# web/ASC.Web.Client/src/App.js
# web/ASC.Web.Common/src/components/StudioLayout/StudioLayout.js
|
2020-09-21 14:54:05 +03:00 |
|
Artem Tarasov
|
b02a06af5e
|
Web: Common: deleted changeDocumentTitle()
|
2020-09-21 14:48:07 +03:00 |
|
Artem Tarasov
|
916eb0439c
|
web: common: bump version
|
2020-09-19 23:28:37 +03:00 |
|
Artem Tarasov
|
405eabd720
|
Web: Components: fixed passing props selectedOprions in PeopleSelector
|
2020-09-19 23:24:18 +03:00 |
|
|
|
7b4441676e
|
Update yarn.lock files
|
2020-09-19 18:35:17 +03:00 |
|
|
|
548b6c428d
|
web: common: bump version
|
2020-09-19 18:27:08 +03:00 |
|
|
|
0f00799480
|
Web: Client: Fixed redirect to defaultPage
|
2020-09-19 18:24:48 +03:00 |
|
TatianaLopaeva
|
0945cf05f3
|
Refactoring
|
2020-09-18 17:33:33 +03:00 |
|
|
|
eb3336ad6a
|
web: common: bump version
|
2020-09-18 17:07:17 +03:00 |
|
|
|
dbad9de295
|
Web: Common: fixed progress styles
|
2020-09-18 17:06:58 +03:00 |
|
|
|
5b070d3509
|
web: common: bump version
|
2020-09-18 15:57:36 +03:00 |
|
|
|
809d167e29
|
Merge branch 'feature/files' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/files
|
2020-09-18 15:54:55 +03:00 |
|
|
|
17ffb8999d
|
Web: Common: fixed progress styles
|
2020-09-18 15:45:21 +03:00 |
|
TatianaLopaeva
|
fa89566f8f
|
Added headline
|
2020-09-18 12:24:14 +03:00 |
|
Artem Tarasov
|
a04ca81999
|
web: common: bump version
|
2020-09-18 11:19:53 +03:00 |
|
Artem Tarasov
|
e369f6a9e0
|
Web: Common: refactoring - changing document.title with changeTitleDocument()
|
2020-09-18 11:17:40 +03:00 |
|
Artem Tarasov
|
3492be5ca4
|
Web: Common: added function changeTitleDocument to utils
|
2020-09-18 11:12:09 +03:00 |
|
TatianaLopaeva
|
fbb0787eff
|
Added AcceptLicense
|
2020-09-17 17:07:32 +03:00 |
|
Alexey Kostenko
|
24a92d7e67
|
Web: Common/Components: Bump version
|
2020-09-17 16:50:37 +03:00 |
|
Alexey Kostenko
|
3b1805f1f9
|
Web: Common: Unpin sidebar if not enough screen width
|
2020-09-17 15:52:07 +03:00 |
|
Alexey Kostenko
|
dfd94a854f
|
Web: Components/Common: Added new width constant for pin/unpin, style fix
|
2020-09-17 13:22:47 +03:00 |
|
TatianaLopaeva
|
a858a3a846
|
Merge branch 'feature/files' into feature/payments-enterprise
# Conflicts:
# web/ASC.Web.Components/src/components/icons/svg/index.js
|
2020-09-17 11:25:51 +03:00 |
|
Vladislav Makhov
|
eb89987872
|
Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
|
2020-09-17 09:24:45 +03:00 |
|
Vladislav Makhov
|
26b1a18673
|
Web: Common: fix redirect after success authentication
|
2020-09-17 09:24:28 +03:00 |
|
Alexey Kostenko
|
7474fcf681
|
Web: common: bump version
|
2020-09-17 09:18:54 +03:00 |
|
Alexey Kostenko
|
d60bdedf9b
|
Web: Common: Fix pin/unpin on IOS devices
|
2020-09-17 09:17:47 +03:00 |
|
|
|
a4cb368513
|
Update yarn.lock files
|
2020-09-16 18:39:06 +03:00 |
|
Vladislav Makhov
|
931a1d9365
|
Web: Common: Removed useless commas
|
2020-09-16 09:58:05 +03:00 |
|
|
|
e5525f4e08
|
Web: Components: Removed useless comma
|
2020-09-16 09:50:31 +03:00 |
|
|
|
3b691247b2
|
Update yarn.lock files
|
2020-09-15 23:29:13 +03:00 |
|
|
|
986e53608d
|
Update yarn.lock files
|
2020-09-15 22:55:11 +03:00 |
|
|
|
d750335924
|
Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
# Conflicts:
# web/ASC.Web.Components/package.json
|
2020-09-15 22:43:37 +03:00 |
|
|
|
2bad04c058
|
Update yarn.lock files
|
2020-09-15 22:42:42 +03:00 |
|
TatianaLopaeva
|
3eeb24a5b5
|
Merge branch 'feature/files' into feature/payments-enterprise
# Conflicts:
# web/ASC.Web.Common/src/components/StudioLayout/StudioLayout.js
# web/ASC.Web.Components/src/components/icons/svg/index.js
|
2020-09-15 17:52:45 +03:00 |
|
Vladislav Makhov
|
8da994f92c
|
Web: Common: fix login error handling
|
2020-09-15 17:35:57 +03:00 |
|
|
|
68d43001c3
|
web: common: bump version
|
2020-09-15 15:48:55 +03:00 |
|
|
|
3c0d0c0523
|
Web: Common: fixed filter styles
|
2020-09-15 15:10:12 +03:00 |
|
|
|
01a8aa22b4
|
web: common: bump version
|
2020-09-15 14:47:53 +03:00 |
|
|
|
584bee8198
|
Merge branch 'feature/files' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/files
|
2020-09-15 14:47:03 +03:00 |
|
|
|
01d6e7d3ad
|
Web: Commpon: fixed the display of the filter selector element
|
2020-09-15 14:46:53 +03:00 |
|
Vladislav Makhov
|
7cc130bdc9
|
Web: Common: sorting dropdown is now hiding, when option clicked
|
2020-09-14 14:02:11 +03:00 |
|
|
|
65fbf2247e
|
Update yarn.lock files
|
2020-09-11 22:51:28 +03:00 |
|
|
|
8045eecf1b
|
Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
# Conflicts:
# products/ASC.Files/Client/src/components/Article/Body/TreeFolders.js
# products/ASC.Files/Client/src/components/Article/Body/index.js
|
2020-09-11 22:30:09 +03:00 |
|
|
|
99a6fd523e
|
Web: Client: Moved organizationName into authReducer
|
2020-09-11 18:03:40 +03:00 |
|
Vladislav Makhov
|
0496705714
|
Login Page: fix styles
|
2020-09-10 14:49:57 +03:00 |
|
|
|
323823981a
|
Update yarn.lock files
|
2020-09-09 22:25:31 +03:00 |
|
|
|
718a6e2ebb
|
web: common: bump version
|
2020-09-09 22:03:33 +03:00 |
|
|
|
e8f1d01aae
|
Web: Common: PeopleSelector: hidden user tooltip (issue: too slow work)
|
2020-09-09 22:03:12 +03:00 |
|
|
|
aa2632a3a0
|
web: common: bump version
|
2020-09-09 21:50:17 +03:00 |
|
|
|
99db325520
|
Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
|
2020-09-09 21:49:34 +03:00 |
|
|
|
b3b6fd0938
|
Web: Components: Re-written ModalDialog component with SLOT pattern
|
2020-09-09 21:49:25 +03:00 |
|
Artem Tarasov
|
d7237f43ba
|
web: common: bump version
|
2020-09-09 18:06:58 +03:00 |
|
Artem Tarasov
|
25834a705c
|
fixed warning selectedOption of type string
|
2020-09-09 18:06:09 +03:00 |
|
Alexey
|
ddd3a70b67
|
web: common: bump version
|
2020-09-09 14:46:24 +03:00 |
|
Alexey
|
7ba59aae1e
|
Web: Common: Temporarily hiding the settings module from left menu
|
2020-09-09 14:45:53 +03:00 |
|
TatianaLopaeva
|
46e9124f81
|
Added api methods for payments
|
2020-09-08 15:39:45 +03:00 |
|
|
|
72ebd235ec
|
Merge branch 'feature/files' into feature/payments-enterprise
|
2020-09-07 18:42:57 +03:00 |
|
|
|
9778b258d7
|
Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
|
2020-09-07 18:41:51 +03:00 |
|
|
|
3729d92a5a
|
web: common: bump version
|
2020-09-07 18:35:03 +03:00 |
|
|
|
1dff214c06
|
Web: Common: Remove error routing on 500 error
|
2020-09-07 18:34:47 +03:00 |
|
Artem Tarasov
|
797dd6c249
|
Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
|
2020-09-07 18:27:39 +03:00 |
|
Artem Tarasov
|
6d68dfd0c6
|
added redirect from / to homepage(settings in state.auth.settings.homepage)
|
2020-09-07 18:26:44 +03:00 |
|
|
|
9899880bff
|
web: common: bump version
|
2020-09-07 17:32:02 +03:00 |
|
|
|
d9783ecf26
|
Web: Common: fixed sort-combobox styles, added isMobile prop
|
2020-09-07 17:31:36 +03:00 |
|
|
|
52104fafd6
|
Merge branch 'feature/files' into feature/payments-enterprise
# Conflicts:
# web/ASC.Web.Common/src/api/client.js
|
2020-09-04 21:36:25 +03:00 |
|
|
|
a2f050590b
|
Update yarn.lock files
|
2020-09-04 21:04:05 +03:00 |
|
|
|
cf53c32ff4
|
web: common: bump version
|
2020-09-04 20:54:50 +03:00 |
|
|
|
de41a366f6
|
Web: Client: Fixed layout in Wizard and removed useless constant
|
2020-09-04 20:34:00 +03:00 |
|
|
|
8907f8b315
|
Web: Common: API client: Added support of 402 and +500 statuses
|
2020-09-04 20:32:34 +03:00 |
|
