Commit Graph

2970 Commits

Author SHA1 Message Date
23e3d28857 web: Replaced history to asc-web-common variant 2019-11-15 16:44:54 +03:00
a75d6e7ecc web: Removed auth folder from store (after change to asc-web-common variant) 2019-11-15 16:29:49 +03:00
49d5000cd2 Merge branch 'master' into feature/asc-web-common 2019-11-15 15:29:57 +03:00
6797194080 Web: Client: deleted shouldComponentUpdate from accessRight admins page 2019-11-15 14:16:31 +03:00
4273d98bbf Merge branch 'master' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore 2019-11-15 14:02:16 +03:00
06e9c901b3 Web: Client: fixed accessRights rerender on owner and admins pages 2019-11-15 14:02:09 +03:00
e09008418c Merge branch 'master' of github.com:ONLYOFFICE/AppServer 2019-11-15 10:45:43 +00:00
740942d938 docker: rename repo 2019-11-15 10:45:27 +00:00
e579b124d9 fixed scope 2019-11-15 13:11:40 +03:00
2d47d639dd web: People: Replaced auth store to ASC.Web.Common realization 2019-11-15 12:38:31 +03:00
Ivan Habarov
960d03b32c Merge branch 'master' of github.com:ONLYOFFICE/AppServer 2019-11-15 12:32:09 +03:00
Ivan Habarov
946d2ab85f web: components: bump version 2019-11-15 12:30:26 +03:00
711feca435 fixed scope 2019-11-15 12:28:20 +03:00
Ivan Habarov
a32a77dd58 Merge branch 'feature/empty-container-v2' 2019-11-15 11:58:57 +03:00
fcc4e4605f Common nlog config 2019-11-15 11:47:56 +03:00
2a1120645a Web: Client: added lazy loader to tabs, added ownerId to settings controller 2019-11-15 10:19:37 +03:00
e6d3fad6f6 web: components: bump version 2019-11-15 10:15:51 +03:00
74be46549c Merge branch 'master' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore 2019-11-15 10:15:41 +03:00
8daa24c171 Web: Components: fixed tabs-container rerender, added rerender test 2019-11-15 10:15:21 +03:00
504fd770dd Merge branch 'master' of github.com:ONLYOFFICE/AppServer 2019-11-14 14:29:32 +00:00
f07f71cf59 docker: add libgdiplus package 2019-11-14 14:29:17 +00:00
190c0a5c48 TimeZoneConverter: fixed NullReferenceException 2019-11-14 16:51:15 +03:00
cb057a35ea Merge branch 'master' into feature/asc-web-common 2019-11-14 16:39:54 +03:00
ef1e3eaa1d web: Client: Replaced auth store to ASC.Web.Common realization 2019-11-14 16:37:41 +03:00
1f246aac8b docker: add libgdiplus package 2019-11-14 13:32:24 +00:00
ee0315c6b1 Merge branch 'master' of https://github.com/ONLYOFFICE/AppServer 2019-11-14 15:29:35 +03:00
af64d1a7e8 web: components: clearfix for filter-input 2019-11-14 15:01:02 +03:00
34053beff8 Merge branch 'master' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore 2019-11-14 12:58:28 +03:00
71bdd47708 Web: Client: fixed filter error 2019-11-14 12:58:20 +03:00
04464d52ad Add "AddEnvironmentVariables" setting 2019-11-14 12:21:15 +03:00
4c2e1a065b Web: Client: added tabs routing to accessRights page 2019-11-14 12:08:11 +03:00
f498ee5a29 Web: Client: fixed logout on changePassword page 2019-11-14 09:56:06 +03:00
1292891a99 Merge branch 'master' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore 2019-11-14 09:00:28 +03:00
d741353116 Web: Client: fixed accessRights page crash, removed api getAdmins 2019-11-14 09:00:21 +03:00
175c86fb49 People: auth fixed 2019-11-13 18:11:30 +03:00
71a1ead564 Web: Client: fixed owner avatar on accessRights page 2019-11-13 16:38:53 +03:00
Ivan Habarov
c86868d234 Merge branch 'master' into feature/empty-container-v2 2019-11-13 16:34:13 +03:00
17ef3569ee Merge branch 'master' into feature/asc-web-common 2019-11-13 16:14:32 +03:00
c12141897f web: Added check of isAxiosError ("Network error" for example) 2019-11-13 16:12:46 +03:00
242c544557 web: Changed redirect methods to error pages 2019-11-13 15:35:56 +03:00
ccb8cbd7f9 web: Client: Added check for undefined result 2019-11-13 15:16:38 +03:00
8a7644e565 Merge branch 'master' into feature/asc-web-common 2019-11-13 12:33:45 +03:00
a9f394a10b web: Client: Added check authorization in confirmRoute.js 2019-11-13 12:33:11 +03:00
Daniil Senkiv
5c61500118 Web.Client: Settings: added WhiteLabel page with getting logo urls, sizes, text for logo; added function for generating (drawing) logo 2019-11-13 12:22:50 +03:00
39889d028e web: Common: Added folder 'dist' to .gitignore 2019-11-13 11:09:39 +03:00
54fa1c1c8d Web: Client: removed cookie from confirmRoute 2019-11-13 11:08:39 +03:00
ccb8a6c22a web: Common: Applied server changes on login/logout for ASC.Web.Common 2019-11-13 11:07:25 +03:00
e69d2900ef Merge branch 'master' into feature/asc-web-common
# Conflicts:
#	products/ASC.People/Client/yarn.lock
#	web/ASC.Web.Client/yarn.lock
2019-11-13 10:55:42 +03:00
6f13d071bf Merge branch 'master' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore 2019-11-13 10:55:15 +03:00
28e83c13ff Web: Client: replaced reducer accessRight settings, added "set full admin" method to accessRights page 2019-11-13 10:55:08 +03:00