Maxim Kadushkin
|
482a7d11bf
|
Merge branch 'develop' into feature/desktop-new
# Conflicts:
# apps/documenteditor/main/app/controller/Main.js
# apps/documenteditor/main/app/controller/Toolbar.js
# apps/presentationeditor/main/app/controller/Main.js
# apps/spreadsheeteditor/main/app/controller/Main.js
|
2018-02-22 02:41:49 +03:00 |
|
|
Maxim Kadushkin
|
dcd1589adc
|
[common] added 'Desktop' controller
|
2018-02-22 02:24:03 +03:00 |
|
Julia Radzhabova
|
5ed42705fc
|
Can protect only offline files.
|
2018-02-20 12:35:49 +03:00 |
|
|
Julia Radzhabova
|
d08137da83
|
Fix Bug 36953.
|
2018-02-19 12:34:15 +03:00 |
|
|
Maxim Kadushkin
|
5f1b291886
|
[DE][PE][SSE] synchronize extra buttons state through events
|
2018-02-16 02:56:17 +03:00 |
|
|
Julia Radzhabova
|
31152c92d8
|
Remove sogou pinyin option.
|
2018-02-14 17:29:54 +03:00 |
|
|
Julia Radzhabova
|
f3c3ead61c
|
Fix Bug 36883.
|
2018-02-14 17:11:28 +03:00 |
|
|
Maxim Kadushkin
|
8be206fa33
|
Merge branch 'develop' into feature/desktop-new
|
2018-02-13 11:26:16 +03:00 |
|
|
Maxim Kadushkin
|
753afc350d
|
refactoring. send commands to desktop app
|
2018-02-13 11:23:53 +03:00 |
|
|
Julia Radzhabova
|
0f2e985634
|
Fix Bug 36742.
|
2018-02-09 17:26:34 +03:00 |
|
|
Julia Radzhabova
|
22237f9634
|
Fix Bug 36885.
|
2018-02-08 18:22:32 +03:00 |
|
|
Julia Radzhabova
|
33c8dcf475
|
Don't use customization.goback.url on critical errors in desktop.
|
2018-02-07 12:21:10 +03:00 |
|
|
Maxim Kadushkin
|
472e5edcb7
|
debug
|
2018-02-07 01:37:40 +03:00 |
|
|
Julia Radzhabova
|
11a3706785
|
Added "Close File" button to the password dialog. Send api event "onRequestClose" when Close File (or Esc) is selected.
|
2018-02-06 13:54:40 +03:00 |
|
|
Julia Radzhabova
|
42e4481776
|
Set long operation mask for plugins actions (action.id is string).
|
2018-02-05 12:22:03 +03:00 |
|
|
Maxim Kadushkin
|
f328e83a4f
|
refactoring
|
2018-02-03 16:10:38 +03:00 |
|
|
Maxim Kadushkin
|
c8e9fe9a63
|
Merge branch 'develop' into feature/desktop-new
# Conflicts:
# apps/common/main/lib/util/utils.js
|
2018-02-02 16:18:07 +03:00 |
|
|
Julia Radzhabova
|
b3499e7361
|
Added support for force save errors.
|
2018-01-26 15:39:21 +03:00 |
|
|
Julia Radzhabova
|
b7675946f8
|
Support for languages with "_" separator (en_US).
|
2018-01-24 14:40:59 +03:00 |
|
|
Julia Radzhabova
|
fc6504f5ac
|
[PE][SSE] Added print, save, undo, redo buttons and user name to header panel.
|
2018-01-24 14:10:33 +03:00 |
|
|
Julia Radzhabova
|
833f9fc1b1
|
Merge branch 'hotfix/v5.0.7' into develop
|
2018-01-15 16:11:11 +03:00 |
|
|
Julia Radzhabova
|
697785ff23
|
Added onWarning event to api.
|
2018-01-09 15:10:48 +03:00 |
|
|
Julia Radzhabova
|
3a3e0602b7
|
Bugfix for IE/Edge: set focus out of the editor frame.
|
2017-12-13 12:11:27 +03:00 |
|
|
Julia Radzhabova
|
d1e3692e48
|
Merge branch 'develop' into hotfix/v5.0.6
|
2017-12-11 13:24:21 +03:00 |
|
|
Julia Radzhabova
|
4b4bef4e0b
|
Added groups for plugins.
|
2017-12-07 17:46:13 +03:00 |
|
|
Julia Radzhabova
|
7de7841b3d
|
Merge branch 'hotfix/v5.0.6' into feature/v5.0.6-signature
|
2017-12-07 15:02:43 +03:00 |
|
|
Julia Radzhabova
|
160b6ddfee
|
Added event for reset plugins list.
|
2017-12-07 15:02:19 +03:00 |
|
Alexander.Trofimov
|
78623f0998
|
Users -> UsersCount
|
2017-12-07 13:36:57 +03:00 |
|
|
Julia Radzhabova
|
4d90badb55
|
Merge branch 'hotfix/v5.0.6' into feature/v5.0.6-signature
|
2017-12-06 14:53:09 +03:00 |
|
|
Julia Radzhabova
|
91fb911ba3
|
Fixed opening view mode.
|
2017-12-05 17:40:52 +03:00 |
|
|
Julia Radzhabova
|
4f9f366631
|
[SSE] Added Protection tab. Changed signature settings in the right and left menu.
|
2017-11-28 15:48:24 +03:00 |
|
|
Julia Radzhabova
|
4a5d78f36e
|
[SSE] Show tooltip and disable editing when document is signed.
|
2017-11-28 14:25:08 +03:00 |
|
|
Julia Radzhabova
|
f49404e8b5
|
Feature/new toolbar signature
|
2017-11-27 14:15:10 +03:00 |
|
|
Julia Radzhabova
|
29810902e4
|
Fix Bug 36426.
|
2017-11-24 09:31:34 +03:00 |
|
|
Julia Radzhabova
|
b9f90aa91c
|
Update translations.
|
2017-11-23 14:00:02 +03:00 |
|
|
Julia Radzhabova
|
b664680915
|
[SSE] Change applying the license (disable editing when connections are over the limitations).
[PE] Refactoring.
|
2017-11-23 13:40:45 +03:00 |
|
|
Julia Radzhabova
|
0c7749b1d1
|
Update translations/
|
2017-11-22 11:35:45 +03:00 |
|
|
Julia Radzhabova
|
147735ea7e
|
[SSE] Added Protection tab. Changed signature settings in the right and left menu.
|
2017-11-17 17:35:40 +03:00 |
|
|
Julia Radzhabova
|
27afcaba0f
|
Merge branch 'develop' into hotfix/v5.0.4
|
2017-11-13 18:32:25 +03:00 |
|
|
Julia Radzhabova
|
76e2d4c290
|
[SSE] Show tooltip and disable editing when document is signed.
|
2017-11-10 10:50:01 +03:00 |
|
|
Julia Radzhabova
|
4ad34f0652
|
[SSE] Fix Bug 36222.
|
2017-11-02 11:17:48 +03:00 |
|
|
Julia Radzhabova
|
c02389ab21
|
Merge branch 'develop' into hotfix/v5.0.3
|
2017-10-31 20:15:07 +03:00 |
|
|
Julia Radzhabova
|
0f6213f9db
|
For Bug 36122.
|
2017-10-30 14:50:59 +03:00 |
|
|
Julia Radzhabova
|
db3475a6e6
|
Merge branch 'feature/collaboration-tab' into develop
|
2017-10-27 16:03:03 +03:00 |
|
|
Julia Radzhabova
|
08702f0a55
|
[SSE] Don't use asc_LoadEmptyDocument (fix offline mode for desktop in sdk).
|
2017-10-26 15:09:58 +03:00 |
|
|
Julia Radzhabova
|
dcf80f9ba0
|
Added trial and developer mode.
|
2017-10-25 17:36:59 +03:00 |
|
|
Julia Radzhabova
|
5da46ba82c
|
Fix https://github.com/ONLYOFFICE/DocumentServer/issues/185.
Added format parameter to downloadAs api method.
|
2017-10-24 14:23:15 +03:00 |
|
|
Julia Radzhabova
|
de0b44f5dc
|
[SSE] Added modifyFilter permission to config: when = false, disable add/remove filters,sort, change formatted table style.
|
2017-10-19 13:14:12 +03:00 |
|
|
Julia Radzhabova
|
6d64d2b9a5
|
Set permissions to docInfo (use put_Permissions).
|
2017-10-18 15:25:12 +03:00 |
|
|
Julia Radzhabova
|
09d019fa87
|
Change name and link for limitation window.
|
2017-10-18 15:08:11 +03:00 |
|
|
Julia Radzhabova
|
968661758c
|
Merge branch 'hotfix/v5.0.2' into develop
|
2017-10-13 15:11:11 +03:00 |
|
|
Julia Radzhabova
|
d668bd150d
|
Merge plugins from config, server and from event asc_onPluginsInit.
|
2017-10-13 12:47:39 +03:00 |
|
|
Julia Radzhabova
|
20ea8595ba
|
Don't apply Sogou pinyin input.
|
2017-10-12 17:16:26 +03:00 |
|
|
Julia Radzhabova
|
9757cb175b
|
Use api.setInputParams method for SogouPinyin.
|
2017-10-12 14:20:32 +03:00 |
|
|
Julia Radzhabova
|
0bdcd6099f
|
Added Sogou Pinyin input in Chrome.
|
2017-10-12 14:16:45 +03:00 |
|
|
Julia Radzhabova
|
5178858833
|
[SSE] Added collaboration tab.
|
2017-10-12 13:43:23 +03:00 |
|
|
Julia Radzhabova
|
76cbae43d5
|
Merge branch 'develop' into feature/new-toolbar-pivot-table
|
2017-10-11 12:14:58 +03:00 |
|
|
Julia Radzhabova
|
5ac475ca92
|
Merge plugins list from editor config and from server (don't add duplicated plugins).
|
2017-10-11 11:45:42 +03:00 |
|
|
Julia Radzhabova
|
22580a02cb
|
Added onWarning event to api.
|
2017-10-07 12:20:39 +03:00 |
|
|
Julia Radzhabova
|
f05835e0c0
|
Added Sogou Pinyin input in Chrome.
|
2017-10-06 13:57:35 +03:00 |
|
Alexey Golubev
|
fce84eef7a
|
v5.0.1
|
2017-10-05 14:48:08 +03:00 |
|
|
Julia Radzhabova
|
8c193881d1
|
[PE][SSE] Bug 35406.
|
2017-10-04 18:44:01 +03:00 |
|
|
Julia Radzhabova
|
229c47b8a0
|
Autostart array of plugins.
|
2017-10-03 20:45:41 +03:00 |
|
|
Julia Radzhabova
|
28b92b60f7
|
Debug autostart plugins.
|
2017-10-03 20:44:20 +03:00 |
|
|
Julia Radzhabova
|
2e36f36dbe
|
Run first plugin from autostart plugins list.
|
2017-10-03 20:43:58 +03:00 |
|
|
Julia Radzhabova
|
cc0933be99
|
Add "autostart" parameter to plugins config: auto start array of plugins.
|
2017-10-03 20:43:39 +03:00 |
|
|
Julia Radzhabova
|
8709548c7a
|
Load plugins from config or using request to server.
|
2017-10-03 20:43:06 +03:00 |
|
|
Julia Radzhabova
|
f37d4b53ac
|
Set full plugins list to sdk, but add buttons to the toolbar using "EditorsSupport" field .
|
2017-10-03 20:42:41 +03:00 |
|
|
Maxim Kadushkin
|
ceaf3371c6
|
refactoring
|
2017-10-03 20:41:22 +03:00 |
|
|
Maxim Kadushkin
|
c0772ef73a
|
refactoring
|
2017-10-03 20:40:53 +03:00 |
|
|
Julia Radzhabova
|
a0dfdea5aa
|
Fix Bug 35934, update Bug 35851.
|
2017-10-02 14:08:26 +03:00 |
|
|
Julia Radzhabova
|
c1e8ec1017
|
Merge branch 'develop' into feature/new-toolbar-pivot-table
|
2017-09-29 11:26:45 +03:00 |
|
|
Julia Radzhabova
|
ceb67537ac
|
Fix Bug 35851.
|
2017-09-20 15:41:26 +03:00 |
|
|
Julia Radzhabova
|
9ce1c45226
|
Change api event: "onReady" -> "onAppReady", added "onDocumentReady" event.
|
2017-09-20 14:32:18 +03:00 |
|
|
Julia Radzhabova
|
73f5efae27
|
Merge branch 'release/v5.0.0' into develop
|
2017-09-19 17:44:29 +03:00 |
|
|
Julia Radzhabova
|
40cc71ea63
|
Merge pull request #5 from ONLYOFFICE/feature/new-toolbar-signature
Feature/new toolbar signature
|
2017-09-18 10:49:27 +03:00 |
|
|
Julia Radzhabova
|
0987210cb6
|
Use api.asc_isSignaturesSupport() function for signature supporting.
|
2017-09-18 10:44:27 +03:00 |
|
|
Julia Radzhabova
|
e1bde7bbc2
|
Autostart array of plugins.
|
2017-09-13 15:02:34 +03:00 |
|
|
Julia Radzhabova
|
9f2ffc408c
|
Plugins: remove deprecated parameter "url".
|
2017-09-13 14:43:35 +03:00 |
|
|
Julia Radzhabova
|
a147880f22
|
Debug autostart plugins.
|
2017-09-13 14:35:20 +03:00 |
|
|
Julia Radzhabova
|
6e4ec9e92d
|
Run first plugin from autostart plugins list.
|
2017-09-13 13:36:19 +03:00 |
|
|
Julia Radzhabova
|
7fb874128c
|
Add "autostart" parameter to plugins config: auto start array of plugins.
|
2017-09-13 13:32:01 +03:00 |
|
|
Julia Radzhabova
|
c99107bfa4
|
Load plugins from config or using request to server.
|
2017-09-11 16:34:23 +03:00 |
|
|
Julia Radzhabova
|
4eaf251ae5
|
Set full plugins list to sdk, but add buttons to the toolbar using "EditorsSupport" field .
|
2017-09-11 15:47:36 +03:00 |
|
|
Julia Radzhabova
|
ca41ce7809
|
Fix Bug 35791.
|
2017-09-08 15:02:54 +03:00 |
|
|
Julia Radzhabova
|
196bc28847
|
Show error when file password is incorrect.
|
2017-09-08 11:44:01 +03:00 |
|
|
Julia Radzhabova
|
62029e2d5d
|
Bug 35768.
|
2017-09-08 11:39:07 +03:00 |
|
|
Julia Radzhabova
|
a701bbae4f
|
Merge branch 'develop' into feature/new-toolbar-pivot-table
|
2017-09-07 16:15:13 +03:00 |
|
|
Julia Radzhabova
|
43222dfa9d
|
Merge pull request #4 from ONLYOFFICE/release/v5.0.0
Release/v5.0.0
|
2017-09-07 11:49:02 +03:00 |
|
|
Julia Radzhabova
|
0caa6dfb2f
|
Show error when file password is incorrect.
|
2017-09-06 16:41:53 +03:00 |
|
|
Maxim Kadushkin
|
e4faebd1d0
|
refactoring
|
2017-09-05 12:47:52 +03:00 |
|
|
Julia Radzhabova
|
c1039d2d77
|
Synchronize save buttons in the toolbar and left menu.
|
2017-09-05 10:54:44 +03:00 |
|
|
Maxim Kadushkin
|
cd5721977d
|
refactoring
|
2017-09-04 17:20:46 +03:00 |
|
|
Julia Radzhabova
|
ca5016db77
|
[SSE] Added error LockedCellPivot.
|
2017-08-08 14:39:23 +03:00 |
|
|
Julia Radzhabova
|
3da75ce6ed
|
Merge branch 'feature/new-toolbar' into feature/new-toolbar-pivot-table
|
2017-07-05 16:04:43 +03:00 |
|
|
Julia Radzhabova
|
93e4a6a927
|
permissions.comments -> permissions.comment.
|
2017-07-05 15:36:49 +03:00 |
|
|
Julia Radzhabova
|
bccc2b7187
|
[SSE] Tooltips for cell styles.
|
2017-07-05 15:06:06 +03:00 |
|
|
Julia Radzhabova
|
ecce8b57fa
|
[SSE] Disable pivot tab in the diagramm and mail merge mode.
|
2017-06-30 18:51:15 +03:00 |
|
|
Julia Radzhabova
|
c230f90eec
|
[SSE] Added PivotTable tab.
|
2017-06-30 17:49:58 +03:00 |
|
|
Julia Radzhabova
|
9957e5d77c
|
[SSE] Fix merge with new-toolbar.
|
2017-06-26 17:13:42 +03:00 |
|