Commit graph

181 commits

Author SHA1 Message Date
Julia Radzhabova 15aac51ab4 Menu component: refactoring, adjust menu to browser height 2019-06-21 10:46:00 +03:00
Julia Radzhabova 20a45dda5f Menu component: change scroll 2019-06-20 14:32:10 +03:00
Julia Radzhabova 152a8d53f3 Merge branch 'feature/watermark' into develop 2019-06-19 11:30:46 +03:00
Julia Radzhabova 45a82b8442 [DE] Watermark: save language settings 2019-06-18 16:20:52 +03:00
Julia Radzhabova 1fcc5190e5 [DE] Change watermark button 2019-06-18 12:35:01 +03:00
Julia Radzhabova e347b92a0f Use ButtonsArray for group of buttons 2019-06-11 10:52:13 +03:00
Julia Radzhabova 863e500d67 Refactoring buttons render 2019-06-10 13:45:38 +03:00
Julia Radzhabova 24ecdef872 [SSE] Add translation for header/footer settings 2019-05-28 13:00:42 +03:00
Julia Radzhabova 5b3ede3a79 [DE] Add watermark settings 2019-04-05 14:28:51 +03:00
Julia Radzhabova f2278f5cd6 [DE] Fix Bug 40896 (fix for commit 8765f5cc44) 2019-03-21 12:44:09 +03:00
Julia Radzhabova 63a06b9d19 [DE] Add option for align objects, distribute objects 2019-02-12 15:31:27 +03:00
Julia Radzhabova 984f1937f8 Fix Bug 40560 2019-02-12 14:48:27 +03:00
Maxim Kadushkin 9b5ae84f58 Merge branch 'feature/custom-header-view' into develop 2019-02-07 16:00:33 +03:00
Julia Radzhabova 89a704950c Branding refactoring 2019-02-07 13:18:56 +03:00
Julia Radzhabova 048b8480ce Merge branch 'hotfix/v5.2.8' into develop 2019-02-05 16:43:52 +03:00
Julia Radzhabova 1767ba0ae8 Add parameter customization.compactHeader for compact header view (not for desktop) 2019-01-31 16:41:29 +03:00
Alexander.Trofimov c10009a464 [copyright] Update Copyright
Limited -> SIA
2019-01-17 16:05:03 +03:00
Alexander.Trofimov 68a1691d28 [copyright] For bug 39644
Change address Latvian office.
2019-01-17 16:00:34 +03:00
Alexander.Trofimov 1c9e684698 [copyright] Update Copyright
2018 -> 2019
2019-01-17 15:58:05 +03:00
Julia Radzhabova d06e19d543 Merge branch 'feature/desktop-header-view' into develop 2019-01-14 17:01:46 +03:00
Julia Radzhabova 34700233a6 [DE] Add blank page 2018-11-20 12:57:29 +03:00
Julia Radzhabova 888f2880a7 [DE][SSE] Disable buttons on start 2018-10-31 15:47:20 +03:00
Julia Radzhabova c62858944f Enable/disable downloading and printing for different disconnections. Add Asc.c_oAscError.ID.EditingError error. 2018-10-25 16:19:29 +03:00
Julia Radzhabova 3bd78060dc Load image from storage 2018-10-03 14:00:08 +03:00
Julia Radzhabova f671569c88 Merge branch 'release/v5.2.0' into develop 2018-09-28 13:47:04 +03:00
Julia Radzhabova 48fa05b250 For Bug 38948: disable print button on start in the desktop header 2018-09-25 17:09:59 +03:00
Julia Radzhabova 88998b07aa Set header layout as in the desktop editors 2018-09-25 13:46:28 +03:00
Julia Radzhabova 67b742c412
Merge pull request #114 from ONLYOFFICE/feature/highlight-forms
Feature/highlight forms
2018-08-09 12:32:19 +03:00
Julia Radzhabova 557721ab8d Fix Bug 38301 2018-07-24 15:56:05 +03:00
Julia Radzhabova 62f1f3de13 [DE] Set highlight settings for all content controls 2018-07-23 17:39:53 +03:00
Julia Radzhabova 43bad93bb1 Merge branch 'develop' into feature/sse-layout 2018-07-18 14:08:43 +03:00
Julia Radzhabova 6c4e7cf566
Merge branch 'develop' into hotfix/v5.1.5 2018-07-18 10:03:33 +03:00
Julia Radzhabova 685a0a42d3 [SSE] Add layout tab 2018-06-28 12:27:11 +03:00
Julia Radzhabova ae60e24aad [DE] Add modifyContentControl parameter to permissions 2018-06-26 15:46:49 +03:00
Julia Radzhabova c6b5612dcc Update translations 2018-06-14 10:22:41 +03:00
Julia Radzhabova 850148f21f [DE] Fix Bug 36583 2018-05-23 10:43:10 +03:00
Maxim Kadushkin 345e19e135 [All] refactoring tabs redering and selection 2018-05-16 17:41:47 +03:00
Julia Radzhabova 869bc1a7a6 [DE] Show File and Plugins tabs in view mode 2018-05-15 15:37:26 +03:00
Maxim Kadushkin 326e5bfa98 [All] correction z-order for synchronize tooltip 2018-04-24 20:07:04 +03:00
Maxim Kadushkin dbf06b62fe [ALL] added menu for 'options' button 2018-03-21 14:28:28 +03:00
Maxim Kadushkin 03e6994738 Merge branch 'develop' into feature/desktop-new 2018-03-14 18:08:19 +03:00
Maxim Kadushkin 7fd2497462 Merge branch 'release/v5.1.0' into develop 2018-03-14 17:59:24 +03:00
Julia Radzhabova dc9158bc7b [DE] Fix Bug 37059 2018-03-05 12:28:37 +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 9d1bf1199b [DE] Bug 36827 2018-02-26 17:38:35 +03:00
Maxim Kadushkin 09b9947051 [DE] defined button to indicate coauth changes 2018-02-26 16:31:34 +03:00
Maxim Kadushkin 6d0a353d78 [Common] refactoring. defined $icon element for a button 2018-02-26 16:23:07 +03:00
Maxim Kadushkin fc6c6c2cb8 refactoring 2018-02-25 01:19:36 +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