Commit Graph

1125 Commits

Author SHA1 Message Date
69bca43c6c web: common: bump version 2020-10-16 15:58:30 +03:00
f2fcf077a2 Web: Common: Fixed start PageLayout story and README 2020-10-16 15:56:35 +03:00
0181514267 Web: Common: Fixed self link 2020-10-16 15:55:47 +03:00
1a484f1805 Web: Common: Applied prettier style fix 2020-10-16 15:38:04 +03:00
7251a1e4d8 Web: Common: Fixed error handling 2020-10-16 15:24:37 +03:00
Ilya Oleshko
3e66f95546 Merge branch 'feature/files' into feature/selectors-refactoring 2020-10-15 13:39:31 +03:00
TatianaLopaeva
14bb36900c Update yarn.lock files 2020-10-15 11:22:58 +03:00
TatianaLopaeva
917cbe8a38 web: common: bump version 2020-10-15 10:56:17 +03:00
TatianaLopaeva
d4d7c9db0d Web: Common: fixed changing language of title toastr 2020-10-15 10:55:47 +03:00
ea97ca05c2 Update yarn.lock files 2020-10-14 17:57:29 +03:00
d442e490f4 web: common: bump version 2020-10-14 17:47:23 +03:00
53c77d1a81 Web: Common: Removed useless folder param from API Files->getFolder with filter 2020-10-14 17:46:40 +03:00
bac77e0ebd Merge branch 'feature/files' into feature/selectors-refactoring
# Conflicts:
#	products/ASC.Files/Client/src/components/Article/MainButton/index.js
2020-10-13 18:17:31 +03:00
49f5a52433 Update yarn.lock files 2020-10-13 16:52:17 +03:00
2884bd8de3 web: common: bump version 2020-10-13 16:33:22 +03:00
746ecc7f40 Web: Clients: Fixed applying single cursor on loading 2020-10-13 16:20:49 +03:00
5d76e7e6b0 Web: Redesigned displaying of loading processes 2020-10-13 15:51:14 +03:00
bcbefb8f26 Merge branch 'feature/files' into feature/selectors-refactoring
# Conflicts:
#	products/ASC.Files/Client/src/components/Article/Body/TreeSettings.js
#	products/ASC.Files/Client/src/components/pages/Settings/Section/Body/index.js
#	products/ASC.Files/Client/src/components/pages/Settings/index.js
#	products/ASC.Files/Client/src/store/files/actions.js
#	products/ASC.Files/Client/src/store/files/reducers.js
#	products/ASC.Files/Client/src/store/files/selectors.js
2020-10-13 15:08:22 +03:00
Artem Tarasov
24a0fe17b4 web: common: bump version 2020-10-13 13:45:40 +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
3d34978bf0 Merge branch 'feature/files' into feature/selectors-refactoring 2020-10-13 13:39:10 +03:00
01f00d49ae web: common: bump version 2020-10-13 13:32:46 +03:00
1d4b3785bb Merge branch 'feature/files' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/files 2020-10-13 13:31:24 +03:00
0712677297 Web: Common: fixed MediaViewer close, fixed share dropdown styles 2020-10-13 13:30:26 +03:00
TatianaLopaeva
4ef2db2ed0 Web: Update yarn.lock 2020-10-13 12:37:34 +03:00
TatianaLopaeva
dbdc134ef0 web: common: bump version 2020-10-13 12:18:48 +03:00
TatianaLopaeva
ac697d28fc Web: Added getLanguage selector 2020-10-13 12:17:45 +03:00
TatianaLopaeva
f0299db016 Update yarn.lock 2020-10-13 11:14:09 +03:00
TatianaLopaeva
8d09a45fab web: common: bump version 2020-10-13 10:54:49 +03:00
TatianaLopaeva
6a0e34a7a2 Web: Common: Added language into array of useEffect 2020-10-13 10:52:44 +03:00
577fc5ac70 Merge branch 'feature/files' into feature/selectors-refactoring
# Conflicts:
#	products/ASC.Files/Client/src/components/pages/DocEditor/index.js
2020-10-12 15:36:26 +03:00
Artem Tarasov
8453611714 Web: Common: added SettingsFiles loader 2020-10-12 14:52:49 +03:00
ee6307e288 Web: People: Added hack for build machine only 2020-10-09 19:14:48 +03:00
3afd5dedda web: common: bump version 2020-10-09 19:07:10 +03:00
f4ed52d985 Web: Added and applied new API method getDocServiceUrl 2020-10-09 19:06:50 +03:00
a01fb879a4 Web: Common: remove duplicate getIsLoaded selector 2020-10-09 18:28:02 +03:00
615f514bfd Merge branch 'feature/files' into feature/selectors-refactoring
# Conflicts:
#	products/ASC.Files/Client/src/components/pages/Home/Section/Body/index.js
#	products/ASC.Files/Client/src/components/pages/Home/Section/Filter/index.js
#	web/ASC.Web.Common/src/store/auth/selectors.js
2020-10-09 17:24:50 +03:00
Artem Tarasov
128d25ef9b web: common: bump version 2020-10-09 16:11:00 +03:00
Artem Tarasov
421d71c4fe Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
# Conflicts:
#	web/ASC.Web.Common/src/components/Loaders/index.js
2020-10-09 15:58:50 +03:00
Artem Tarasov
5a5fb5b036 Web: Common: added ProfileViewLoader 2020-10-09 15:57:04 +03:00
1dfd7afe1c Update yarn.lock files 2020-10-09 15:07:41 +03:00
4a57d0d646 web: common: bump version 2020-10-09 14:58:32 +03:00
065c8daaa0 Web: People: Applied Filter loader 2020-10-09 14:57:43 +03:00
226d4c6cc5 Web: Files: Add and applied Filter loader 2020-10-09 14:23:40 +03:00
a969f26f05 Web: Common: fixed getFoldersTree api 2020-10-09 00:23:36 +03:00
cedca7b3c3 Web: Common: added rootFolderType to getFoldersTree api 2020-10-08 23:56:57 +03:00
4e84d5f5ae Merge branch 'feature/files' into feature/selectors-refactoring
# Conflicts:
#	web/ASC.Web.Common/package.json
2020-10-08 16:58:09 +03:00
798170e402 web: common: bump version 2020-10-08 12:43:21 +03:00
34575dab83 Merge branch 'feature/files' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/files 2020-10-08 12:43:07 +03:00
e3fde6fd77 Web: Common: fixed main height 2020-10-08 12:42:59 +03:00