Commit Graph

1442 Commits

Author SHA1 Message Date
b585313aa5 Update yarn.lock files 2020-10-23 12:21:57 +03:00
05a6034b05
Merge branch 'develop' into feature/people-filter-empty-screen 2020-10-19 20:53:59 +03:00
Alexey Kostenko
5adc0f8697 Web: People: Added loader when switching groups 2020-10-19 14:15:04 +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
181ac04fd8 DI: register fix 2020-10-18 19:34:30 +03:00
ed50f3bc98 Update yarn.lock files 2020-10-16 16:38:11 +03:00
2ab62c351e Web: People: Applied prettier style fix 2020-10-16 16:23:51 +03:00
TatianaLopaeva
14af00ffd7 Web: Added styles and changed images by layout 2020-10-16 16:21:33 +03:00
TatianaLopaeva
acfe89b4f4 Web: People: Fixed the error of returning to the list of users immediately after refreshing the page and switching to the profile view 2020-10-16 14:54:13 +03:00
Alexey Kostenko
94a31036eb Fixed navigation (after create user did not work) 2020-10-16 08:55:44 +03:00
Alexey Kostenko
7230d2a48e Web: People: Fixed navigation (after saving profile changes did not work) 2020-10-16 07:17:58 +03:00
ff1c1765b5 Web: Clients: Turned off Suspense fallback 2020-10-15 18:07:23 +03:00
Alexey Kostenko
df4c926436 Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files 2020-10-15 13:50:05 +03:00
Alexey Kostenko
5bd7a3b29c Web: People: Fix loading main People page, after switching from profile 2020-10-15 13:49:55 +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
TatianaLopaeva
f8353c5974 Web: People: Added translate for sex status 2020-10-14 14:02:24 +03:00
Alexey Kostenko
d7d2a94181 Web: People: Added missing translations 2020-10-14 12:48:19 +03:00
Alexey Kostenko
f16145ae62 Merge branch 'feature/files' into feature/avatar-editor-redesign 2020-10-13 17:00:18 +03:00
Alexey Kostenko
e95be64ea6 Web: Components/People: Small refactoring 2020-10-13 16:57:44 +03:00
49f5a52433 Update yarn.lock files 2020-10-13 16:52:17 +03:00
8205c230c7 Web: Clients: Added displaying Loader.Filter for MainButton 2020-10-13 16:43:41 +03:00
2fa205cb6f Web: Clients: Fixed catching of initial API errors 2020-10-13 16:31:21 +03:00
Alexey Kostenko
8e5db50b9a Web: People: Show data loss warning on exit 2020-10-13 16:24:46 +03:00
746ecc7f40 Web: Clients: Fixed applying single cursor on loading 2020-10-13 16:20:49 +03:00
Alexey Kostenko
e5254e0a54 Web: People: Fixed saving empty image when creating user 2020-10-13 15:53:53 +03:00
3dd9f71dda Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files 2020-10-13 15:51:24 +03:00
5d76e7e6b0 Web: Redesigned displaying of loading processes 2020-10-13 15:51:14 +03:00
668cb3e893 Merge branch 'master' into feature/files 2020-10-13 15:27:31 +03:00
Alexey Kostenko
30032bdce9 Web: People: Removed "is loading" from save button when upload image 2020-10-13 14:06:36 +03:00
0ae5ec1b1b Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files 2020-10-13 14:02:11 +03:00
b53e34a0f0 Web: Removed useless Link duplicates 2020-10-13 14:02:04 +03:00
Alexey Kostenko
31fee3c405 Web: People: Reset profile after editing or creating profile 2020-10-13 13:49:11 +03:00
Artem Tarasov
a4a959f972 Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files 2020-10-13 13:43:16 +03:00
9968873305 Merge branch 'master' into feature/fix_API_return
# Conflicts:
#	web/ASC.Web.Api/Controllers/SettingsController.cs
2020-10-13 13:33:24 +03:00
a504251359
Merge pull request #99 from ONLYOFFICE/feature/fix-changing-language
Feature/fix changing language
2020-10-13 12:55:37 +03:00
02f39a9c71 Merge branch 'master' into feature/files
# Conflicts:
#	common/ASC.Core.Common/Migrations/MySql/WebstudioDbContextMySql/20201006101804_WebstudioDbContextMySql.cs
#	common/ASC.Core.Common/Migrations/Npgsql/WebstudioDbContextNpgsql/20200929102646_WebstudioDbContextNpgsql.cs
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
#	products/ASC.Files/Core/Core/FileStorageService.cs
#	web/ASC.Web.Core/Files/FileUtility.cs
2020-10-13 12:52:28 +03:00
TatianaLopaeva
4ef2db2ed0 Web: Update yarn.lock 2020-10-13 12:37:34 +03:00
TatianaLopaeva
2f72748f2b Web: Added getLanguage selector 2020-10-13 11:19:24 +03:00
TatianaLopaeva
f0299db016 Update yarn.lock 2020-10-13 11:14:09 +03:00
Alexey Kostenko
72ac2f5875 Web: People: Fixed avatar editor when creating user 2020-10-13 10:06:05 +03:00
Artem Tarasov
1173410695 Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files 2020-10-13 10:05:53 +03:00
TatianaLopaeva
f6a5c8a30b Web: People: added deleting cache and refactoring 2020-10-13 09:45:23 +03:00
c622be89a3 revert discard 2020-10-12 22:39:23 +03:00
43b9c33979 fix formating 2020-10-12 19:23:15 +03:00
TatianaLopaeva
1010886262 Web: Refactoring 2020-10-12 16:56:34 +03:00
36034bf97a fix warnings 2020-10-12 16:52:31 +03:00
Alexey Kostenko
54f68cb02a Web: People: Fixed adding avatar then create user 2020-10-12 16:13:14 +03:00
Artem Tarasov
8621f9f321 Web: People: profileView: fixed loader 2020-10-12 13:06:00 +03:00