Lea/web-apps
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity
6709 commits 47 branches 5000 tags 623 MiB
Commit graph

371 commits

Author SHA1 Message Date
Maxim Kadushkin 7fd2497462 Merge branch 'release/v5.1.0' into develop 2018-03-14 17:59:24 +03:00
Maxim Kadushkin 0ee904ab39 [ALL] removed event for desktop 2018-03-14 17:54:51 +03:00
Julia Radzhabova cd45f0ae06 [DE] Disable items in the Navigation context menu when editing is disabled 2018-03-07 13:47:41 +03:00
Maxim Kadushkin 99a7be61c6 merge with develop 2018-03-04 23:41:58 +03:00
Pavel Lobashov 06da18bf2d Update copyright to 2018 2018-03-01 15:16:38 +03:00
Julia Radzhabova 68ae26ac5d Fix Bug 36870 2018-02-28 18:04:11 +03:00
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 fa34aa1558 Fix Bug 36936. 2018-02-15 11:57:48 +03:00
Julia Radzhabova 42949a67aa [SSE] Comment: Bug 36927. Don't render comments when left comments panel is closed. 2018-02-14 12:14:22 +03:00
Julia Radzhabova 22237f9634 Fix Bug 36885. 2018-02-08 18:22:32 +03:00
Julia Radzhabova 833f9fc1b1 Merge branch 'hotfix/v5.0.7' into develop 2018-01-15 16:11:11 +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 4d90badb55 Merge branch 'hotfix/v5.0.6' into feature/v5.0.6-signature 2017-12-06 14:53:09 +03:00
Julia Radzhabova d7b0a40b99 Fix chart editing in the desktop. 2017-12-06 10:06:45 +03:00
Julia Radzhabova 662a7e0c20 [DE] Disable/enable plugins left panel when review mode is changed. 2017-12-01 14:50:25 +03:00
Julia Radzhabova 16c1af8a2b Refactoring signatures: enable adding invisible signature when document is signed. 2017-11-28 15:52:30 +03:00
Julia Radzhabova dbc71821ae Refactoring contex menu for signature. 2017-11-28 15:50:50 +03:00
Julia Radzhabova 490a79ea47 [Common] Refactoring signature. 2017-11-28 15:33:25 +03:00
Julia Radzhabova 227138f3c3 [DE] Request signature before sign document. 2017-11-28 15:32:57 +03:00
Julia Radzhabova ab99ce6adb [DE] Disable protect settings when review mode is changed. 2017-11-28 15:32:07 +03:00
Julia Radzhabova d48e76e5c6 [DE] Change signature settings layout in the right panel. 2017-11-28 15:30:26 +03:00
Julia Radzhabova 4da0fe1938 [DE] Change layout for protect file menu. 2017-11-28 15:30:10 +03:00
Julia Radzhabova ceb0cd4b5e [DE] Refactoring signature settings in the right and left panels. 2017-11-28 15:29:14 +03:00
Julia Radzhabova 7d75359ff4 Update password changing. 2017-11-28 15:25:22 +03:00
Julia Radzhabova abdaa3ede6 [DE] Update translations. 2017-11-28 15:25:06 +03:00
Julia Radzhabova 9e458a51f8 [DE] Added Protection tab with the ability to encrypt and sign document. 2017-11-28 15:23:37 +03:00
Julia Radzhabova b471b732b1 Fix Bug 31420. 2017-11-24 15:02:52 +03:00
Julia Radzhabova 29810902e4 Fix Bug 36426. 2017-11-24 09:31:34 +03:00
Julia Radzhabova 493a464076 Refactoring signatures: enable adding invisible signature when document is signed. 2017-11-23 16:29:05 +03:00
Julia Radzhabova 084e254b42 Refactoring contex menu for signature. 2017-11-23 14:29:41 +03:00
Julia Radzhabova a90f108209 [DE] Change applying the license (disable editing when connections are over the limitations). 2017-11-22 15:20:51 +03:00
Julia Radzhabova 28a1c6561f [Common] Refactoring signature. 2017-11-17 12:23:31 +03:00
Julia Radzhabova 66fe289633 [DE] Request signature before sign document. 2017-11-17 11:44:36 +03:00
Julia Radzhabova 0a2e8ffdda [DE] Disable protect settings when review mode is changed. 2017-11-17 10:26:06 +03:00
Julia Radzhabova 354e9d1a9b [DE] Change signature settings layout in the right panel. 2017-11-16 16:06:55 +03:00
Julia Radzhabova 781030ed3d [DE] Change layout for protect file menu. 2017-11-16 12:43:21 +03:00
Julia Radzhabova 1bcb080cf7 [DE] Refactoring signature settings in the right and left panels. 2017-11-15 15:52:37 +03:00
Julia Radzhabova 7630a072f8 Update password changing. 2017-11-15 11:40:36 +03:00
Julia Radzhabova c2f360fb0c [DE] Update translations. 2017-11-15 11:11:50 +03:00
Julia Radzhabova 222c0bf74d [DE] Added Protection tab with the ability to encrypt and sign document. 2017-11-15 10:59:06 +03:00
Julia Radzhabova 27afcaba0f
Merge branch 'develop' into hotfix/v5.0.4 2017-11-13 18:32:25 +03:00
Julia Radzhabova cba014bbc7 Save co-editing mode option when changed from Collaborative tab. 2017-11-07 15:00:11 +03:00
Julia Radzhabova 7af4bc9d7b Plugins refactoring. 2017-11-01 12:03:37 +03:00
Julia Radzhabova c02389ab21
Merge branch 'develop' into hotfix/v5.0.3 2017-10-31 20:15:07 +03:00
Julia Radzhabova c8879d7c07 Comments refactoring. 2017-10-31 11:51:45 +03:00
Julia Radzhabova db3475a6e6 Merge branch 'feature/collaboration-tab' into develop 2017-10-27 16:03:03 +03:00
Oleg Korshul c8a12f7dba new plugins scheme (system & parallel working) 2017-10-17 18:08:12 +03:00
Julia Radzhabova 8cce90d8f0 Hide Plugins tab when no plugins. Hide Review tab when no buttons on this tab (for the future). 2017-10-12 17:25:47 +03:00
Julia Radzhabova 5178858833 [SSE] Added collaboration tab. 2017-10-12 13:43:23 +03:00
Julia Radzhabova 1057868cda Set application prefix for Collaboration tab (used for saving to local storage). 2017-10-12 12:05:55 +03:00
Julia Radzhabova b638710824 Merge branch 'hotfix/v5.0.2' into feature/collaboration-tab 2017-10-11 13:18:39 +03:00
Julia Radzhabova cae3819434 [DE] Added Chat button to the collaborative tab in the toolbar. 2017-10-10 15:14:27 +03:00
Julia Radzhabova 7d1a4e14c9 [DE] Remove spellcheck and document language buttons from the toolbar collaboration tab. 2017-10-09 15:03:50 +03:00
Julia Radzhabova 32267aa6ab [DE] Added tab Collaboration. 2017-10-07 16:06:51 +03:00
Alexey Golubev fce84eef7a v5.0.1 2017-10-05 14:48:08 +03:00
Julia Radzhabova 229c47b8a0 Autostart array of plugins. 2017-10-03 20:45:41 +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 1afc0e47de [Common] refactoring 2017-10-03 20:41:44 +03:00
Julia Radzhabova b4029143fa [DE] Fix Bug 35406. 2017-10-03 14:22:33 +03:00
Julia Radzhabova 52b56fa997 [DE] Set serverVersion parameter to version history items. 2017-09-22 17:18:06 +03:00
Julia Radzhabova 9ce1c45226 Change api event: "onReady" -> "onAppReady", added "onDocumentReady" event. 2017-09-20 14:32:18 +03:00
Julia Radzhabova e1bde7bbc2 Autostart array of plugins. 2017-09-13 15:02:34 +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
Maxim Kadushkin 41fd7a1bce [Common] debug for 'preview' mode 2017-09-07 18:01:26 +03:00
Maxim Kadushkin 3da352c6e7 [Common] debug for 'preview' mode 2017-09-07 17:55:30 +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
Maxim Kadushkin 44e1eb0e8d [Common] refactoring 2017-09-05 14:53:44 +03:00
Maxim Kadushkin e462f5851f [Common] fill plugins panel on collection events 2017-09-04 17:25:45 +03:00
Maxim Kadushkin 1ea8cea665 [Common] fill plugins panel on collection events 2017-09-04 11:12:30 +03:00
Julia Radzhabova cfed1c50b8 [DE] Disable and hide comments when preview review changes. 2017-09-01 15:25:31 +03:00
Julia Radzhabova 97b20715f0 [DE] Fix Bug 35750. 2017-08-31 11:15:03 +03:00
Julia Radzhabova 4150c9788d [DE] Fix Bug 35383. 2017-08-25 12:25:54 +03:00
Julia Radzhabova d9c09c50a1 [DE] Fix Bug 35725. 2017-08-25 09:39:04 +03:00
Julia Radzhabova 08797b870b [DE] Close comments panel when start view mode for review. 2017-08-23 23:32:27 +03:00
Julia Radzhabova 207376bb0d [DE] Open viewer context menu in the view mode for review. 2017-08-23 23:22:33 +03:00
Julia Radzhabova 57a8cdadb4 [DE] Set display mode for review. 2017-08-23 17:49:56 +03:00
Julia Radzhabova 29d3515dfa Fix Bug 35643. 2017-08-18 15:17:25 +03:00
Julia Radzhabova ab593da475 Bug 35597. 2017-08-18 11:46:53 +03:00
Julia Radzhabova 5c21e657f0 Fix Bug 35617. 2017-08-17 10:28:17 +03:00
Julia Radzhabova 6e003751ab Fix Bug 35584. 2017-08-14 13:21:17 +03:00
Maxim Kadushkin 0c84772393 Merge branch 'develop' 2017-08-11 14:01:42 +03:00
Maxim Kadushkin dad9b2127d unlocked plugins in toolbar 2017-08-11 14:01:27 +03:00
Julia Radzhabova f7fafe1a59 [DE] Repaint review tip when changes length is changed. 2017-08-10 13:07:18 +03:00
Maxim Kadushkin 7687f38722 [Common] chat and comments panels didn't resize after toolbar changed to compact 2017-08-09 20:02:41 +03:00
Julia Radzhabova 0a3b92e1ef Fix Bug 35504. 2017-08-04 11:18:37 +03:00
Julia Radzhabova 10df370024 Debug adding comment from toolbar. [SSE] Lock commenting from toolbar when cell is selected and locked or has comments. Add comment to document when object is selected. 2017-06-30 14:33:31 +03:00
Julia Radzhabova fae2867431 Disable/enable comment button in the toolbar. 2017-06-28 14:20:49 +03:00
Julia Radzhabova c5405c6110 Plugins: add isCustomWindow type to variation. 2017-06-23 17:22:02 +03:00
Julia Radzhabova 04079fec8d [DE] Debug review tab. 2017-06-15 16:35:55 +03:00
Julia Radzhabova 00fb06281e View mode with commenting (permissions.comments = true). 2017-06-14 14:53:29 +03:00
Julia Radzhabova c79eb90e08 [DE] Added parameter showReviewChanges to config: open review changes dialog, when showReviewChanges is true (but do not track review changes). 2017-06-09 17:30:52 +03:00
Julia Radzhabova 11e123d0c4 Fix Bug 34415. 2017-06-01 17:46:48 +03:00
Julia Radzhabova b1ba645bf6 [PE] Added spell check + changing document language. Moved LanguageDialog to Common. 2017-04-26 11:34:55 +03:00
Maxim Kadushkin b8ba681b94 [Common] locked plugin's tab in the toolbar 2017-04-25 19:51:03 +03:00
Julia Radzhabova 6d8cceb6b2 [DE] Disable button for selecting language when the languages are not loaded. 2017-04-25 16:17:55 +03:00
Julia Radzhabova ecae264fd3 [DE] Common.localStorage.getItem -> Common.localStorage.getBool. 2017-04-19 14:22:31 +03:00
Julia Radzhabova 8a891ea475 Fixed Bug 34366, Bug 20029. 2017-04-11 17:01:34 +03:00
Julia Radzhabova 8e2d30fd80 [DE] Bug with version history. 2017-04-11 16:53:13 +03:00
Julia Radzhabova 882a78c0c6 [DE] Added option "customization->commentAuthorOnly". If "true" - user can edit only comments that he created, otherwise he can edit all comments. 2017-04-11 16:43:31 +03:00
Julia Radzhabova 68bf190120 [DE] Check if token for history revision is expired. 2017-04-11 15:26:47 +03:00
Julia Radzhabova c35d3c544a [DE] Set token for history version. 2017-04-11 14:33:50 +03:00
Maxim Kadushkin 0cf3621991 [DE] processed permissions for review 2017-04-05 12:11:15 +03:00
Maxim Kadushkin 375b2e400f [DE] processed buttons [Document Language], [Spell checking] 2017-04-04 18:22:02 +03:00
Maxim Kadushkin 98b1168c06 [DE] processed toolbar's [Comments] button 2017-03-29 19:29:04 +03:00
Maxim Kadushkin 55e48173ce [Common] refactoring 2017-03-29 19:27:44 +03:00
Maxim Kadushkin ef2b590acb [DE] StatusBar's refactoring. moved functions for changes to ReviewChanges controller 2017-03-29 14:19:57 +03:00
Maxim Kadushkin ac79eacb35 [Common] refacted 'ReviewChanges' 2017-03-29 12:33:20 +03:00
Maxim Kadushkin 71595d781c [Common] changed plugin's button 2017-03-23 16:02:19 +03:00
Maxim Kadushkin 10cb608a2c [Common] plugin's launch, updated styles 2017-03-16 13:21:36 +03:00
Maxim Kadushkin b57830c9ab [DE] refactoring 2017-03-16 13:20:07 +03:00
Maxim Kadushkin 52a8419371 [DE] added plugins to toolbar 2017-03-13 19:14:26 +03:00
Maxim Kadushkin a75065ecd6 [Common] cherrypicked changes for plugins (6c427e9, 3b82dab, aceb1fe) 2017-03-01 19:19:42 +03:00
Maxim Kadushkin ba2800c14e [DE] 'Review' controls moved to the toolbar 2017-02-27 15:04:18 +03:00
Alexander.Trofimov 126a0c9c4b change license to 2017 2017-01-17 17:58:08 +03:00
Julia Radzhabova e818ddf253 Fix Bug 33560, Fix Bug 33549 2016-12-01 12:59:02 +03:00
Julia Radzhabova 7392d30a9d Change format for editorConfig->user (use "name" instead of "lastname" and "firstname"). 2016-11-18 14:48:24 +03:00
Julia Radzhabova 970d1368aa [SSE] Bug 33374. 2016-11-13 12:42:27 +03:00
Julia Radzhabova 24ad7e79d7 [DE] Bug with versions history when serverVersion for revision != app.buildVersion. 2016-11-02 15:29:48 +03:00
Julia Radzhabova 8b90eb4925 [DE] Changed format for data in setHistoryData (+ support for old format). 
{
  version: '...',
  url: '...',
  key: '...',
  changesUrl: '...',
  previous: {
    url: '...',
    key: '...',
  }
}
 2016-10-31 15:01:45 +03:00
