|
|
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 |
|
TatianaLopaeva
|
a3adea3c27
|
Merge branch 'master' into feature/files
# Conflicts:
# products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs
|
2020-09-15 17:39:34 +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 |
|
Vladislav Makhov
|
a0024722d0
|
Web: Files: Change width values for rows
|
2020-09-15 16:22:41 +03:00 |
|
Artem Tarasov
|
6a76e12027
|
Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
|
2020-09-15 16:22:38 +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 |
|
|
|
4e34836e4e
|
Merge branch 'feature/files' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/files
|
2020-09-15 15:47:47 +03:00 |
|
|
|
6231d0654f
|
Web: Files: fixed isCanCreate selector to Header
|
2020-09-15 15:47:39 +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
|
861ab54818
|
Web:Files; refactoring styled SettingsTree
|
2020-09-15 14:51:28 +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 |
|
Artem Tarasov
|
fc8325f65f
|
Web:Files: refactoring SettingsTree
|
2020-09-14 13:53:37 +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 |
|
|
|
09c8febfd3
|
Web: Files: Removed setup wrong title
|
2020-09-11 22:40:52 +03:00 |
|
|
|
de290abd57
|
Web: Files: Replaced invalid characters
|
2020-09-11 22:40:09 +03:00 |
|
|
|
51709f3c6d
|
Web: Files: Changed default cursor in TreeSettings on loading
|
2020-09-11 22:39:22 +03:00 |
|
|
|
a44b4bc60a
|
Web: Files: Fixed setIsLoading is undefined on triangle icon click
|
2020-09-11 22:38:50 +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 |
|
|
|
c989eaf8a5
|
Web: Files: Changed default cursor in FolderTree on loading
|
2020-09-11 22:04:00 +03:00 |
|
|
|
2ccb4eebac
|
Web: Files: Replaced title (People style)
|
2020-09-11 21:46:51 +03:00 |
|
|
|
4d97d6a7ac
|
Web: Clients: Moved setup title to Article/Body
|
2020-09-11 21:45:46 +03:00 |
|
|
|
49ba2c96db
|
Web: Files: Commented useless code
|
2020-09-11 20:43:40 +03:00 |
|
|
|
99a6fd523e
|
Web: Client: Moved organizationName into authReducer
|
2020-09-11 18:03:40 +03:00 |
|
|
|
219ab9cac2
|
Web: Files: fixed Dnd display logic
|
2020-09-11 12:49:59 +03:00 |
|
|
|
a085b53cb8
|
Web: Files: refactoring isLoading
|
2020-09-11 12:22:18 +03:00 |
|
Artem Tarasov
|
76ad46fed1
|
refactoring, moved onLoading and isLoading to redux
|
2020-09-11 11:25:47 +03:00 |
|
|
|
c2d1df3fc3
|
Files: fix create first document
|
2020-09-10 21:34:23 +03:00 |
|
|
|
188b20ff86
|
Merge branch 'master' into feature/files
|
2020-09-10 17:10:19 +03:00 |
|
|
|
3a85553504
|
Files: GetFolderUrl fix
|
2020-09-10 17:09:27 +03:00 |
|
|
|
ea16508688
|
Merge branch 'master' into feature/files
|
2020-09-10 16:32:12 +03:00 |
|
|
|
2413e22323
|
Files: GetFolderUrl fix
|
2020-09-10 16:31:32 +03:00 |
|
Artem Tarasov
|
6a219488e9
|
Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
|
2020-09-10 16:01:30 +03:00 |
|
Artem Tarasov
|
3c4562a03a
|
removed passing onLoading and isLoading in ArticleBodyContent through properties
|
2020-09-10 16:00:02 +03:00 |
|
Vladislav Makhov
|
395b8b392c
|
Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
|
2020-09-10 15:55:06 +03:00 |
|
Vladislav Makhov
|
175b244cd2
|
Fix state bug
|
2020-09-10 15:54:50 +03:00 |
|
|
|
3e059081fe
|
Merge branch 'feature/files' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/files
|
2020-09-10 15:22:54 +03:00 |
|
|
|
36a0bf12f4
|
Web: Files: fixed error handler create file/folder
|
2020-09-10 15:22:44 +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 |
|
|
|
f724848195
|
Merge branch 'master' into feature/files
|
2020-09-10 13:45:15 +03:00 |
|
|
|
0a6c2fda18
|
Files: fix FileConverterQueueScope
|
2020-09-10 13:44:38 +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 |
|
|
|
23b2a310a0
|
Merge branch 'master' into feature/files
|
2020-09-10 12:35:55 +03:00 |
|
|
|
fb0dec0a16
|
Files: fix
|
2020-09-10 12:30:33 +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 |
|
|
|
cc9e0e1374
|
Merge branch 'master' into feature/scope
# Conflicts:
# web/ASC.Web.Core/Notify/NotifyConfiguration.cs
|
2020-09-09 18:18:34 +03:00 |
|
SuhorukovAnton
|
5f62bfb00d
|
scope: bugfix
|
2020-09-09 17:02:51 +03:00 |
|
Alexey
|
5843368d4f
|
Web: Files: Increased the width of the "row update text" field
|
2020-09-09 15:41:28 +03:00 |
|
Artem Tarasov
|
1fd0f3c010
|
fixed redirect edit/view profile in people
|
2020-09-09 15:35:50 +03:00 |
|
|
|
e0febd8890
|
Merge branch 'master' into feature/files
# Conflicts:
# products/ASC.Files/Core/Core/FileStorageService.cs
|
2020-09-09 13:49:25 +03:00 |
|
|
|
a70b890581
|
Notify: rename
|
2020-09-09 13:43:39 +03:00 |
|
|
|
b674bc2f2f
|
Merge branch 'master' into feature/files
|
2020-09-08 17:36:47 +03:00 |
|
|
|
c87fd2cfdb
|
Files: share fix
|
2020-09-08 17:36:22 +03:00 |
|
|
|
c468c5e6cc
|
Merge branch 'master' into feature/files
|
2020-09-08 17:03:19 +03:00 |
|
|
|
ad51a6bf29
|
Files: fix
|
2020-09-08 17:00:29 +03:00 |
|
|
|
98429ce4ab
|
Merge branch 'master' into feature/files
|
2020-09-08 16:34:21 +03:00 |
|
|
|
92a72d7983
|
Files: Tag. Fix
|
2020-09-08 16:33:39 +03:00 |
|
|
|
765558b7b1
|
Merge branch 'master' into feature/files
|
2020-09-08 16:23:12 +03:00 |
|
|
|
f8b3382a42
|
Files: tagDao. Fix
|
2020-09-08 16:22:45 +03:00 |
|
|
|
893f7be135
|
Merge branch 'master' into feature/files
|
2020-09-08 16:11:09 +03:00 |
|
|
|
187e5de648
|
TagDao: fix
|
2020-09-08 16:10:18 +03:00 |
|
|
|
d30026b82f
|
Merge branch 'master' into feature/files
|
2020-09-08 15:20:05 +03:00 |
|
|
|
f464e031b8
|
Notify: fix
|
2020-09-08 11:42:13 +03:00 |
|
|
|
00f913794d
|
Web: Files: fixed arrow button
|
2020-09-08 11:16:03 +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 |
|
|
|
886c7d6464
|
Merge branch 'master' into feature/files
|
2020-09-07 18:16:33 +03:00 |
|
|
|
d9783ecf26
|
Web: Common: fixed sort-combobox styles, added isMobile prop
|
2020-09-07 17:31:36 +03:00 |
|
|
|
96df0ab8ca
|
Api: added payment settings
|
2020-09-07 16:53:39 +03:00 |
|
SuhorukovAnton
|
80198032a4
|
scope: refactoring
|
2020-09-07 15:01:15 +03:00 |
|
|
|
c7cb291668
|
Merge branch 'feature/files' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/files
|
2020-09-07 13:55:24 +03:00 |
|
|
|
a2f050590b
|
Update yarn.lock files
|
2020-09-04 21:04:05 +03:00 |
|
|
|
49f5166517
|
Web: Files: Added route to Error520
|
2020-09-04 20:35:49 +03:00 |
|
|
|
fb53f4f1f1
|
Web: People: Added route to Error520
|
2020-09-04 20:35:21 +03:00 |
|
|
|
0432158a0f
|
Web: Files: fixed files page crash
|
2020-09-04 19:10:24 +03:00 |
|
|
|
020ccfd7d4
|
Scope: fix
|
2020-09-04 14:33:44 +03:00 |
|
|
|
f48574a809
|
Merge branch 'master' into feature/scope
|
2020-09-04 11:26:03 +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 |
|
Artem Tarasov
|
72476521cd
|
Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
|
2020-09-02 18:03:27 +03:00 |
|
Artem Tarasov
|
17d5e7fb95
|
refactoring styles
|
2020-09-02 17:58:21 +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 |
|
|
|
6bf251bb8e
|
Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
|
2020-09-01 18:34:23 +03:00 |
|
|
|
0152274029
|
Web: Clients: Fixed workbox.expiration.Plugin is not a constructor
|
2020-09-01 18:34:06 +03:00 |
|
Artem Tarasov
|
dfb32288e8
|
Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
|
2020-09-01 18:32:48 +03:00 |
|
Artem Tarasov
|
3778ca9aea
|
refactoring
|
2020-09-01 18:32:15 +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 |
|
