|
1490332568
|
Merge branch 'develop' into refactoring/scope
# Conflicts:
# products/ASC.Files/Core/Core/FileStorageService.cs
# products/ASC.Files/Core/Core/Thirdparty/CachedProviderAccountDao.cs
# products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderFileDao.cs
# products/ASC.Files/Core/Helpers/WordpressHelper.cs
# products/ASC.Files/Server/Controllers/PrivacyRoomController.cs
# products/ASC.Files/Server/Startup.cs
|
2020-11-10 11:42:50 +03:00 |
|
Viktor Fomin
|
834e8e6516
|
Update yarn.lock files
|
2020-11-10 10:46:26 +03:00 |
|
Viktor Fomin
|
8648abedbd
|
Web: People: delete first header preloader
|
2020-11-10 10:40:33 +03:00 |
|
Viktor Fomin
|
afd252e2ce
|
Web: People: fix profile action loader
|
2020-11-10 03:08:59 +03:00 |
|
Viktor Fomin
|
a7dee56194
|
Update yarn.lock files
|
2020-11-09 23:01:57 +03:00 |
|
Viktor Fomin
|
9f19173195
|
Web: People: added circle in row
|
2020-11-09 22:57:02 +03:00 |
|
Viktor Fomin
|
6e8685d8d6
|
Update yarn.lock files
|
2020-11-09 16:54:13 +03:00 |
|
Viktor Fomin
|
b3f4bd3f64
|
Update yarn.lock files
|
2020-11-09 15:16:44 +03:00 |
|
Viktor Fomin
|
33ef924307
|
Web: People: fix first loader
|
2020-11-09 15:11:04 +03:00 |
|
Viktor Fomin
|
b0d202f7c9
|
Update yarn.lock files
|
2020-11-09 13:17:06 +03:00 |
|
Viktor Fomin
|
884cb67a35
|
Web: People: delete logo
|
2020-11-09 13:07:43 +03:00 |
|
Viktor Fomin
|
445b2e83b5
|
Web: People: delete loading label
|
2020-11-09 12:37:13 +03:00 |
|
Viktor Fomin
|
c2e74d3756
|
Update yarn.lock files
|
2020-11-06 18:43:16 +03:00 |
|
Viktor Fomin
|
b1f9db662d
|
Web: People: fix color
|
2020-11-06 16:17:56 +03:00 |
|
SuhorukovAnton
|
89c6e5548c
|
x-www-form-urlencoded: fix
|
2020-11-06 13:39:25 +03:00 |
|
SuhorukovAnton
|
7b8efca8b3
|
x-www-form-urlencoded: fix
|
2020-11-06 12:46:57 +03:00 |
|
SuhorukovAnton
|
855c5bc92b
|
x-www-form-urlencoded: first version
|
2020-11-06 12:03:49 +03:00 |
|
Viktor Fomin
|
151dc898f5
|
Update yarn.lock files
|
2020-11-05 12:28:39 +03:00 |
|
Artem Tarasov
|
38c7faec04
|
Merge branch 'develop' into hotfix/documents-bugfix
|
2020-11-05 11:57:55 +03:00 |
|
Artem Tarasov
|
ace2111197
|
Web: People: applied prop size for Avatar Component
|
2020-11-05 11:40:19 +03:00 |
|
Viktor Fomin
|
3bdff517f9
|
Web: People: rename headers components
|
2020-11-05 11:16:33 +03:00 |
|
Artem Tarasov
|
df9a1658e9
|
Web: People: refactoring
|
2020-11-05 09:44:20 +03:00 |
|
Artem Tarasov
|
6a4cabcedf
|
Web: Components/Files/People: fix styles
|
2020-11-05 09:22:14 +03:00 |
|
|
79ea471098
|
Merge branch 'develop' into refactoring/scope
# Conflicts:
# common/ASC.Api.Core/Core/BaseStartup.cs
# common/ASC.Core.Common/BaseCommonLinkUtility.cs
# common/services/ASC.ApiSystem/Startup.cs
# common/services/ASC.Data.Backup/BackupServiceLauncher.cs
# common/services/ASC.Data.Backup/Startup.cs
# common/services/ASC.Data.Storage.Migration/Program.cs
# common/services/ASC.Notify/NotifyServiceLauncher.cs
# common/services/ASC.Notify/Program.cs
# common/services/ASC.Socket.IO.Svc/Program.cs
# common/services/ASC.Studio.Notify/Program.cs
# common/services/ASC.Thumbnails.Svc/Program.cs
# common/services/ASC.UrlShortener.Svc/Program.cs
# products/ASC.Files/Core/Configuration/ProductEntryPoint.cs
# products/ASC.Files/Server/Startup.cs
# products/ASC.Files/Service/Program.cs
# products/ASC.People/Server/Startup.cs
# web/ASC.Web.Api/Controllers/PortalController.cs
# web/ASC.Web.Api/Controllers/SettingsController.cs
# web/ASC.Web.Api/Startup.cs
# web/ASC.Web.Studio/Startup.cs
|
2020-11-04 15:22:43 +03:00 |
|
Viktor Fomin
|
72467a70c2
|
Web: People: fix header loader
|
2020-11-04 12:24:02 +03:00 |
|
Viktor Fomin
|
91c254c638
|
Web: Common: fix main button loader
|
2020-11-03 18:36:19 +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 |
|
|
7e828b5643
|
Autofac: fix
|
2020-11-02 19:27:08 +03:00 |
|
Ilya Oleshko
|
318202ca57
|
Web: People : UserContent : Added sectionWidth property, fixed missing styles
|
2020-10-30 14:23:56 +03:00 |
|
Ilya Oleshko
|
b055c0224a
|
Web: People : Body : Added context to RowContainer
|
2020-10-30 14:23:23 +03:00 |
|
Ilya Oleshko
|
648427fbf4
|
Web: People : Header : Added context to Header
|
2020-10-30 14:22:48 +03:00 |
|
|
bc725f29df
|
Web: Common: added re-resizable package, added new acticle
|
2020-10-29 17:33:05 +03:00 |
|
|
265feee81e
|
Refactoring: scope
|
2020-10-29 12:31:55 +03:00 |
|
|
049e8f63e9
|
Refactoring: scope.
|
2020-10-29 11:13:51 +03:00 |
|
|
51f1f92307
|
Scope: refactoring.
|
2020-10-28 15:26:27 +03:00 |
|
|
e9a9b320e8
|
Scope: refactoring. Notify, People
|
2020-10-27 18:34:22 +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 |
|
|
05a6034b05
|
Merge branch 'develop' into feature/people-filter-empty-screen
|
2020-10-19 20:53:59 +03:00 |
|
|
830c73a134
|
Scope: refactoring
|
2020-10-19 18:53:15 +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 |
|
Alexey Kostenko
|
fd2c71dce2
|
Web: People: Fixed avatar editor page (the path to the avatar was put into storage)
|
2020-10-12 10:04:40 +03:00 |
|
Alexey Kostenko
|
99262bdae6
|
Web: People: fix desktop avatarEditor
|
2020-10-12 08:59:17 +03:00 |
|
Alexey Kostenko
|
5838cd617c
|
Web: People: Return to profile editor after save avatar
|
2020-10-12 07:12:32 +03:00 |
|
Alexey Kostenko
|
237f737ba7
|
Merge branch 'feature/files' into feature/avatar-editor-redesign
|
2020-10-11 20:04:18 +03:00 |
|
|
ee6307e288
|
Web: People: Added hack for build machine only
|
2020-10-09 19:14:48 +03:00 |
|
Artem Tarasov
|
d7d9a55e50
|
Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
|
2020-10-09 16:23:41 +03:00 |
|
TatianaLopaeva
|
5f0c974629
|
Web: People: Added console.log
|
2020-10-09 16:16:28 +03:00 |
|
Artem Tarasov
|
24c799ed76
|
Web: People: applied ProfileView loader
|
2020-10-09 16:10:29 +03:00 |
|