|
2f1d43df7b
|
Merge branch 'feature/files' into feature/loading-acceleration
|
2020-09-30 21:11:08 +03:00 |
|
|
140d57d5d4
|
Merge branch 'master' into feature/files
|
2020-09-30 18:28:27 +03:00 |
|
Artem Tarasov
|
8db1420cdd
|
Merge branch 'master' into feature/hash-password
|
2020-09-30 17:24:51 +03:00 |
|
|
58126fd98d
|
Auth by passwordHash
|
2020-09-30 17:16:48 +03:00 |
|
Artem Tarasov
|
14f0d0f2be
|
update yarn.lock
|
2020-09-30 15:00:27 +03:00 |
|
Artem Tarasov
|
c68b6d6b7f
|
update yarn.lock
|
2020-09-30 10:53:51 +03:00 |
|
|
4b302d1634
|
Web: People: Replaced RequestLoader to showLoader/hideLoader function calls
|
2020-09-29 17:43:13 +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 |
|
|
5ad8730c46
|
Web: People: Fixed open @self profile
|
2020-09-28 16:20:16 +03:00 |
|
|
2c1d473314
|
Merge branch 'master' into feature/files
# Conflicts:
# 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
# products/ASC.Files/Server/Controllers/FilesController.cs
|
2020-09-28 12:29:33 +03:00 |
|
Alexey Kostenko
|
c8b88c507f
|
Web: People: Updated toast notifications
|
2020-09-28 11:48:35 +03:00 |
|
|
a6180afa35
|
Web: Normalize routing + refactoring
|
2020-09-25 19:14:50 +03:00 |
|
|
69b21cd7a5
|
Web: People: Fixed routing to GroupAction from Home page
|
2020-09-25 11:04:34 +03:00 |
|
|
c5ed32f384
|
Web: People: Fixed routing to view/edit Profile from Home page
|
2020-09-25 10:53:39 +03:00 |
|
|
63a973375a
|
Web: People: Added RowsLoader to Section Body
|
2020-09-25 10:39:21 +03:00 |
|
Alexey Kostenko
|
69dcd77129
|
Web: People: Moved indication of success of link copy in InviteDialog
|
2020-09-24 16:18:37 +03:00 |
|
|
5f632302f9
|
Web: People: Added HeadlineLoader to Section Header
|
2020-09-24 14:35:23 +03:00 |
|
|
deabd31690
|
Web: People: Added TreeFolderLoader
|
2020-09-24 14:22:17 +03:00 |
|
|
97539afc02
|
Web: People: Added HeadlineLoader
|
2020-09-24 13:42:32 +03:00 |
|
|
4c214e2ff2
|
Merge branch 'feature/files' into feature/loading-acceleration
|
2020-09-24 12:56:52 +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 |
|
Artem Tarasov
|
dc57312bf8
|
Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
|
2020-09-23 14:12:26 +03:00 |
|
Artem Tarasov
|
20dc47473c
|
Web: People: fixed style of TreeMenu
|
2020-09-23 14:12:03 +03:00 |
|
Alexey Kostenko
|
95179a967f
|
Web: People: Removed unnecessary request to get invite link when visiting People page
|
2020-09-23 10:16:03 +03:00 |
|
Artem Tarasov
|
b2013f4dc2
|
Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
|
2020-09-22 17:58:17 +03:00 |
|
Artem Tarasov
|
9a6110ea9e
|
Web: People: fixed size of sorting block on tablet
|
2020-09-22 17:57:54 +03:00 |
|
Alexey Kostenko
|
744f7cdfb6
|
Web: People: Removed forced copying of invitation link when opening ModalDialog
|
2020-09-22 16:14:35 +03:00 |
|
Artem Tarasov
|
964cd4a0ec
|
Web: People: deleted unusing variable
|
2020-09-22 15:42:57 +03:00 |
|
Artem Tarasov
|
9a2f04008d
|
Web: People: fixed styles
|
2020-09-22 15:18:36 +03:00 |
|
Alexey Kostenko
|
6689b82d32
|
Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
|
2020-09-22 09:31:59 +03:00 |
|
Artem Tarasov
|
caea60046f
|
Web: People: refactoring: added utils.js, replaced changeDocumentTitle() with setDocumentTitle()
|
2020-09-21 14:54:35 +03:00 |
|
Alexey Kostenko
|
cd7d714476
|
Web: People: Fix loader style
|
2020-09-21 12:17:56 +03:00 |
|
Artem Tarasov
|
5f3a4c83e8
|
Web: People: fixed replacement of group members when adding
|
2020-09-19 23:26:11 +03:00 |
|
|
7b4441676e
|
Update yarn.lock files
|
2020-09-19 18:35:17 +03:00 |
|
|
0f00799480
|
Web: Client: Fixed redirect to defaultPage
|
2020-09-19 18:24:48 +03:00 |
|
|
9a092cb8ec
|
moved from release/11 4414f77b
|
2020-09-18 17:45:59 +03:00 |
|
|
4a09b4b5f2
|
Web: fixed body scroll
|
2020-09-18 17:06:35 +03:00 |
|
Artem Tarasov
|
939a29442f
|
Web: People: refactoring - changing document.title with changeTitleDocument()
|
2020-09-18 11:19:16 +03:00 |
|
Artem Tarasov
|
2e8a170166
|
Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
|
2020-09-17 16:10:09 +03:00 |
|
Artem Tarasov
|
ba03e55ffc
|
added display of changes in group composition after adding/removing members
|
2020-09-17 16:05:56 +03:00 |
|
Artem Tarasov
|
fcaf136b2c
|
added document title change after group update and deletion
|
2020-09-17 16:04:23 +03:00 |
|
|
d883ef441f
|
Api: moved from release/11 4414f77b
|
2020-09-17 15:04:28 +03:00 |
|
|
9623029d82
|
Web: Files: Speeded up loading first page + refactoring
|
2020-09-17 12:07:36 +03:00 |
|
|
2f4a3141d5
|
Web: People: Speeded up loading first page + refactoring
|
2020-09-17 11:28:23 +03:00 |
|
|
a4cb368513
|
Update yarn.lock files
|
2020-09-16 18:39:06 +03:00 |
|
|
ba7c4db354
|
WebL People: Remove temp prop
|
2020-09-16 18:35:49 +03:00 |
|
|
374e4ece1a
|
WebL People: Remove temp prop
|
2020-09-16 18:32:14 +03:00 |
|
|
e66ca03cbb
|
Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
|
2020-09-16 18:08:41 +03:00 |
|
|
ecb2879a77
|
Web: Components: Styled AvatarEditor + applied changes
|
2020-09-16 18:08:32 +03:00 |
|
Artem Tarasov
|
0fb03ea54a
|
Web: People: fixed double redirect after edit/create group
|
2020-09-16 16:13:03 +03:00 |
|
|
3b691247b2
|
Update yarn.lock files
|
2020-09-15 23:29:13 +03:00 |
|
|
986e53608d
|
Update yarn.lock files
|
2020-09-15 22:55:11 +03:00 |
|
|
d750335924
|
Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
# Conflicts:
# web/ASC.Web.Components/package.json
|
2020-09-15 22:43:37 +03:00 |
|
|
2bad04c058
|
Update yarn.lock files
|
2020-09-15 22:42:42 +03:00 |
|
Artem Tarasov
|
58a43ed52d
|
Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
|
2020-09-15 16:24:57 +03:00 |
|
Vladislav Makhov
|
d4f4691fef
|
Web: People: Change width values for rows
|
2020-09-15 16:22:58 +03:00 |
|
Artem Tarasov
|
6153e02c54
|
Web: People: added translation for Head field in GroupAction if there is no owner
|
2020-09-15 16:22:07 +03:00 |
|
Artem Tarasov
|
89baffc5d6
|
Web: People: fixed display of profile removed if the group was created without an owner
|
2020-09-15 15:36:43 +03:00 |
|
Artem Tarasov
|
9c0bac60f5
|
Web:People: fixed styles for TreeMenu
|
2020-09-15 15:05:40 +03:00 |
|
Artem Tarasov
|
b4d0776ca4
|
Web:People: changed check for rendering PageLayout.ArticleMainButton
|
2020-09-14 14:34:42 +03:00 |
|
Artem Tarasov
|
3e42b49c3e
|
Web:People: added icons for tree nodes, changed icon for root folder
|
2020-09-14 14:31:44 +03:00 |
|
Alexey
|
69b8d0ec7d
|
Web: Files/People/Components: Content rendered without columns on mobile devices
|
2020-09-14 08:51:54 +03:00 |
|
|
65fbf2247e
|
Update yarn.lock files
|
2020-09-11 22:51:28 +03:00 |
|
|
8045eecf1b
|
Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
# Conflicts:
# products/ASC.Files/Client/src/components/Article/Body/TreeFolders.js
# products/ASC.Files/Client/src/components/Article/Body/index.js
|
2020-09-11 22:30:09 +03:00 |
|
|
4d97d6a7ac
|
Web: Clients: Moved setup title to Article/Body
|
2020-09-11 21:45:46 +03:00 |
|
|
99a6fd523e
|
Web: Client: Moved organizationName into authReducer
|
2020-09-11 18:03:40 +03:00 |
|
Vladislav Makhov
|
175b244cd2
|
Fix state bug
|
2020-09-10 15:54:50 +03:00 |
|
Vladislav Makhov
|
b81f2e0dba
|
Fix state bug
|
2020-09-10 15:01:56 +03:00 |
|
Vladislav Makhov
|
c12ae9624b
|
Avatar editor: add indication of loading process
|
2020-09-10 14:18:58 +03:00 |
|
|
7433eea815
|
Web: Clients: SW: Added code for updating SW lifecycle to update the app after user triggered refresh
|
2020-09-10 13:19:06 +03:00 |
|
|
323823981a
|
Update yarn.lock files
|
2020-09-09 22:25:31 +03:00 |
|
|
e4a222b57b
|
Web: People: Fixed redirect on Save/Cancel GroupAction page
|
2020-09-09 22:18:27 +03:00 |
|
|
b3b6fd0938
|
Web: Components: Re-written ModalDialog component with SLOT pattern
|
2020-09-09 21:49:25 +03:00 |
|
Artem Tarasov
|
1fd0f3c010
|
fixed redirect edit/view profile in people
|
2020-09-09 15:35:50 +03:00 |
|
|
9778b258d7
|
Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
|
2020-09-07 18:41:51 +03:00 |
|
|
efbebc05b5
|
Update yarn.lock files
|
2020-09-07 18:41:42 +03:00 |
|
|
d9783ecf26
|
Web: Common: fixed sort-combobox styles, added isMobile prop
|
2020-09-07 17:31:36 +03:00 |
|
|
a2f050590b
|
Update yarn.lock files
|
2020-09-04 21:04:05 +03:00 |
|
|
fb53f4f1f1
|
Web: People: Added route to Error520
|
2020-09-04 20:35:21 +03:00 |
|
Ilya Oleshko
|
91705dd4da
|
Web: People: Profile : Fixed avatar load
|
2020-09-03 17:16:05 +03:00 |
|
|
5298c1d27c
|
Web: People: Excluded caching of temp userPhotos
|
2020-09-02 18:10:05 +03:00 |
|
|
0eb3b2b4d3
|
Update yarn.lock files
|
2020-09-02 12:30:53 +03:00 |
|
|
da50146545
|
Web: Clients: Added useEffect for changeLanguage call if functional components (issue: Warning: Cannot update a component https://fb.me/setstate-in-render)
|
2020-09-02 12:19:21 +03:00 |
|
|
4babaa5e67
|
Web: People: Fixed work with customNames
|
2020-09-02 11:59:36 +03:00 |
|
|
0152274029
|
Web: Clients: Fixed workbox.expiration.Plugin is not a constructor
|
2020-09-01 18:34:06 +03:00 |
|
|
00c6ce5e9b
|
Web: Clients: Added api-cache in service-worker for base info for 30 Minutes
|
2020-09-01 18:11:20 +03:00 |
|
|
bd6c0d0338
|
Web: Clients: Fixed windows is not defined
|
2020-09-01 18:09:39 +03:00 |
|
|
bc8613c4f6
|
Web: Clients: Uncommented self.skipWaiting() on install service-worker
|
2020-09-01 17:53:24 +03:00 |
|
Ilya Oleshko
|
fc76acf31f
|
Web: People: Home : Fixed property warnings for empty row places
|
2020-09-01 16:18:58 +03:00 |
|
Ilya Oleshko
|
6ad8abc8fa
|
Web: People: Home : Added prop widthProp for components
|
2020-09-01 15:24:10 +03:00 |
|
|
5f7265931c
|
Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
|
2020-08-31 17:45:52 +03:00 |
|
|
29d9f21d05
|
Merge branch 'master' into feature/files
# Conflicts:
# products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
# web/ASC.Web.Core/Files/DocumentService.cs
|
2020-08-31 17:45:57 +03:00 |
|
|
062a3a793f
|
Update yarn.lock files
|
2020-08-31 17:45:37 +03:00 |
|
|
f78eb3aada
|
Web: People: fixed empty-screen-container to new article
|
2020-08-31 16:33:31 +03:00 |
|
|
d9f70df70a
|
Update yarn.lock files
|
2020-08-31 12:42:36 +03:00 |
|
|
2b9f263dbc
|
Web: People: Added Webpack-bundle-analyzer
|
2020-08-31 11:59:35 +03:00 |
|
Ilya Oleshko
|
e899d9d6bd
|
Web: People: Home : Fixed auto scroll to body on mobile or tablet devices
|
2020-08-28 12:14:22 +03:00 |
|
maksim
|
8282f3f658
|
fix
|
2020-08-27 17:01:37 +03:00 |
|
|
15ba6828c5
|
Merge branch 'master' into feature/files
# Conflicts:
# 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
|
2020-08-20 12:43:12 +03:00 |
|
|
d5942241e8
|
Web: Clients: Parallelized initial API queries
|
2020-08-20 12:17:36 +03:00 |
|