|
|
4e84d5f5ae
|
Merge branch 'feature/files' into feature/selectors-refactoring
# Conflicts:
# web/ASC.Web.Common/package.json
|
2020-10-08 16:58:09 +03:00 |
|
|
|
798170e402
|
web: common: bump version
|
2020-10-08 12:43:21 +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 |
|
Artem Tarasov
|
608109f4a0
|
web: common: bump version
|
2020-10-08 10:29:06 +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 |
|
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 |
|
|
|
cbcf6bef85
|
Web: Files: removed auth selectors from files
|
2020-10-07 17:23:02 +03:00 |
|
|
|
9d87b8de09
|
Merge pull request #94 from ONLYOFFICE/feature/empty-screen
Feature/empty screen
|
2020-10-07 16:52:54 +03:00 |
|
|
|
3bf8bd5103
|
Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
|
2020-10-07 16:41:24 +03:00 |
|
|
|
ca37d2134d
|
Web: Files: Applied API changes on server in files filtering
|
2020-10-07 16:41:05 +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 |
|
TatianaLopaeva
|
5c328f596e
|
web: components: bump version
|
2020-10-07 15:38:27 +03:00 |
|
TatianaLopaeva
|
de7e4fe062
|
Merge branch 'feature/files' into feature/empty-screen
# Conflicts:
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/index.js
|
2020-10-07 15:14:54 +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 |
|
|
|
42a1b993f1
|
web: common: bump version
|
2020-10-07 14:06:43 +03:00 |
|
|
|
63f6e26eea
|
Web: Common: added new selectors, added rootFolderName field to getFoldersTree api
|
2020-10-07 14:06:28 +03:00 |
|
|
|
803041cbda
|
Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
|
2020-10-07 13:48:34 +03:00 |
|
|
|
ed47263adf
|
Merge branch 'master' into feature/files
|
2020-10-07 13:48:11 +03:00 |
|
|
|
08590b6b58
|
Fix confirm
|
2020-10-07 13:45:53 +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 |
|
|
|
1475af5f28
|
web: common: bump version
|
2020-10-07 12:49:50 +03:00 |
|
|
|
5738e82451
|
web: components: bump version
|
2020-10-07 12:49:14 +03:00 |
|
|
|
cbde3120aa
|
Web: Common: Removed Layout and StudioLayout components
|
2020-10-07 12:48:38 +03:00 |
|
TatianaLopaeva
|
ee460787d5
|
Web: Components: Refactoring
|
2020-10-07 10:59:31 +03:00 |
|
TatianaLopaeva
|
da9611bd4b
|
Merge branch 'feature/files' into feature/empty-screen
|
2020-10-07 10:58:27 +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 |
|
|
|
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 |
|
|
|
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 |
|
TatianaLopaeva
|
d5dbebfe1e
|
Web: Components: Refactoring
|
2020-10-05 21:22:03 +03:00 |
|
|
|
8d7cf4f2dc
|
Web: Replaced getCurrentModule with getCurrentProduct selector
|
2020-10-05 20:56:36 +03:00 |
|
TatianaLopaeva
|
2b848be23d
|
Web: Components: Change styles by layout
|
2020-10-05 20:38:13 +03:00 |
|
|
|
b741d9c7d7
|
Web: Components: Remove debugger
|
2020-10-05 18:25:24 +03:00 |
|
|
|
a6bc650da6
|
Web: Common: NavMenu refactoring
|
2020-10-05 18:25:01 +03:00 |
|
TatianaLopaeva
|
b3d82c1e25
|
Changed font-style and font-weight for EmptyScreenContainer
|
2020-10-05 16:20:33 +03:00 |
|
|
|
0add76cd16
|
Web: Components: Added fix of error displaying
|
2020-10-05 16:09:35 +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 |
|
|
|
4629dfd077
|
web: components: bump version
|
2020-10-05 14:28:30 +03:00 |
|
|
|
8e0dc5dda4
|
Web: Client: Fixed merge error
|
2020-10-05 14:26:31 +03:00 |
|