Julia Radzhabova 0c251ec008 [DE] Delete unused field opts.data.urlDiff in SetHistoryData. 2016-10-28 17:40:53 +03:00
Julia Radzhabova 6c7ea6afe2 [DE] Changed format for data in setHistoryData. 2016-10-28 16:19:03 +03:00
Julia Radzhabova 7761977ff6 Merge branch 'hotfix/v4.1.6' into develop 2016-10-26 13:37:10 +03:00
Julia Radzhabova 04acc3ecc8 Autostart plugin after loading plugins. 2016-10-21 17:09:58 +03:00
Julia Radzhabova 379d61e759 [DE] Version history: add "Show/Hide detailed changes" to history panel. Don't reload editor, when press Back to Document (= Close Menu) in the File menu. 2016-10-05 16:31:49 +03:00
Julia Radzhabova 2afdb191df [DE] Update layout for history versions + hide changes for revision. 2016-09-22 12:43:31 +03:00
Julia Radzhabova 920dc6002a [DE] Added hint to Restore button in the version history. 2016-09-20 18:36:32 +03:00
Julia Radzhabova b33f00e0a7 [DE] Restore from changes in versions history. 2016-09-19 10:41:02 +03:00
Julia Radzhabova 4dc23c41ee [DE] Added the ability to restore version in versions history (need event onRequestRestore and permissions.changeHistory = true in editor config). 2016-09-16 15:46:00 +03:00
Julia Radzhabova 89e6d51ddc [DE] Fix Bug 33117. 2016-09-15 16:29:34 +03:00
Julia Radzhabova 6bfd3d80bb Absolute urls in plugins. 2016-09-05 18:28:56 +03:00
Julia Radzhabova de773f8618 Debug opening/moving/resizing menus, dialogs, tips and others (using mouse events), when browser zoom != 100%. 2016-08-19 16:41:48 +03:00
Julia Radzhabova 3dd444be6c Fix Bug 32938. 2016-08-18 11:34:00 +03:00
Julia Radzhabova 1fe2a5066a Add "initOnSelectionChanged" parameter to plugins. 2016-08-08 16:27:00 +03:00
Julia Radzhabova 4d9125372f Update plugin window resizing. 2016-08-04 16:03:17 +03:00
Julia Radzhabova b475bb5f20 Debugging resizable plugins. 2016-08-04 14:44:23 +03:00
Julia Radzhabova 58c3fd33c0 Select non-visual plugin when it starts. 2016-08-03 12:41:36 +03:00
Julia Radzhabova d1ea727e4c Changed default size of plugin window, debug resizing. 2016-08-02 17:36:33 +03:00
Julia Radzhabova a518abfcae Fixed bug with initial size and resizing for plugins window. 2016-08-02 13:55:45 +03:00
Julia Radzhabova c1ac28bf8e Debug resizing plugin left panel and moving plugin modal window. 2016-08-01 16:25:59 +03:00
Julia Radzhabova 9403710f56 Debug resizing plugins panel. 2016-08-01 12:33:30 +03:00
Julia Radzhabova 954d86022e Resize plugins panel. 2016-08-01 11:26:08 +03:00
Julia Radzhabova 675ef1fb1f Resize plugin window. 2016-07-26 15:08:39 +03:00
Julia Radzhabova 0eb78262ce fix bug 32844. 2016-07-25 14:49:35 +03:00
Julia Radzhabova e6e7be6f84 Fixed bugs with focus and keydown events in menus. 2016-07-08 12:25:30 +03:00
Julia Radzhabova 1ccae8d386 [DE] revert dc6db03de9 (Fixed bug with closing menus and combo-boxes from toolbar and right panel, closing left panel and comments) 2016-07-08 12:12:09 +03:00
Julia Radzhabova dc6db03de9 [DE] Fixed bug with closing menus and combo-boxes from toolbar and right panel, closing left panel and comments. 2016-07-08 10:04:34 +03:00
Julia Radzhabova 56b75be8c2 Update limitations for light version: disable co-authoring. 2016-07-06 17:17:28 +03:00
Julia Radzhabova b91142c0eb [DE] Отладка меню плагинов (первая вариация всегда называется Start). 2016-06-29 11:03:58 +03:00
Oleg Korshul 1aa0a25c9a add variationIndex 2016-06-29 11:03:36 +03:00
Julia Radzhabova 3572261704 [DE] Добавлено меню для плагинов. 2016-06-29 11:03:12 +03:00
Julia Radzhabova 5779aea322 [DE] Реализована возможность открытия плагина в левой панели. 2016-06-29 11:00:46 +03:00
Julia Radzhabova 984fb163c8 [DE] Панель плагинов изменена в соответствии с макетами. 2016-06-29 10:58:10 +03:00
Alexander.Trofimov 7a5d025854 send array of asc_CCommentData on asc_onAddComments event instead array of objects 2016-05-31 18:42:12 +03:00
Julia Radzhabova 9a62ce1265 [DE] Отладка плагинов под изменения в апи. 2016-05-25 16:15:36 +03:00
Oleg Korshul 7a650ebddb add baseUrl param to plugin 2016-05-24 11:48:59 +03:00
Julia Radzhabova 7b86f88935 [DE] Изменена структура плагинов. 2016-05-19 12:46:21 +03:00
Julia Radzhabova f6b71e790e [DE] Открытие фреймов для визуальных плагинов. 2016-05-18 13:42:06 +03:00
Julia Radzhabova 42932dc55b [DE] Добавлена поддержка плагинов 2016-05-17 18:38:54 +03:00
Alexander.Trofimov 5c778747a1 fix bug 32390 2016-05-11 16:26:45 +03:00
Julia Radzhabova ab9da153e6 Merge branch 'develop' into feature/metric-translate 2016-04-19 17:26:17 +03:00
Julia Radzhabova 7057128636 Bug 32155. 2016-04-11 15:58:51 +03:00
Julia Radzhabova 66771e0b0d Merge branch 'develop' into feature/metric-translate 2016-04-07 15:13:16 +03:00
Julia Radzhabova 63b6a59342 Реализована локализация единиц измерения (Cm, Pt). 2016-04-06 16:38:54 +03:00
Alexander.Trofimov 7d6675b5b8 global clases -> Asc namespace 2016-04-05 15:57:51 +03:00
Alexander.Trofimov eec1f68457 use 'c_oAsc...' variables from Asc namespace 2016-04-05 14:52:34 +03:00
Maxim Kadushkin 1bd7d37f93 license info added to js 2016-04-01 16:17:09 +03:00
Julia Radzhabova 109908a17a Versions History: изменено поле urlDiff на changesUrl. 2016-03-25 11:12:32 +03:00
Julia Radzhabova cf8bb7178e [DE] Bug 31899 2016-03-16 11:44:48 +03:00
Maxim Kadushkin 741b10515d webapps added 2016-03-10 21:48:53 -03:00