Vladislav Makhov
|
430c7ae73d
|
Remove unused code
|
2020-11-09 12:05:17 +03:00 |
|
Vladislav Makhov
|
d569e8dd74
|
Refactoring
|
2020-11-09 12:02:03 +03:00 |
|
Vladislav Makhov
|
102837ed04
|
Add selector
|
2020-11-09 09:16:44 +03:00 |
|
Vladislav Makhov
|
6f38b66255
|
Add react-string-format lib
|
2020-11-06 19:18:32 +03:00 |
|
Viktor Fomin
|
c2e74d3756
|
Update yarn.lock files
|
2020-11-06 18:43:16 +03:00 |
|
Vladislav Makhov
|
c9eeeed26e
|
Add separator
|
2020-11-06 16:20:27 +03:00 |
|
Viktor Fomin
|
4dc0e0d13d
|
Web: Client: fix color
|
2020-11-06 16:17:20 +03:00 |
|
Vladislav Makhov
|
25c812937d
|
Rename sendConsumerNewProps to updateConsumerProps
|
2020-11-06 14:29:55 +03:00 |
|
Vladislav Makhov
|
462c7578fb
|
Moved declaration out from render
|
2020-11-05 18:56:45 +03:00 |
|
Vladislav Makhov
|
b777439f09
|
Change to decomposed prop consumer
|
2020-11-05 18:43:21 +03:00 |
|
Vladislav Makhov
|
79d2940514
|
Rename prop NewProps to newProps
|
2020-11-05 18:41:01 +03:00 |
|
Vladislav Makhov
|
9220ab7d4f
|
Fix name
|
2020-11-05 18:38:31 +03:00 |
|
Vladislav Makhov
|
fc534aca67
|
Fix name
|
2020-11-05 18:38:00 +03:00 |
|
Vladislav Makhov
|
2108c2fba9
|
Rename third-party-services.js to ThirdPartyServicesSettings.js, fix imports
|
2020-11-05 18:20:15 +03:00 |
|
Vladislav Makhov
|
baa90d1a84
|
remove console warnings
|
2020-11-05 18:17:10 +03:00 |
|
Vladislav Makhov
|
c483acfde3
|
this.state decompose
|
2020-11-05 18:14:59 +03:00 |
|
Vladislav Makhov
|
49acf0168c
|
Moved declarations out from render
|
2020-11-05 18:11:32 +03:00 |
|
Viktor Fomin
|
151dc898f5
|
Update yarn.lock files
|
2020-11-05 12:28:39 +03:00 |
|
Viktor Fomin
|
71bf070324
|
Web: Client: fix loader
|
2020-11-05 12:24:15 +03:00 |
|
Artem Tarasov
|
38c7faec04
|
Merge branch 'develop' into hotfix/documents-bugfix
|
2020-11-05 11:57:55 +03:00 |
|
Artem Tarasov
|
b077f450b5
|
Web: Client: applied prop size for Avatar Component
|
2020-11-05 11:39:56 +03:00 |
|
Vladislav Makhov
|
550d08dc51
|
Fix modal
|
2020-11-03 17:48:05 +03:00 |
|
Vladislav Makhov
|
22a494a5ad
|
yarn.lock update
|
2020-11-03 17:39:49 +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 |
|
|
|
60e66c1abe
|
Web: Fixed PWA App icon url on iOS
|
2020-11-02 21:42:53 +03:00 |
|
Artem Tarasov
|
324b12a29e
|
Web: Client: Wizard: fixed styles
|
2020-10-30 10:01:19 +03:00 |
|
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 |
|
TatianaLopaeva
|
09f8b3df6b
|
Deleted unnecessary variable
|
2020-09-29 09:18:43 +03:00 |
|
TatianaLopaeva
|
ea2f5ec097
|
Merge branch 'feature/files' into feature/payments-enterprise
|
2020-09-29 09:06:16 +03:00 |
|
TatianaLopaeva
|
463bdc0ec8
|
Refactoring buttonContainer and index
|
2020-09-29 09:05:02 +03:00 |
|
TatianaLopaeva
|
a09953ff73
|
Refactoring and added Trans from "react-i18next"
|
2020-09-28 16:03:43 +03:00 |
|
Artem Tarasov
|
5426089bdb
|
Web: Client: refactoring translate Wizard
|
2020-09-28 13:09:34 +03:00 |
|
TatianaLopaeva
|
8139997ada
|
Refactoring headerContainer
|
2020-09-28 12:07:18 +03:00 |
|
TatianaLopaeva
|
26efa35a32
|
Refactoring translation
|
2020-09-28 11:35:53 +03:00 |
|
TatianaLopaeva
|
e51c65d0b7
|
Refactoring to variables condition
|
2020-09-28 10:19:08 +03:00 |
|
|
|
a6180afa35
|
Web: Normalize routing + refactoring
|
2020-09-25 19:14:50 +03:00 |
|
TatianaLopaeva
|
3357a2c687
|
Refactoring reducer
|
2020-09-25 16:38:36 +03:00 |
|
TatianaLopaeva
|
c9a8fcbd13
|
Re-write to variables condition
|
2020-09-25 10:39:22 +03:00 |
|
TatianaLopaeva
|
06b6386489
|
Simplify action type
|
2020-09-24 15:24:58 +03:00 |
|
TatianaLopaeva
|
555f9b0812
|
Refactoring and deleted className
|
2020-09-24 14:30:19 +03:00 |
|
TatianaLopaeva
|
5d01d660a5
|
Return lock.png
|
2020-09-24 13:05:17 +03:00 |
|
TatianaLopaeva
|
59716a184b
|
Deleted png images
|
2020-09-24 12:14:56 +03:00 |
|
TatianaLopaeva
|
6021ea4a76
|
Deleted png images
|
2020-09-24 12:01:08 +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
|
e5cf2db796
|
Refactoring toast
|
2020-09-23 17:45:02 +03:00 |
|
TatianaLopaeva
|
e515be4271
|
Refactoring styles, actions and reducer
|
2020-09-23 16:58:02 +03:00 |
|
TatianaLopaeva
|
60cc7c1706
|
Added setDocumentTitle
|
2020-09-23 15:41:12 +03:00 |
|
TatianaLopaeva
|
1849e3712d
|
Merge branch 'feature/files' into feature/payments-enterprise
|
2020-09-23 15:25:23 +03:00 |
|
TatianaLopaeva
|
1a0881d58a
|
Refactoring styles
|
2020-09-23 14:44:27 +03:00 |
|
TatianaLopaeva
|
ee148a0b23
|
Refactoring styles
|
2020-09-23 11:08:41 +03:00 |
|
TatianaLopaeva
|
27774c97bd
|
Refactoring styles for headerContainer and buttonContainer (added grid for desktop)
|
2020-09-22 17:08:18 +03:00 |
|
