e2f977ce17
Merge branch 'develop' into feature/optimization
2021-09-15 11:47:29 +03:00
03d8d560ba
Web: Hide internal login from personal mode
2021-09-14 16:44:39 +03:00
551c623541
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/new-campaigns
...
# Conflicts:
# packages/asc-web-components/campaigns-banner/index.js
# products/ASC.Files/Client/src/components/Article/Body/index.js
2021-09-08 14:36:10 +03:00
fa1d016554
Web: Common: fixed banner translations
2021-09-07 18:34:30 +03:00
6ee8033097
Web: Common: fixed warning
2021-09-06 12:30:58 +03:00
f53d7eb718
Web: Common: fixed article unpin
2021-08-18 17:17:45 +03:00
b7df3903dd
Web: Files: fixed the hiding of the article
2021-08-18 15:52:27 +03:00
48c6d35a20
Web: AuthStore: Removed useless code
2021-08-17 16:32:19 +03:00
e60815b15d
Web: Refactoring and API calls optimization
2021-08-13 20:32:50 +03:00
17eaf17b7d
Web: Common: Add check if store is initialized.
2021-08-12 14:41:12 +03:00
3f56790c85
Fix bug 51365: update avatar in header
2021-08-11 10:18:10 +03:00
Artem Tarasov
deeb497a9e
Web: Common: AuthStore: at logout added a condition for going to the login page if personal is true
2021-08-03 11:03:19 +03:00
e81c3df0be
Added displaying version from appsettings.json (api/2.0/settings.json)
2021-07-14 17:31:06 +03:00
b4c4625f3f
Moved getting firebase config to API method /api/2.0/settings.json
2021-07-09 18:28:08 +03:00
3d662a53ee
Web: Added transition to the preparation page.
2021-07-01 12:12:09 +03:00
bac090e180
Merge branch 'develop' into feature/personal
...
# Conflicts:
# products/ASC.People/Client/src/pages/Profile/Section/Body/index.js
2021-06-11 13:11:08 +03:00
0663ed7f16
Merge branch 'develop' into feature/backup
...
# Conflicts:
# packages/asc-web-common/api/settings/index.js
# web/ASC.Web.Client/public/locales/en/Settings.json
# web/ASC.Web.Client/public/locales/ru/Settings.json
2021-06-10 11:56:32 +03:00
41ef020616
Web: Common: added backupCodes in tfa store
2021-06-08 14:19:36 +03:00
Vladislav Makhov
61abe6a2fc
web: common: fix default page
2021-06-03 15:52:07 +03:00
Vladislav Makhov
4a3b61dda8
web: common: fix default page
2021-06-03 15:48:19 +03:00
Vladislav Makhov
889bba78b1
web: common: fix default value
2021-06-03 10:32:33 +03:00
Vladislav Makhov
2ae98f6cf4
web: common: rename isPersonal to personal according to settings api key
2021-06-03 10:30:09 +03:00
Vladislav Makhov
1e8563ed2a
web: common: add isPersonal key
2021-06-02 16:42:59 +03:00
7026b19db0
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/two-factor-auth
2021-05-31 09:23:53 +03:00
49c77907bd
Web: Common: fixed error message
2021-05-30 22:48:04 +03:00
f9feb35afc
Merge branch 'develop' into feature/backup
2021-05-30 20:57:01 +03:00
f993108d69
Web: Common: commentary changes
2021-05-30 17:26:30 +03:00
a088e020ad
Web: Delete useless code and Refactoring.
2021-05-27 13:22:53 +03:00
fc822e5ad5
Web: Fix setModuleInfo usage
2021-05-20 11:27:50 +03:00
408f432be6
Web: Common: added urls on authenticator app
2021-05-20 06:37:56 +03:00
b2611343b6
Web: Common: get old backup codes
2021-05-20 01:44:03 +03:00
37267b624f
Web: Common: added method for login with code and cookie
2021-05-19 18:21:40 +03:00
b1b6bdc516
Web: Common: refactoring tfa store
2021-05-19 03:48:13 +03:00
20403e2c98
Web: Common: reset tfa app
2021-05-17 23:28:52 +03:00
e87e0272ae
Web: Common: get tfa backup codes
2021-05-17 17:32:12 +03:00
d34e1eeaa6
Web: Common: deleted console.log
2021-05-17 16:54:21 +03:00
cce7b94d5d
Web: Common: deleted console.log
2021-05-17 16:52:38 +03:00
fadd46112c
Web: Common: added login with tfa code method, fixed url
2021-05-17 16:33:01 +03:00
f5998b650a
Web: Common: added login with tfa code method
2021-05-17 16:32:40 +03:00
77f17d55b6
Web: Common: redirect on confirm page
2021-05-14 15:59:15 +03:00
9b54835996
Web: Common: get secret key and qr
2021-05-14 15:58:50 +03:00
e84fc5b5e3
Web: Common: redirect on confirm link
2021-05-12 12:10:08 +03:00
7a27280dc3
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/two-factor-auth
2021-05-07 14:49:44 +03:00
7c2f36635b
Web: Common: refactoring
2021-05-07 14:32:00 +03:00
221edc5c33
Web: Common: get tfa settings
2021-05-07 14:22:21 +03:00
0f07cdb9e9
Web: Settings: Backup: Added learn more ink to the third party resource component.
2021-05-06 12:41:58 +03:00
daef594561
Web: Packages: added tfa store
2021-05-05 14:59:08 +03:00
026306d7ca
Web: Login: Fix hard-coded list of trusted domains on registration
2021-05-04 15:35:09 +03:00
3ede66f9cd
Web: Settings: Backup: Added input with folder path. Added panel with only common documents.
2021-04-29 19:39:35 +03:00
c6a08a50f9
Web: Fixed language for users then not changed language at profile yet.
2021-04-27 11:39:16 +03:00
Alexey Kostenko
707f9bab50
Web: Common: Added proxy to OAuth login URL
2021-04-23 13:17:40 +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
TatianaLopaeva
ab10641b45
Web: Rename teamTemplate.
2021-04-16 17:10:37 +03:00
TatianaLopaeva
052157d1fe
Web: Rename functions.
2021-04-16 15:35:02 +03:00
TatianaLopaeva
e738cab4a2
Web: Added Error message & Added loader.
2021-04-15 19:51:59 +03:00
TatianaLopaeva
ff370259e9
Web: Added "learn more and help url for common setting.
2021-04-13 14:47:46 +03:00
TatianaLopaeva
3487e40c51
Web: Settings: Added logic for team template, added getCustomSchema.
2021-04-13 14:34:04 +03:00
Alexey Kostenko
ec6c1df3cf
Merge branch 'develop' into feature/oauth2.0
2021-04-08 11:59:08 +03:00
96d67be68c
Web: Fix hashSettings setup
2021-04-08 10:24:06 +03:00
c314b6e192
Web: Change bad language setup
2021-04-07 16:33:00 +03:00
TatianaLopaeva
8419167825
Merge branch 'release/v0.1.0' of github.com:ONLYOFFICE/AppServer into release/v0.1.0
2021-04-07 13:35:39 +03:00
TatianaLopaeva
cdef097fdd
Web: Fixed hiding header when switching group.
2021-04-07 13:35:32 +03:00
Alexey Kostenko
aad5255cd8
Web: Common: Fixed setting user culture
2021-04-07 12:19:12 +03:00
Alexey Kostenko
866a1bfa68
Web: People: Removed unused method
2021-04-05 13:36:04 +03:00
Alexey Kostenko
e333e7e82d
Web: People: Clear interval if getter token window is closed (connecting providers)
2021-04-04 16:53:27 +03:00
Alexey Kostenko
df635f3bfd
Web: Login/Common: Clear interval if getter token window is closed
2021-04-04 16:39:35 +03:00
Vladislav Makhov
555bb28e47
web: common: remove unused imports
2021-04-02 15:36:40 +03:00
Vladislav Makhov
ff04684f53
web: remove unused code
2021-04-02 13:49:42 +03:00
Vladislav Makhov
cb10e850cd
web: common: switch to makeAutoObservable, add action setIsEncryptionSupport
2021-04-01 12:42:23 +03:00
Vladislav Makhov
1a66373c16
web: fix defaultPage
2021-03-30 15:01:25 +03:00
Vladislav Makhov
be3c97bce2
web: fix opening Files as default page, if desktop client uses
2021-03-30 13:05:52 +03:00
Alexey Kostenko
7ff66e894a
Web: Login: Render only available providers for login
2021-03-26 17:19:26 +03:00
Alexey Kostenko
1e17f4c4ae
Web: Common: Added api for oauth login
2021-03-24 16:49:42 +03:00
a8a6121e59
Web: Proxy fixes
2021-03-22 17:35:33 +03:00
d568693154
Big Fix commit:
...
+ Added new Clients for CRM/Products
+ Removed old fake coming-soon pages
+ Added combineUrl and AppSettingsConfig with proxyUrl
+ Added new fields to modules info on Server
+ Fixed work with icon and image urls
+ Added CRM/Projects to nginx/onlyoffice.conf
+ Applied combineUrl in studio links
+ Added and applied "id" field in package.json of all Clients
+ Added new bat files CrmClient.bat and ProjectsClient.bat
+ Fixed ProductClassName for Files
2021-03-22 00:34:21 +03:00
741fca254f
Web: Fixed usage of auth.settingsStore
2021-03-19 19:02:43 +03:00
f3f4037282
Web: Fixed Wizard
2021-03-18 21:54:03 +03:00
86a63e6330
Web: Client: fixed createUser form
2021-03-17 16:35:45 +03:00
1cf7415db7
Web: Added changing of base href on page load
2021-03-13 18:29:26 +03:00
ad8d6d89d2
Web: Shell: Added virtualPath (proxy: /appserver)
2021-03-13 16:03:31 +03:00
e8e78604f1
Web: Added products/apps dynamic loading
2021-03-12 13:52:30 +03:00
877016d8e3
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
2021-03-05 12:41:08 +03:00
TatianaLopaeva
e81d2c8bb7
Web: Common: Fixed logoUrl.
2021-03-05 11:01:49 +03:00
28a798c542
Web: Fixed work with translations + refactoring:
...
+ Login re-written to functional component
+ Replaced css to scss
2021-03-04 19:09:46 +03:00
684c0e777f
Web: Refactoring
2021-03-03 14:46:37 +03:00
4db48870cf
Web: SettingsStore: Fixed warnings of mobx
2021-03-03 14:46:05 +03:00
8da0cbcb63
Web: Fixed displaying login errors
2021-03-03 14:09:00 +03:00
TatianaLopaeva
0a97830634
Web: Common: Fix icon for menu.
2021-03-02 21:16:50 +03:00
8ee7563caf
Web: Client: fixed mobx warnings
2021-03-01 18:15:11 +03:00
Vladislav Makhov
ea7697d461
web: common: fix import
2021-03-01 12:30:21 +03:00
Vladislav Makhov
1695b9649d
web: common: fix title
2021-03-01 12:03:12 +03:00
Artem Tarasov
9b27d51ac5
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
...
# Conflicts:
# products/ASC.Files/Client/src/components/Article/Body/ThirdPartyList.js
# products/ASC.Files/Client/src/components/pages/VersionHistory/Section/Body/index.js
# products/ASC.Files/Client/src/components/panels/SharingPanel/AccessComboBox.js
# products/ASC.Files/Client/src/components/panels/SharingPanel/linkRow.js
# products/ASC.Files/Client/src/helpers/desktop.js
# products/ASC.Files/Client/src/i18n.js
# products/ASC.Files/Client/src/store/FilesStore.js
# products/ASC.Files/Client/src/store/SettingsStore.js
# products/ASC.Files/Client/src/store/ThirdPartyStore.js
# products/ASC.Files/Client/src/store/TreeFoldersStore.js
# products/ASC.Files/Client/src/store/UploadDataStore.js
# products/ASC.Files/Client/src/store/VersionHistoryStore.js
# products/ASC.People/Client/src/helpers/converters.js
# products/ASC.People/Client/src/helpers/people-helpers.js
2021-02-25 17:57:32 +03:00
Artem Tarasov
69ed46e8ae
Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces
...
# Conflicts:
# products/ASC.People/Client/src/components/Article/Body/index.js
# web/ASC.Web.Login/src/Login.jsx
2021-02-25 15:27:36 +03:00
Artem Tarasov
fe7cb5364d
Web: Common: chsnged component hierarchy
2021-02-25 11:04:22 +03:00
