Commit Graph

795 Commits

Author SHA1 Message Date
Vladislav Makhov
eab8d8e8e2 update yarn.lock 2020-10-27 14:28:56 +03:00
Vladislav Makhov
64a72b522f Update yarn.lock 2020-10-27 10:49:55 +03:00
cb849577fb Update yarn.lock files 2020-10-23 13:45:17 +03:00
b585313aa5 Update yarn.lock files 2020-10-23 12:21:57 +03:00
TatianaLopaeva
2dd956c700 Update yarn.lock files 2020-10-19 13:41:22 +03:00
TatianaLopaeva
41d0c3e9d9 Merge branch 'develop' into feature/people-filter-empty-screen 2020-10-19 12:11:34 +03:00
ed50f3bc98 Update yarn.lock files 2020-10-16 16:38:11 +03:00
00c5f40cf8 Web: Client: Applied prettier style fix 2020-10-16 16:20:12 +03:00
11c2efde81 Web: Client: Removed old loader and toast 2020-10-15 19:28:31 +03:00
ff1c1765b5 Web: Clients: Turned off Suspense fallback 2020-10-15 18:07:23 +03:00
TatianaLopaeva
14bb36900c Update yarn.lock files 2020-10-15 11:22:58 +03:00
ea97ca05c2 Update yarn.lock files 2020-10-14 17:57:29 +03:00
49f5a52433 Update yarn.lock files 2020-10-13 16:52:17 +03:00
2fa205cb6f Web: Clients: Fixed catching of initial API errors 2020-10-13 16:31:21 +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
TatianaLopaeva
4ef2db2ed0 Web: Update yarn.lock 2020-10-13 12:37:34 +03:00
TatianaLopaeva
ac697d28fc Web: Added getLanguage selector 2020-10-13 12:17:45 +03:00
TatianaLopaeva
f0299db016 Update yarn.lock 2020-10-13 11:14:09 +03:00
TatianaLopaeva
1010886262 Web: Refactoring 2020-10-12 16:56:34 +03:00
Artem Tarasov
679413c7b1 Web: Client: wizard: fixed layout 2020-10-12 12:01:27 +03:00
ee6307e288 Web: People: Added hack for build machine only 2020-10-09 19:14:48 +03:00
1dfd7afe1c Update yarn.lock files 2020-10-09 15:07:41 +03:00
TatianaLopaeva
0b56cae632 Web: Added className and color for icon, margin-right moved to styles 2020-10-08 16:35:43 +03:00
TatianaLopaeva
3fb980fefc Web: Added font-weight and color by layout 2020-10-08 14:51:40 +03:00
TatianaLopaeva
a992234355 Web: Changed margin-right by layout 2020-10-08 12:05:48 +03:00
Artem Tarasov
e1fd3f211a Web: Client: confirm: added paswordHash to createUser, activateUser, changePassword 2020-10-08 10:28:36 +03:00
Artem Tarasov
e2f3daacec Web: Client: confirm: added passwordHash to co createUser, activateUser 2020-10-07 19:52:25 +03:00
Artem Tarasov
2547a70498 Web: Client: confirm: fixed the name of the passed parameter in /people 2020-10-07 19:10:35 +03:00
Artem Tarasov
5806daa594 Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files 2020-10-07 18:23:34 +03:00
Artem Tarasov
5e0e8e9b3b Web: Client: confirm: added transfer of hash instead of password 2020-10-07 18:23:14 +03:00
TatianaLopaeva
da23f36f09 Merge branch 'feature/files' into feature/empty-screen 2020-10-07 16:02:18 +03:00
TatianaLopaeva
34506827b5 Update yarn.lock 2020-10-07 15:53:29 +03:00
Ilya Oleshko
c0d798c141 Web: Client: Confirm : Fixed min password length property, now it get from settings 2020-10-07 15:02:56 +03:00
e76e50dc79 Web: ServiceWorkers: Turned off debug mode 2020-10-07 13:43:51 +03:00
11348e5fba Update yarn.lock files 2020-10-07 12:58:38 +03:00
8d7cf4f2dc Web: Replaced getCurrentModule with getCurrentProduct selector 2020-10-05 20:56:36 +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
8e0dc5dda4 Web: Client: Fixed merge error 2020-10-05 14:26:31 +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
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
Artem Tarasov
afedcc603c Web: Client: wizard: deleted unused props 2020-10-01 11:06:48 +03:00
TatianaLopaeva
b33328218a Update yarn.lock files 2020-10-01 09:37:25 +03:00
ccd1aef9f8 Web: Re-written NavMenu with selectors and reselect 2020-10-01 01:25:08 +03:00
Artem Tarasov
17d999f538 refactoring 2020-10-01 00:44:49 +03:00
Artem Tarasov
14f0d0f2be update yarn.lock 2020-09-30 15:00:27 +03:00
Artem Tarasov
bfdfcbb4b5 Web: Client: Wizard: added password hash 2020-09-30 14:22:14 +03:00
Artem Tarasov
c68b6d6b7f update yarn.lock 2020-09-30 10:53:51 +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