27e732e9a3
Web: Login: Added usage of new API /authentication.json parameter "session"
2021-12-01 10:56:50 +03:00
5bb3602964
Web: Common: Api: Fixed copyAs api call params
2021-11-30 08:20:55 +03:00
0b9a9b633d
Web: Common: Api: Added fileCopyAs action
2021-11-29 16:31:40 +03:00
f675415228
Merge branch 'master' into release/v1.1.0
...
# Conflicts:
# lerna.json
# packages/asc-web-common/package.json
# packages/asc-web-components/package.json
# packages/browserslist-config-asc/package.json
# packages/debug-info/package.json
# products/ASC.CRM/Client/package.json
# products/ASC.Calendar/Client/package.json
# products/ASC.Files/Client/package.json
# products/ASC.Files/Client/public/locales/en/SelectFile.json
# products/ASC.Files/Client/public/locales/en/SelectFolder.json
# products/ASC.Files/Client/public/locales/en/Translations.json
# products/ASC.Files/Client/public/locales/ru/Translations.json
# products/ASC.Files/Client/src/components/Article/MainButton/index.js
# products/ASC.Mail/Client/package.json
# products/ASC.People/Client/package.json
# products/ASC.People/Client/public/locales/en/Translations.json
# products/ASC.People/Client/public/locales/ru/Translations.json
# products/ASC.People/Client/src/components/Article/MainButton/index.js
# products/ASC.People/Client/src/pages/ProfileAction/Section/Body/createUserForm.js
# 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-11-21 14:26:20 +03:00
2eb6843e46
Web: Editor: Added conditions for creating a file in my documents folder when filling out a form.
2021-11-19 10:28:57 +03:00
9e4b29a136
Web: Common: Api: Added new data parameters
2021-11-17 16:36:50 +03:00
Artem Tarasov
f33d99c9c0
Web: People/Common: added sorting of groups in the tree
2021-11-16 19:27:27 +03:00
f06283bb1a
Fix displayName of current user after creation/update if user's display name with diacritics
2021-11-13 20:18:58 +03:00
0bd634dd16
Web: Files: added className for tree root folders
2021-11-12 15:36:56 +03:00
04d3d5253f
Fix displayName of current user after changing culture of Profile
2021-11-10 21:31:39 +03:00
f5da85049c
Fix Bug 53524 - Client.Profile|List: User's display name with diacritics invalid
2021-11-09 19:32:15 +03:00
677f7d73e3
Web: Common: Api: Added encoding for string folderId
2021-11-09 17:55:27 +03:00
d0229aa17f
Merge pull request #370 from ONLYOFFICE/bugfix/fix-operations-notifications
...
Bugfix/fix operations notifications
2021-10-05 12:32:39 +03:00
9ce696e624
Web: Studio: Init Debug Info
...
+ Added About version from package.json
+ Fix DocumentServer version
2021-10-04 17:08:03 +03:00
822aba4713
Web: Files: fixed download action
2021-10-03 14:47:28 +03:00
b2676b4df8
Web: Common: Api: Removed debugger
2021-09-28 12:33:39 +03:00
9bd9bc3e33
Web: Common: Api: Changed request method from POST to GET (mobile app issue)
2021-09-28 12:32:09 +03:00
b88a6f5ddf
Merge branch 'release/1.0.0' of https://github.com/ONLYOFFICE/AppServer into release/1.0.0
2021-09-15 15:56:28 +03:00
3c77982f4a
Fix Bug 51819 Web: Editor. Fixed openEdit
2021-09-15 14:52:36 +03:00
1ca554f82d
Merge branch 'develop' into release/1.0.0
...
# Conflicts:
# packages/asc-web-components/campaigns-banner/index.js
# web/ASC.Web.Client/src/Shell.jsx
2021-09-15 14:45:33 +03:00
03d8d560ba
Web: Hide internal login from personal mode
2021-09-14 16:44:39 +03:00
b70a9cd115
Web: Common: Fixed response for response type "text".
2021-09-10 11:52:06 +03:00
1501c1d91e
FIx Bug 52243 Client.Editor. There is no prompt message indicating that the file was saved successfully when using Save Copy As.
2021-09-08 15:46:52 +03:00
ccd7532161
Merge branch 'develop' into release/1.0.0
...
# Conflicts:
# products/ASC.Files/Client/src/components/Article/Body/index.js
# products/ASC.Files/Client/src/pages/Home/Section/Header/index.js
2021-08-27 17:45:52 +03:00
ff7f3926ce
Merge branch 'develop' into feature/table-view
...
# Conflicts:
# packages/asc-web-common/components/PageLayout/index.js
# products/ASC.Files/Client/src/pages/Home/Section/Header/index.js
# public/locales/de/Common.json
# public/locales/it/Common.json
# public/locales/lo/Common.json
# public/locales/pt-BR/Common.json
# public/locales/ro/Common.json
2021-08-26 16:05:15 +03:00
c66268a9c2
Merge branch 'develop' into release/1.0.0
...
# Conflicts:
# products/ASC.Files/Client/public/locales/en/Translations.json
# products/ASC.Files/Client/public/locales/ru/Translations.json
# products/ASC.Files/Client/src/helpers/utils.js
2021-08-26 13:49:25 +03:00
c81a28f48f
Web: Common: fixed onError
2021-08-25 17:54:08 +03:00
8727b504b7
Merge branch 'develop' into feature/table-view
...
# Conflicts:
# products/ASC.Files/Client/src/HOCs/withFileActions.js
# products/ASC.Files/Client/src/pages/Home/Section/Body/TilesView/FileTile.js
2021-08-25 16:48:07 +03:00
c295f1a77c
Web: Files: fixed routing to the service folder
2021-08-20 13:23:53 +03:00
3b8cf0a275
Merge branch 'develop' into feature/file-folder-selectors
...
# Conflicts:
# products/ASC.Files/Client/public/locales/en/Translations.json
# products/ASC.Files/Client/public/locales/ru/Translations.json
# products/ASC.Files/Client/src/HOCs/withFileActions.js
# products/ASC.Files/Client/src/helpers/utils.js
# web/ASC.Web.Editor/src/Editor.jsx
2021-08-19 10:08:14 +03:00
e634b5c72f
Web: Editor: Fixed converting file when open in new tab.
2021-08-16 13:17:49 +03:00
e60815b15d
Web: Refactoring and API calls optimization
2021-08-13 20:32:50 +03:00
996b438a6b
Web: Api: Added opportunity to skipLogout on 401 error
2021-08-13 19:24:48 +03:00
6e9ceea8c0
Web: Editor: Added link for insert image and mail merge.
2021-08-13 14:50:24 +03:00
452cfd2b5a
Web: Common: fixed getFoldersTree foldersCount
2021-07-30 18:12:10 +03:00
08d3e9df5e
Web: Files: Optimization: deleted getFiles function.
2021-07-08 13:25:24 +03:00
c5b409a571
Merge branch 'develop' into feature/file-folder-selectors
2021-07-07 11:41:45 +03:00
a325507b0e
WEb: SelectFileFolder: Added custom types of files.
2021-07-02 18:35:38 +03:00
5ef780d40d
Web: Common: Added api methods.
2021-07-01 15:46:36 +03:00
426fce6140
Web: Common: Added api method.
2021-07-01 13:18:43 +03:00
69889cab4c
Merge branch 'develop' into feature/privacy-rooms-page
...
# Conflicts:
# packages/asc-web-common/components/PageLayout/index.js
# products/ASC.Files/Client/src/HOCs/withFileActions.js
# products/ASC.Files/Client/src/helpers/constants.js
# products/ASC.Files/Client/src/pages/Home/Section/Filter/index.js
# products/ASC.Files/Client/src/store/FilesStore.js
2021-06-30 16:28:37 +03:00
f327f42bf8
Web: Common: added filed encrypted to startUploadSession function
2021-06-29 17:54:24 +03:00
Artem Tarasov
a81ba032fa
Web: Files: Thumbnails: removed ThumbnailsStore, createThumbnails func moved to FilesStore, applied createThumbnails func
2021-06-19 09:48:30 +03:00
Artem Tarasov
83549b62cd
Merge branch 'develop' into feature/thumbnails
...
# Conflicts:
# packages/asc-web-common/api/files/index.js
# products/ASC.Files/Client/src/pages/Home/index.js
2021-06-18 12:02:10 +03:00
Artem Tarasov
5034495b28
Web: Files: Thumbnails: added ThumbnailsStore, api for create thumbs
2021-06-18 01:13:49 +03:00
d07273cee8
Web: Files: fixed display of tree menu, added new api for tree menu
2021-06-15 14:15:48 +03:00
ef59a2ac47
Web: Files: added hideConfirmConvert setting
2021-06-11 15:49:32 +03:00
b7ce4a35e7
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/access-rights-admins
...
# Conflicts:
# products/ASC.Files/Server/DocStore
# web/ASC.Web.Client/public/locales/en/Settings.json
# web/ASC.Web.Client/public/locales/ru/Settings.json
# web/ASC.Web.Client/src/components/pages/Settings/categories/security/sub-components/admins.js
# web/ASC.Web.Client/src/components/pages/Settings/index.js
2021-06-09 00:23:12 +03:00
7026b19db0
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/two-factor-auth
2021-05-31 09:23:53 +03:00
f993108d69
Web: Common: commentary changes
2021-05-30 17:26:30 +03:00
b2611343b6
Web: Common: get old backup codes
2021-05-20 01:44:03 +03:00
4e57f2a47f
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/two-factor-auth
2021-05-20 00:47:45 +03:00
37267b624f
Web: Common: added method for login with code and cookie
2021-05-19 18:21:40 +03:00
Alexey Kostenko
f25eb00494
Merge branch 'develop' into feature/access-rights-admins
2021-05-19 18:05:19 +03:00
8785f6151a
Web: Common: fixed reloading login page
2021-05-19 17:17:07 +03:00
3c6f831618
Web: Common: Api: Added removeShareFiles api method
2021-05-19 16:51:43 +03:00
bb8124d1fa
Web: Common: added login with tfa code method
2021-05-17 16:32:22 +03:00
9b54835996
Web: Common: get secret key and qr
2021-05-14 15:58:50 +03:00
ef085ef7df
Web: Files: enable favorites and recent settings
2021-05-14 11:08:57 +03:00
Alexey Kostenko
62c789d68b
Merge branch 'develop' into feature/access-rights-admins
2021-05-11 10:19:31 +03:00
7a27280dc3
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/two-factor-auth
2021-05-07 14:49:44 +03:00
daef594561
Web: Packages: added tfa store
2021-05-05 14:59:08 +03:00
bdc681f94a
Web: Files: Fix favorite flag setup (thirdParty issue)
2021-05-04 11:18:24 +03:00
Alexey Kostenko
17d4b0a4db
Merge branch 'develop' into feature/access-rights-admins
2021-04-29 15:11:50 +03:00
Alexey Kostenko
5f81e5a0ce
Web: Client: Added group button menu, fixed api getListAdmins, the ability to add new administrators
2021-04-29 09:40:55 +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
a46f8ed04a
Web: Common: Fix openEdit query param
2021-04-26 19:02:40 +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
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
Alexey Kostenko
8cb74d14b4
Web: Client/Common: Added thirdParty signup api
2021-04-16 16:34:24 +03:00
a289256846
Web: Files: added ConflictResolveDialog, refactoring files operations
2021-04-16 16:04:50 +03:00
TatianaLopaeva
052157d1fe
Web: Rename functions.
2021-04-16 15:35:02 +03:00
33f5a07c70
Web: Files: fixed search by subfolders
2021-04-15 10:27:23 +03:00
TatianaLopaeva
fc40487de0
Web: Added setCurrentShema and setCustomShema methods, added form validation.
2021-04-14 14:26:26 +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
Artem Tarasov
e304af064b
Web: People: fixed group list query
2021-04-05 16:18:41 +03:00
Alexey Kostenko
3e4424b67b
Web: People/Common: Refactoring
2021-03-25 16:10:10 +03:00
Alexey Kostenko
1e17f4c4ae
Web: Common: Added api for oauth login
2021-03-24 16:49:42 +03:00
Alexey Kostenko
34973b123a
Web: Common: Added api for linking providers and get available linked providers
2021-03-24 14:19:46 +03:00
5dd30c9502
Web: Client: fixed owner change
2021-03-22 20:56:53 +03:00
628f9c8d5c
Web: Common: fixed getShortenedLink
2021-03-22 19:18:30 +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
126bbda1b1
Web: Files: refactoring
2021-03-20 13:17:17 +03:00
75859212ab
Web: People: Fix conversation of Filter to URL and back
2021-03-20 13:16:45 +03:00
deafba32a7
Web: Files: Fix conversation of Filter to URL and back
2021-03-20 12:51:08 +03:00
40557ccedc
Web: Files: fixed filter
2021-03-19 22:16:47 +03:00
97ec05e8ff
Web: People: fixed filter
2021-03-19 20:45:57 +03:00
e63fc30a2e
Web: People: Fixed move to direct link
2021-03-19 16:31:41 +03:00
a25261f242
Web: Files: Fixed move from Folder to Settings and back
2021-03-16 22:47:41 +03:00
8e1f5b30b5
Merge branch 'develop' into feature/workspaces
...
# Conflicts:
# products/ASC.Files/Client/package.json
# products/ASC.Files/Client/yarn.lock
# products/ASC.People/Client/package.json
# products/ASC.People/Client/yarn.lock
# web/ASC.Web.Client/package.json
# web/ASC.Web.Client/src/App.js
# web/ASC.Web.Client/yarn.lock
# web/ASC.Web.Common/package.json
# web/ASC.Web.Components/yarn.lock
# yarn.lock
2021-03-13 16:01:41 +03:00
Vladislav Makhov
66daf1e21f
web: common: remove not needed import
2021-03-12 10:17:38 +03:00
Vladislav Makhov
10763bd9a3
web: people: fix import
2021-03-12 09:10:09 +03:00
Artem Tarasov
fe7cb5364d
Web: Common: chsnged component hierarchy
2021-02-25 11:04:22 +03:00
