Commit Graph

222 Commits

Author SHA1 Message Date
72527ccded Merge branch 'master' into develop
# Conflicts:
#	lerna.json
#	package.json
#	packages/asc-web-common/package.json
#	packages/asc-web-components/package.json
#	products/ASC.CRM/Client/package.json
#	products/ASC.Calendar/Client/package.json
#	products/ASC.Files/Client/package.json
#	products/ASC.Mail/Client/package.json
#	products/ASC.People/Client/package.json
#	products/ASC.Projects/Client/package.json
#	web/ASC.Web.Client/package.json
#	web/ASC.Web.Editor/package.json
#	web/ASC.Web.Login/package.json
2021-05-29 21:57:42 +03:00
d585c0a785 Web: Bumped version to 0.1.10 2021-05-29 21:26:13 +03:00
cda77e1234 Merge branch 'develop' into bugfix/context-actions 2021-05-20 13:24:18 +03:00
fc822e5ad5 Web: Fix setModuleInfo usage 2021-05-20 11:27:50 +03:00
03a71ae131 Merge branch 'bugfix/context-actions' of https://github.com/ONLYOFFICE/AppServer into bugfix/context-actions
# Conflicts:
#	products/ASC.Files/Client/src/components/dialogs/DeleteDialog/index.js
2021-05-19 17:11:46 +03:00
3c6f831618 Web: Common: Api: Added removeShareFiles api method 2021-05-19 16:51:43 +03:00
d55c953805 Web: Files: fixed MediaViewer propTypes 2021-05-19 13:45:37 +03:00
536c6c2f5e Web: Moved custom.scss to @appserver/common
+ Added missing ErrorBoundary
+ Removed useless commented code
2021-05-19 11:14:44 +03:00
07934f6cd9 Web: Common: fixed firefox header 2021-05-18 17:59:34 +03:00
eb628d3703 Merge branch 'develop' into bugfix/enable-favorites-recent-settings 2021-05-14 11:34:10 +03:00
1a58007fcd Web: Common: removed custom selection frame 2021-05-14 11:21:59 +03:00
ef085ef7df Web: Files: enable favorites and recent settings 2021-05-14 11:08:57 +03:00
0d98b05210 Web: Files: fixed icons clickability 2021-05-13 16:57:10 +03:00
f05147eb29 Web: Common: fixed clickability for mobile devices 2021-05-12 16:53:40 +03:00
72ed5e031c Web: Common: hide delete icon from MediaViewer for shared folder 2021-05-12 14:05:54 +03:00
9ea5a131e8 Web: Files: fixed MediaViewer crash 2021-05-12 11:55:34 +03:00
3ae370deed Merge branch 'develop' of https://github.com/ONLYOFFICE/AppServer into develop 2021-05-07 18:54:42 +03:00
6c3244a3e9 Web: Added opportunity to deploy all static clients to build/deploy directory (yarn build && yarn deploy) 2021-05-07 18:54:25 +03:00
95c9c9d1a3 Merge branch 'develop' into feature/portal-modal-dialog 2021-05-06 16:30:31 +03:00
b7af18f636 v0.1.9 2021-05-06 14:57:01 +03:00
71e1468835 Web: Common: fixed MediaViewer styles 2021-05-06 12:52:19 +03:00
605f7d749e Web: Components: FloatingButton: Added rotation on percent === 0 2021-05-04 22:14:42 +03:00
35ef6c27bf Web: Files: removed file format for unselected items 2021-05-04 17:42:06 +03:00
026306d7ca Web: Login: Fix hard-coded list of trusted domains on registration 2021-05-04 15:35:09 +03:00
bdc681f94a Web: Files: Fix favorite flag setup (thirdParty issue) 2021-05-04 11:18:24 +03:00
e61375c348 Merge branch 'hotfix/v0.1.9' of https://github.com/ONLYOFFICE/AppServer into hotfix/v0.1.9 2021-04-30 17:25:32 +03:00
7ba67cf63a Web: Fix click on webView link on ComingSoonPage (CRM, Projects, Mail, Calendar) 2021-04-30 17:25:26 +03:00
bec2690510 Web: fixed files productName 2021-04-30 16:47:47 +03:00
d55b39a653 Web: Files: Added and fix AutoFocus, tabulation and close on errors in ConnectDialog 2021-04-30 14:02:58 +03:00
61695dfb5f Web: Files: Hide Facebook share link (new FB SDK required) 2021-04-29 13:44:37 +03:00
2b6d536590 Merge branch 'release/v0.1.8' of https://github.com/ONLYOFFICE/AppServer into release/v0.1.8 2021-04-27 13:48:38 +03:00
c324693034 Merge branch 'develop' into release/v0.1.8 2021-04-27 12:11:36 +03:00
Alexey Kostenko
a550197bc5 Web: Common: Fixed getAuthProviders api url 2021-04-27 12:02:51 +03:00
c6a08a50f9 Web: Fixed language for users then not changed language at profile yet. 2021-04-27 11:39:16 +03:00
a46f8ed04a Web: Common: Fix openEdit query param 2021-04-26 19:02:40 +03:00
f3610ce7f6 Web: Common: Fix openEdit query param 2021-04-26 19:02:16 +03:00
d2588270cf Merge branch 'master' into develop 2021-04-23 20:16:42 +03:00
cd699e37e2 Files: Fix opening of version 2021-04-23 18:00:05 +03:00
Alexey Kostenko
707f9bab50 Web: Common: Added proxy to OAuth login URL 2021-04-23 13:17:40 +03:00
Alexey Kostenko
b1ef3639c6 Fix 2021-04-22 16:13:02 +03:00
Alexey Kostenko
667a76b95f Oauth: Refactoring 2021-04-22 13:34:42 +03:00
Alexey Kostenko
138fe92f9f OAuth: Refactoring 2021-04-21 16:31:18 +03:00
Alexey Kostenko
691e7d5498 Merge branch 'develop' into feature/oauth2.0 2021-04-21 15:04:26 +03:00
TatianaLopaeva
0f3eb1350b Merge branch 'develop' into feature/team-template
# Conflicts:
#	web/ASC.Web.Client/public/locales/en/Settings.json
#	web/ASC.Web.Client/public/locales/ru/Settings.json
2021-04-20 12:05:19 +03:00
0b0dbb971f Web: Settings: Fix enabledJoin setup 2021-04-19 18:39:00 +03:00
3734027f4f Web: Files: fixed newItem styles 2021-04-19 14:16:42 +03:00
9b6e4ace8b Web: Files: fixed badge for tree menu 2021-04-19 14:08:40 +03:00
Alexey Kostenko
d9860256ec Web: Common/Components: FacebookButton style fix 2021-04-19 09:49:47 +03:00
e586d42d3b Web: Added clickBackdrop() for close unpinned Article on Tablet and Mobile 2021-04-16 20:23:08 +03:00
TatianaLopaeva
ab10641b45 Web: Rename teamTemplate. 2021-04-16 17:10:37 +03:00