Commit Graph

7574 Commits

Author SHA1 Message Date
deabd31690 Web: People: Added TreeFolderLoader 2020-09-24 14:22:17 +03:00
TatianaLopaeva
a99796c122 Changed padding by figma layout 2020-09-24 14:14:47 +03:00
TatianaLopaeva
89f11d6484 Refactoring button/index 2020-09-24 14:11:34 +03:00
b04f22b6e5 Web: Moved TreeFolderLoader to ASC.Web.Common 2020-09-24 13:58:18 +03:00
97539afc02 Web: People: Added HeadlineLoader 2020-09-24 13:42:32 +03:00
f2b0cdf1af Web: Moved HeadlineLoader to ASC.Web.Common 2020-09-24 13:37:54 +03:00
TatianaLopaeva
c82b0237d3 Merge branch 'feature/files' into feature/payments-enterprise 2020-09-24 13:06:46 +03:00
TatianaLopaeva
5d01d660a5 Return lock.png 2020-09-24 13:05:17 +03:00
4c214e2ff2 Merge branch 'feature/files' into feature/loading-acceleration 2020-09-24 12:56:52 +03:00
8094848d05 Settings: fix 2020-09-24 12:45:02 +03:00
TatianaLopaeva
59716a184b Deleted png images 2020-09-24 12:14:56 +03:00
2c18950df8 Web: Files: fixed display of icons for ipad 2020-09-24 12:09:01 +03:00
TatianaLopaeva
6021ea4a76 Deleted png images 2020-09-24 12:01:08 +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
TatianaLopaeva
32b76b88f6 Hiding the payments module 2020-09-23 17:59:01 +03:00
TatianaLopaeva
e5cf2db796 Refactoring toast 2020-09-23 17:45:02 +03:00
01abc6d4f1 Web: Files: Added default loader before react is ready 2020-09-23 17:20:51 +03:00
0028707da6 Web: Files: Formatted file 2020-09-23 17:18:01 +03:00
TatianaLopaeva
e515be4271 Refactoring styles, actions and reducer 2020-09-23 16:58:02 +03:00
TatianaLopaeva
60cc7c1706 Added setDocumentTitle 2020-09-23 15:41:12 +03:00
TatianaLopaeva
1849e3712d Merge branch 'feature/files' into feature/payments-enterprise 2020-09-23 15:25:23 +03:00
TatianaLopaeva
1a0881d58a Refactoring styles 2020-09-23 14:44:27 +03:00
Artem Tarasov
202b277f3d web: components: bump version 2020-09-23 14:13:02 +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
ec6dc5aa46 fix merge 2020-09-23 14:11:39 +03:00
Artem Tarasov
b4fe26e4fe Web: Files: fixed style of TreeFolders and TreeSettings 2020-09-23 14:11:35 +03:00
Artem Tarasov
b09e770834 Web: Components: tree-menu: fixed margin-left of swithcer 2020-09-23 14:09:04 +03:00
a085e8ef38 Merge branch 'master' into feature/release-11.0.0
# Conflicts:
#	web/ASC.Web.Api/Controllers/SettingsController.cs
#	web/ASC.Web.Core/Utility/TenantExtra.cs
2020-09-23 14:00:24 +03:00
6f5cc4a447 Api: fix 2020-09-23 13:55:39 +03:00
4c7983fe7c Settings: fix 2020-09-23 13:22:23 +03:00
e2c53e21d1 moved from release/11 4414f77b 2020-09-23 12:41:32 +03:00
TatianaLopaeva
ee148a0b23 Refactoring styles 2020-09-23 11:08:41 +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
a2be460357 Merge branch 'feature/files' into feature/loading-acceleration
# Conflicts:
#	products/ASC.Files/Client/src/components/Article/Body/index.js
#	products/ASC.Files/Client/src/store/files/actions.js
2020-09-22 19:11:45 +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
Artem Tarasov
a46bdc9b2b Web: Files: fixed size of sorting block on tablet 2020-09-22 17:57:36 +03:00
075798b90c moved from release/11 4414f77b 2020-09-22 17:17:17 +03:00
TatianaLopaeva
27774c97bd Refactoring styles for headerContainer and buttonContainer (added grid for desktop) 2020-09-22 17:08:18 +03:00
e6f39b1092 web: components: bump version 2020-09-22 17:07:20 +03:00
4892f01960 Web: Components: fixed context menu clickability 2020-09-22 17:06:58 +03:00
Alexey Kostenko
744f7cdfb6 Web: People: Removed forced copying of invitation link when opening ModalDialog 2020-09-22 16:14:35 +03:00
Alexey Kostenko
634534afbb Web: Common: Bump version 2020-09-22 15:49:42 +03:00
Alexey Kostenko
16ed13b745 Web: Common: Fix mobile ArticleBody styles 2020-09-22 15:49:09 +03:00
Artem Tarasov
33903723fd web: common: bump version 2020-09-22 15:44:05 +03:00
Artem Tarasov
4d90d03407 web: components: bump version 2020-09-22 15:43:56 +03:00
Artem Tarasov
8748a0fc52 Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files 2020-09-22 15:43:15 +03:00
Artem Tarasov
964cd4a0ec Web: People: deleted unusing variable 2020-09-22 15:42:57 +03:00
TatianaLopaeva
41930dcb38 Changed min-width for containers 2020-09-22 15:36:29 +03:00