Commit Graph

7779 Commits

Author SHA1 Message Date
c41937002f Web: Editor: Added a condition for showing the history restore function. 2021-12-08 16:52:50 +03:00
e771000f8a Web: Editor: Deleted useless code. 2021-12-08 16:46:09 +03:00
3b17a90b1b Web: Editor: Fixed after cherry picking. 2021-12-08 16:45:12 +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
aeb5121331 Web: Editor: Fixed displaying info. 2021-12-08 16:28:30 +03:00
3937082fc9 Web: Editor: Fixed object parameters of history data. 2021-12-08 16:28:30 +03:00
17129ad9d1 Erb: Editor: Renaming. 2021-12-08 16:28:30 +03:00
a3c4577482 Web: Editor: Refactoring. 2021-12-08 16:28:29 +03:00
1983d60e55 Web: Editor: Moved the functionality of converting history and getting the current version into separate functions. 2021-12-08 16:28:29 +03:00
944591cd4d Web: Editor: Added error handler for history function. 2021-12-08 16:28:29 +03:00
71aa1eb474 Web: Editor: Added restore option. 2021-12-08 16:28:29 +03:00
30bd96a4c6 Web: Editor: Fixed opening of revisions. 2021-12-08 16:28:28 +03:00
bc8a7f3dd2 Web: Editor: Removed revisions from versions list. 2021-12-08 16:28:28 +03:00
70cc67b356 Web: Editor: Refactoring. 2021-12-08 16:28:28 +03:00
d20f833889 Web: Editor: Renaming. 2021-12-08 16:28:28 +03:00
d5b2b2a395 Web: Editor: Added error handler for history data. 2021-12-08 16:28:28 +03:00
a79db0fa25 Web: Editor: Added version to the history data. 2021-12-08 16:28:27 +03:00
fcb4e43d55 Web: Editor: Removed side effect - changes of array length. 2021-12-08 16:28:27 +03:00
a6deb7febb Web: Editor: Fixed display of editing date. 2021-12-08 16:28:27 +03:00
7fd1452e81 Web: Editor: Fixed current version of document. 2021-12-08 16:28:27 +03:00
c6265a9cb4 Web: Editor: Fixed getting name and id of user for history. 2021-12-08 16:28:26 +03:00
5fa436eb21 Web: Editor: Fixed getting information of difference of file. 2021-12-08 16:28:26 +03:00
e3eb043c2a Web: Editor: Added new api method for RequestHistory method. 2021-12-08 16:28:26 +03:00
gectokot
ed3a4c85e0 Web: Studio: Moved onItemClick function to utils 2021-12-08 15:25:19 +03:00
674732ee60 Merge branch 'release/v1.1.0' into feature/translate-1.1.0 2021-12-08 15:22:53 +03:00
8441a506af add translations 2021-12-08 15:17:26 +03:00
gectokot
d0a505b844 Web: Studio: HomePage: ModuleTile: Added ability to open unavailable modules in a new tab 2021-12-08 15:17:00 +03:00
gectokot
2e1584f080 Web: Studio: HomePage: Header: Added ability to open unavailable modules in a new tab 2021-12-08 15:16:38 +03:00
gectokot
72666795aa Web: Studio: Homepage: Redesign, added illustration, refactoring 2021-12-08 15:13:29 +03:00
gectokot
b35c06f56e Web: Studio: Homepage: Added styles for external link icon 2021-12-08 15:09:57 +03:00
gectokot
9b604dbd57 Web: Studio: Homepage: Added helper functions for links 2021-12-08 15:09:19 +03:00
gectokot
0ab444b34e Web: Studio: Homepage: Moved sub components to sub-components folder 2021-12-08 15:06:32 +03:00
gectokot
dc621dac89 Web: Studio: Homepage: Added SVG illustration 2021-12-08 15:04:14 +03:00
2187cb5331 edit lv 2021-12-08 12:24:54 +03:00
475dd92c30 Web: Editor: Fixed history information. 2021-12-08 09:37:40 +03:00
6d96855e79 Web: Editor: Added list of history and possibility to close history.
# Conflicts:
#	web/ASC.Web.Editor/src/Editor.jsx
2021-12-08 09:37:02 +03:00
bdcb4cd0be moved from 51eb3d88 2021-12-07 16:56:16 +03:00
20a17fca96 rename pt 2021-12-07 16:50:09 +03:00
f9c92a6bd7 edit pt_PT 2021-12-07 12:40:49 +03:00
3607a54cd2 edit vi 2021-12-07 10:38:03 +03:00
7973639195 edit vi 2021-12-07 10:37:30 +03:00
ee935ec401 edit az 2021-12-06 18:21:35 +03:00
f8bdd48db8 add pt_PT 2021-12-06 18:21:13 +03:00
6ef7c23bac add pt_PT 2021-12-06 18:20:48 +03:00
0952d01250 add uk 2021-12-06 17:29:41 +03:00
9126ea393d add uk 2021-12-06 17:29:19 +03:00
40c5a0d6b2 add az 2021-12-06 17:11:54 +03:00
4fef520aba Merge branch 'release/v1.1.0' into feature/translate-1.1.0 2021-12-06 15:09:57 +03:00
d0a4cee8ef edit translations 2021-12-06 13:05:56 +03:00
a059fc9b7c edit translations 2021-12-06 13:05:31 +03:00
af2e95dfd7 edit cs 2021-12-06 11:28:11 +03:00
086cc8efd2 Web: Fixed format of searchParam for files selector 2021-12-03 18:41:57 +03:00
e60c082a1d Web: Client: fixed position profile menu drop down 2021-12-02 18:58:43 +05:00
3a50fca3cc Merge branch 'hotfix/v1.1.1' into bugfix/dropdown-correct-display 2021-12-02 18:32:36 +05:00
edff6e2f40 update pl 2021-12-01 18:32:54 +03:00
bc58174a89 update pl 2021-12-01 18:13:16 +03:00
e1b0164bd3 update cs 2021-12-01 18:04:36 +03:00
00f2e1821e edit cs 2021-12-01 18:03:54 +03:00
0ba91e0100 update cs 2021-12-01 17:54:46 +03:00
870f05fc83 add el 2021-12-01 17:42:50 +03:00
e4ee37660e update el 2021-12-01 17:40:56 +03:00
50a4added2 update el 2021-12-01 17:40:27 +03:00
a17e301cde update bg 2021-12-01 14:36:33 +03:00
7823b9804c update bg 2021-12-01 14:36:04 +03:00
1ea835b0bf Merge branch 'release/v1.1.0' into feature/translate-1.1.0 2021-12-01 12:05:51 +03:00
27e732e9a3 Web: Login: Added usage of new API /authentication.json parameter "session" 2021-12-01 10:56:50 +03:00
626191c5d7 Core: fixed session 2021-11-30 22:16:23 +03:00
39b10cf7b1 edit ro 2021-11-30 17:20:47 +03:00
d5d87a679f update translations 2021-11-30 12:35:00 +03:00
77f86fccdb update translations 2021-11-30 12:31:54 +03:00
4c78667a99 fix Bug 52493 - Welcome page. notify «User with this email is already registered» 2021-11-30 12:09:51 +03:00
b2c123d6f4 Merge branch 'release/v1.1.0' into feature/translate-1.1.0 2021-11-30 11:46:22 +03:00
a032b83a32 Web: Editor: Optimization - Removing unnecessary api requests. 2021-11-30 10:59:41 +03:00
43d04b28de edit uk 2021-11-29 15:27:40 +03:00
5a5169b391 edit cz 2021-11-29 15:22:40 +03:00
bbe874054e update translations 2021-11-29 12:37:32 +03:00
cecfc406c5 Auth: added session param 2021-11-26 21:59:39 +03:00
d297fa0dd1 fix Bug 52071 2021-11-26 21:36:51 +03:00
04a56e57cb Web: Editor: Fixed bug with starting api calls before getting file id 2021-11-26 13:48:15 +03:00
18d0cd0842 Web: Shell: Fix minimization on production build static 2021-11-25 17:39:25 +03:00
bce51d74b6 Fix Bug 53438 - Client.Editor. Added redirect to homepage due to error 2021-11-25 16:37:36 +03:00
08746974f4 Web: SW: Added SW unregister + refactoring 2021-11-25 15:08:18 +03:00
ff9bb93efd Web: Scripts: Hide shx mkdir errors 2021-11-25 15:06:19 +03:00
fcb6723d1f Fixed Bug 53502 - Client.Editor.Added message about locked file. 2021-11-24 14:12:47 +03:00
465c57b8f6 Fixed Bug 54013 - Client.Files.Returned the ability to select elements on the About program page. 2021-11-24 11:09:52 +03:00
3417cb28f4 Merge branch 'release/v1.1.0' of github.com:ONLYOFFICE/AppServer into release/v1.1.0 2021-11-22 11:25:49 +03:00
b632f3a623 Web: Fixed styles according layouts, renaming. 2021-11-22 10:15:24 +03:00
11d527ba03 Merge branch 'master' into hotfix/v1.1.1
# 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/src/store/FilesActionsStore.js
#	products/ASC.Files/Client/src/store/UploadDataStore.js
#	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-11-21 14:40:24 +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
4cd9d042de Web: Files: fixed styles after Cherry picking. 2021-11-19 16:58:31 +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
cc35174d16 moved from 043e301 2021-11-16 20:40:15 +03:00
2c6e0d45bc Web: Fix wrong braces of variables inside translation files 2021-11-13 19:07:48 +03:00
c7c7267a9a Test: Added new WrongTranslationVariablesTest and fix it's issues 2021-11-13 19:03:10 +03:00
623313e4be Web: Restored missing 'ru' translations 2021-11-12 21:14:44 +03:00
5ff07a8293 Web: Fix UselessTranslationKeysTest translation issues 2021-11-12 20:46:04 +03:00
d8cf12f9d7 translations 2021-11-12 19:00:01 +03:00
17e3e5cb98 bump version to 1.1.1 2021-11-12 15:21:25 +03:00
3809273075 bump version to 1.1.0 2021-11-12 15:19:40 +03:00