Commit Graph

137 Commits

Author SHA1 Message Date
78944a490e Merge branch 'feature/virtual-rooms-1.2' into feature/interface-theme 2022-04-21 18:55:41 +03:00
a9a528ab84 Web: Files: createFormFromTemplate replaced with createFile 2022-04-21 16:57:44 +03:00
e7b4280df2 Web: Files: fixed getOforms 2022-04-21 14:38:14 +03:00
50d627e58c Web: Files: fixed getOforms 2022-04-21 13:57:04 +03:00
Timofey Boyko
8125631485 Web:Common:Api: add new api method 'changeTheme' 2022-04-21 10:23:06 +03:00
11163c3129 Web: Files: added creating forms from the gallery 2022-04-20 14:02:22 +03:00
6dbf77317d Merge branch 'feature/virtual-rooms-1.2' into feature/oforms-gallery 2022-04-18 10:32:31 +03:00
8021b837eb Web: Files: Added ability to cancel requests. 2022-04-15 14:03:20 +03:00
d1d0c54f9e Web: Files: Renamed key for api. 2022-04-13 16:52:29 +03:00
b631b6c7a7 Web: Files: Fixed key. 2022-04-13 16:39:48 +03:00
d07c5e071e Web: Files: Renamed function, refactoring. 2022-04-11 11:14:05 +03:00
3ef7ae85de Web: SelectFolder: Optimization, refactoring. 2022-04-06 18:04:43 +03:00
fc83ee53a8 Merge branch 'feature/virtual-rooms-1.2' into feature/oforms-gallery 2022-04-04 15:18:12 +03:00
006c9c684f Web: Common: API: add skipLogout option 2022-03-31 22:34:32 +03:00
8c782a7903 Web: Files: added OFORMs gallery 2022-03-31 16:10:16 +03:00
ec9fa063f8 Web: Common: fix unlink two-factor app 2022-03-26 13:03:13 +03:00
1922da4ab9 merge 2022-03-24 20:56:51 +03:00
0cd4cb49ed Merge branch 'feature/virtual-rooms-1.2' into feature/login-redesign
# Conflicts:
#	packages/asc-web-components/modal-dialog/index.js
#	packages/asc-web-components/themes/dark.js
#	public/locales/de/Common.json
#	web/ASC.Web.Client/src/Shell.jsx
#	web/ASC.Web.Client/src/components/pages/Confirm/sub-components/createUser.js
#	web/ASC.Web.Login/src/Login.jsx
2022-03-16 11:03:07 +03:00
76b9b03952 Web: Common: add skipLogout option 2022-03-15 14:33:21 +03:00
8a4ab2171d Web:Common:Changed the setMailDomainSettings, setLifetimeAuditSettings requests. Added requests setDNSSettings, getAuditTrailReport to api settings. 2022-03-03 16:04:26 +03:00
2309bc060f Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2 2022-03-02 11:25:08 +03:00
f695684b78 Web:Common:Added requests setPortalPasswordSettings, setMailDomainSettings, setIpRestrictions,setIpRestrictionsEnable, setMessageSettings, setCookieSettings, setLifetimeAuditSettings, setWhiteLabelSettings, restoreWhiteLabelSettings to api settings. 2022-03-02 11:08:48 +03:00
f1dd337c24 Web:Common:Added setPortalRename request to api portal. 2022-03-02 11:06:08 +03:00
32868de412 Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/login-redesign
# Conflicts:
#	packages/asc-web-common/api/settings/index.js
#	public/locales/de/Common.json
2022-02-22 13:53:00 +03:00
7419eb87dc Web: People: Added opportunity to unsubscribe from mailing list on My Profile page (/my?unsubscribe=tips) 2022-02-16 21:34:19 +03:00
16562b1787 Web: Common: get user data from confirm 2022-02-09 14:51:01 +03:00
655ae73a65 Web: Files: Fix refresh last page on delete all items (+ socket refactoring) 2022-02-03 14:57:23 +03:00
4d5ada8381 Web: Common: add get capabilities 2022-01-31 12:32:59 +03:00
aa8903b0ef Web: Files: Added copy method to save in 'oform' format. 2022-01-17 15:54:14 +03:00
3c23f4d892 Merge branch 'hotfix/v1.1.1' into feature/convert-password
# Conflicts:
#	products/ASC.Files/Client/src/components/panels/StyledPanels.js
#	products/ASC.Files/Client/src/components/panels/UploadPanel/FileRow.js
#	products/ASC.Files/Client/src/store/UploadDataStore.js
2021-12-30 14:34:49 +03:00
b047ae3c0b Web: Common: Added password field to api method. 2021-12-22 12:15:56 +03:00
39f172bd22 Merge branch 'release/v1.1.0' of github.com:ONLYOFFICE/AppServer into release/v1.1.0 2021-12-13 17:58:34 +03:00
530d1a18a8 Web: Api: Added property for setEncryptionKeys 2021-12-13 17:58:25 +03:00
2afce477b1 Web: Common: Removed useless code. 2021-12-10 09:30:11 +03:00
51b7921ed4 Web: Edit: Added doc property to api methods for history versions.
# Conflicts:
#	packages/asc-web-common/api/files/index.js
2021-12-08 16:30:26 +03:00
d5a77379b3 Web: Editor: Added api method for restore document version. 2021-12-08 16:28:30 +03:00
317750f909 Web: Added api methods.
# Conflicts:
#	packages/asc-web-common/api/files/index.js
2021-12-08 16:28:25 +03:00
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