Commit Graph

7457 Commits

Author SHA1 Message Date
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
5e8ae65235 web: common: bump version 2020-09-22 15:33:31 +03:00
6101dc32db Web: Common: fixed main styles 2020-09-22 15:33:12 +03:00
Artem Tarasov
9a2f04008d Web: People: fixed styles 2020-09-22 15:18:36 +03:00
Artem Tarasov
16fbaa1ba6 Web: Files: fixed styles(color in row, margin in header) 2020-09-22 15:16:46 +03:00
Artem Tarasov
0dbbbc3ab6 Web: Components: fixed color props passing in row-content 2020-09-22 15:14:44 +03:00
Artem Tarasov
9632515ea1 Web: Common: fixed color of label in sort-combobox 2020-09-22 15:10:55 +03:00
5778b9bb62 Web: Files: Added RowsLoader for files list loading 2020-09-22 15:09:06 +03:00
TatianaLopaeva
f9ca91fe51 Refactoring styles 2020-09-22 14:56:52 +03:00
fe0d4a16b5 web: common: bump version 2020-09-22 14:15:22 +03:00
c65fa43050 Web: Common: fixed main style 2020-09-22 14:14:30 +03:00
TatianaLopaeva
2ae3926d1b Added inserts line breaks when words are exceeding the width of the container, to avoid overflow. 2020-09-22 11:43:08 +03:00
TatianaLopaeva
87ee165027 Refactoring styles 2020-09-22 10:31:33 +03:00
2c3a8dfc44 web: common: bump version 2020-09-22 10:16:38 +03:00
0c2da99315 Merge branch 'feature/files' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/files 2020-09-22 10:15:45 +03:00
6936c060e5 Web: Common: fixed MediaViewer styles 2020-09-22 10:15:37 +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
b761e83e22 web: components: bump version 2020-09-22 09:23:56 +03:00