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

437 commits

Author SHA1 Message Date
Julia Radzhabova c9792dde5e [PE mobile] Fixed co-authtoring view. 2016-12-28 16:48:14 +03:00
Julia Radzhabova 993017e082 [PE mobile] Disable editing for locked objects and slides, disable adding objects to deleted slides. 2016-12-28 16:36:58 +03:00
Alexander Yuzhin 74080fa082 Merge branch 'develop' into feature/new-mobile 2016-12-28 13:03:05 +03:00
Julia Radzhabova b2c3707a6e [DE] [PE] Change tooltip for Insert Chart button in the toolbar when chart is selected. 2016-12-27 12:34:08 +03:00
Alexander Yuzhin 09f93da15f [PE mobile] Fixed layout on phone. 2016-12-23 14:41:28 +03:00
Alexey Golubev da8c914a01 Merge tag 'v4.2.3' into develop 
v4.2.3 v4.2.3
 2016-12-23 14:23:17 +03:00
Alexander Yuzhin 131cbf1b02 [PE mobile] Fixed display context menu. 2016-12-23 14:04:03 +03:00
Alexander Yuzhin 3a035f42db [DE mobile] Fixed display context menu. 2016-12-23 13:57:23 +03:00
Julia Radzhabova eab5a97e8c [PE mobile] Fix bugs. 2016-12-22 17:28:19 +03:00
Julia Radzhabova 5dda2832ec [PE mobile] Add localization. 
[DE mobile] Fix localization for table editing.
 2016-12-22 15:11:32 +03:00
Julia Radzhabova 6b1ca42f03 [PE mobile] Add slides demostration. 2016-12-22 14:06:59 +03:00
Alexander Yuzhin 307e3630dd [DE mobile] Fixed display context menu. Fixed display about view. 2016-12-21 19:16:25 +03:00
Alexander Yuzhin 8c0aef300a [SE mobile] Add editing text info shapes and charts. 2016-12-21 17:18:22 +03:00
Julia Radzhabova 518c4212a1 New licence type SuccessLimit. 2016-12-20 18:40:43 +03:00
Julia Radzhabova a2c03c3ea0 Show co-authoring mode settings regardless of the license. 2016-12-20 17:29:37 +03:00
Julia Radzhabova e1991660d7 [PE mobile] Add slide size settings. 2016-12-20 15:39:57 +03:00
Alexander Yuzhin 90ffc633fe Merge branch 'feature/new-mobile' of https://github.com/ONLYOFFICE/web-apps into feature/new-mobile 2016-12-20 14:33:47 +03:00
Alexander Yuzhin 34b58a505f [SE mobile] Edit hyperlink 2016-12-20 14:33:24 +03:00
Julia Radzhabova 46a8fcaa3a [PE mobile] Added context menu. 2016-12-20 12:51:21 +03:00
Julia Radzhabova 17a9d76982 [PE mobile] Edit chart settings. 2016-12-19 17:46:22 +03:00
Julia Radzhabova cb05587be1 [DE] [PE] Change chart type from the toolbar when chart is selected . 2016-12-16 14:33:38 +03:00
Alexander Yuzhin c90ffcc76e [SE mobile] Add vertical axis handlers of charts 2016-12-16 14:17:40 +03:00
Julia Radzhabova 3fe8ee259f Changed layout for chart/sparkline type menu. 
[SSE] Select chart/sparkline type from toolbar.
 2016-12-16 11:37:57 +03:00
Alexander Yuzhin b0e635135f [SE mobile] Chart settings, layout 2016-12-14 17:14:00 +03:00
Julia Radzhabova 8d444cd223 Check origin of messages received in api. 2016-12-14 14:20:18 +03:00
Julia Radzhabova 145bc215ab [PE mobile] Debug slide settings. 2016-12-13 17:49:27 +03:00
Julia Radzhabova bf8c9f1941 [PE mobile] Edit slide transition. 2016-12-13 17:13:54 +03:00
Julia Radzhabova e8f6a536f8 [PE mobile] Debug inserting link. 2016-12-13 16:32:06 +03:00
Julia Radzhabova 6c75dbabde Bug 33646 2016-12-13 15:33:28 +03:00
Alexander Yuzhin 76e30403ef [SE ios] Add icons for Cell settings 2016-12-09 18:43:35 +03:00
Oleg Korshul 59eb32939a scripts 2016-12-09 13:09:45 +03:00
Oleg Korshul dc5f3f8315 scripts 2016-12-09 13:08:05 +03:00
Julia Radzhabova 0421a689d8 Merge remote-tracking branch 'origin/feature/new-mobile' into feature/new-mobile 2016-12-08 17:45:12 +03:00
Julia Radzhabova dd6db343e9 [PE mobile] Editing slide settings. 2016-12-08 17:41:46 +03:00
Alexander Yuzhin c4d4d9e5c9 [DE PE ios] Update style of editor_sdk. 2016-12-08 17:12:45 +03:00
Julia Radzhabova 1ee50da033 Merge branch 'feature/interface-customizer' into develop 2016-12-08 12:14:41 +03:00
Alexander Yuzhin 32442a17e7 Merge branch 'feature/new-mobile' of https://github.com/ONLYOFFICE/web-apps into feature/new-mobile 
# Conflicts:
#	apps/presentationeditor/mobile/resources/css/app-ios.css
 2016-12-07 16:09:06 +03:00
Alexander Yuzhin 3a057c936e [SE mobile] Add EditCell layout. 2016-12-07 16:05:50 +03:00
Julia Radzhabova 409121c262 [PE mobile] Add slides. 2016-12-07 15:15:15 +03:00
Julia Radzhabova f03c42e1ca Merge branch 'develop' into feature/new-mobile 2016-12-07 13:57:28 +03:00
Julia Radzhabova 9c65d45fb6 [PE mobile] Edit hyperlinks. 2016-12-06 17:38:35 +03:00
Alexander Yuzhin 848e27bbe2 [SE mobile] Add EditContainer. 2016-12-06 12:25:21 +03:00
Julia Radzhabova f382936baf [PE mobile] Insert links. 2016-12-06 10:30:33 +03:00
Alexander Yuzhin b2aea5eb2a [SE mobile] Add Search. 2016-12-05 18:25:58 +03:00
Alexey Golubev 33818c1833 Merge tag 'v4.2.0' into develop 
v4.2.0 v4.2.0
 2016-12-05 11:40:21 +03:00
Julia Radzhabova 95bccf6c37 Fix Bug 33599, fix Bug 33600 + fix bug with ThemeColorPalette, when zoom<100. 2016-12-05 11:06:53 +03:00
Alexander Yuzhin e868764f93 Merge branch 'develop' into feature/new-mobile 2016-12-02 13:44:01 +03:00
Julia Radzhabova df7db81378 Merge pull request #43 from ONLYOFFICE/release/v4.2.0 
Release/v4.2.0
 2016-12-01 17:33:19 +03:00
Julia Radzhabova 433732a377 [PE] Fix Bug 32497 (depends on 33002). 2016-12-01 17:31:16 +03:00
Julia Radzhabova c9e983d226 [PE] Fix Bug 19062. 2016-12-01 17:29:44 +03:00
Julia Radzhabova e4dc7c1b7c [PE mobile] Fix checkbox changing. 2016-12-01 14:30:51 +03:00
Julia Radzhabova 6ed79dec7a [PE mobile] Fixed display default table styles. 2016-12-01 14:14:25 +03:00
Julia Radzhabova 337ee3a697 [PE mobile] Added table settings. 2016-12-01 12:20:09 +03:00
Alexander Yuzhin 193c1a3f04 Merge branch 'develop' into feature/new-mobile 2016-11-30 18:25:26 +03:00
Julia Radzhabova 25259f1919 [PE mobile] Insert tables. 2016-11-30 12:52:55 +03:00
Julia Radzhabova 1d6e1db6b2 [PE mobile] Insert images. 2016-11-30 12:02:20 +03:00
Julia Radzhabova 88848300b3 [PE mobile] Added image settings. 2016-11-30 11:38:05 +03:00
Ilya Kirillov 0fb162320d Added links to the new files. 2016-11-29 12:51:23 +03:00
Julia Radzhabova 02230651af [PE mobile] Add shapes. 2016-11-28 17:47:55 +03:00
Julia Radzhabova 38444d61fa Added new error messages. 2016-11-28 14:52:03 +03:00
Julia Radzhabova c38fac9012 [PE mobile] Added shape settings. 2016-11-25 17:10:53 +03:00
Julia Radzhabova 97ec7f0934 [PE mobile] Join text and paragraph settings into one panel Text. 2016-11-25 13:10:24 +03:00
Julia Radzhabova b7c6ebc08e [PE mobile] [SSE mobile] Fixed fill user info. 2016-11-24 17:13:27 +03:00
Julia Radzhabova d911b61ddd [mobile] Added "token" parameter to api config. 2016-11-24 16:56:12 +03:00
Julia Radzhabova efa2784f3f Merge branch 'develop' into feature/new-mobile 2016-11-24 16:51:54 +03:00
Julia Radzhabova e82da5ebab Added "token" parameter to api config. 2016-11-24 16:44:54 +03:00
Julia Radzhabova 4939665d9f [PE] Fix Bug 33519. 
When starting preview in the Chrome browser in fullscreen mode (F11) resize event isn't fired.
 2016-11-24 12:42:43 +03:00
Alexander Yuzhin 10c41b8892 [PE mobile] Fixed display document area. 2016-11-24 09:33:11 +03:00
Alexander Yuzhin 4189255a21 Merge develop into new-mobile 2016-11-23 19:05:03 +03:00
Julia Radzhabova 49cef9fad2 [PE mobile] Added text and paragraph settings. 2016-11-23 16:03:34 +03:00
Julia Radzhabova 7e27652257 Fixed Bug 33189. 2016-11-23 14:15:14 +03:00
Alexander Yuzhin 1b63975a03 [PE mobile] Add EditContainer and AddContainer. 2016-11-22 14:45:53 +03:00
Alexander Yuzhin 64b17d7331 [PE mobile] Fixed Settings view. 2016-11-22 13:40:22 +03:00
Alexander Yuzhin b0eafed82a [PE mobile] Add Settings view 2016-11-22 13:40:00 +03:00
Alexander Yuzhin fb589034d9 [PE mobile] Add search. 2016-11-22 10:48:36 +03:00
Alexander Yuzhin 313f799cd5 [PE mobile] Fixed top offset of workarea. 2016-11-22 10:10:34 +03:00
Maxim Kadushkin 5c801c686d [PE embed] fix bug 33444, 33433 2016-11-21 19:28:16 +03:00
Julia Radzhabova 7e8481d17b [PE] Disable fullscreen in IE11 in preview mode because of bug in IE11 (https://github.com/jquery/jquery/issues/3041). 2016-11-21 16:41:55 +03:00
Alexander Yuzhin f11ea296f6 [PE mobile] Draft 2016-11-21 14:13:27 +03:00
Julia Radzhabova bf398318a2 Fix Bug 33458. 
Fix Bug 33476.
Fix Bug 33475.
 2016-11-21 11:36:28 +03:00
Maxim Kadushkin 503f4a0e73 fix bug 33454 2016-11-18 18:00:46 +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
Maxim Kadushkin ba56ef921c [embed] debug of start config 2016-11-17 16:01:54 +03:00
Julia Radzhabova ca3e9eb589 Fix Bug 33431. 2016-11-17 14:51:36 +03:00
Julia Radzhabova daf066c656 Change editor config: added "autosave" parameter to customization - initial option for autosaving. 
Used if the user didn't change autosave or co-editing mode in the advanced settings.
 2016-11-17 14:13:33 +03:00
Julia Radzhabova 275c592337 Update translations. 2016-11-16 13:35:26 +03:00
Julia Radzhabova 7dfcc927f6 Interface customization using plugins. Need to append config->editorConfig->pluigns->UIpluginsData field with list of customizer plugins. 2016-11-16 12:38:16 +03:00
Maxim Kadushkin 5e45c1f9e5 Merge branch 'develop' into feature/newembed 2016-11-15 15:27:01 +03:00
Julia Radzhabova 26819a5488 [PE] Fixed Bug 33406. 2016-11-15 11:55:49 +03:00
Maxim Kadushkin b697411317 [PE embed] debug 'player' mode 2016-11-14 14:38:41 +03:00
Maxim Kadushkin cde02d1526 merge branches [newembed] and [bootstrap-3.3.7] 2016-11-11 16:59:11 +03:00
Maxim Kadushkin 93d484dc72 [PPE embed] turn on player on app start 2016-11-11 15:13:25 +03:00
Julia Radzhabova 994ee98c00 Merge branch 'develop' into feature/bootstrap-3.3.7 2016-11-11 12:16:32 +03:00
Julia Radzhabova ad21492c29 Disable toolbar and right panel when lost editing rights (api method denyEditingRights). 2016-11-10 15:38:26 +03:00
Maxim Kadushkin e63a24cecf added less v 2.7.1, removed unused resources 2016-11-10 14:48:41 +03:00
Alexander.Trofimov 4f491a750c c_oAscVerticalTextAlign -> c_oAscVAlign 
TEXT_ALIGN_BOTTOM -> Bottom
TEXT_ALIGN_CTR -> Center
TEXT_ALIGN_DIST -> Dist
TEXT_ALIGN_JUST -> Just
TEXT_ALIGN_TOP -> Top
 2016-11-10 14:24:18 +03:00
Julia Radzhabova 3134a3f73c [DE] [PE] Change layout for chart settings in the right panel. 2016-11-10 12:37:28 +03:00
Maxim Kadushkin 88205825af [embed] repaired deployment 2016-11-08 15:22:15 +03:00
Maxim Kadushkin 2bcdfdbd3b removed ZeroClipboard 2016-11-08 12:44:23 +03:00
Julia Radzhabova 5f82b1e5cd Update translations. 2016-11-08 11:53:01 +03:00
Maxim Kadushkin 960d5850d4 [PE embed] updated embed viewer 2016-11-03 18:22:26 +03:00
Maxim Kadushkin 83a9f5ee5d [embed] repaired link for error on IE 2016-11-03 18:16:32 +03:00
Julia Radzhabova 267d6a2fa0 [PE] Update styles for bootstrap-3.3.7 2016-11-03 14:38:59 +03:00
Julia Radzhabova b936280d78 Merge branch 'hotfix/v4.1.8' into develop 2016-11-03 13:27:16 +03:00
Julia Radzhabova a8dbadb2ae Update translations. 2016-10-28 16:52:51 +03:00
Julia Radzhabova 2b4ebdefa1 Changed branding permissions. Use canBranding from license to hiding panels. 2016-10-28 16:38:33 +03:00
Julia Radzhabova 75a175b426 Merge pull request #38 from ONLYOFFICE/hotfix/v4.1.7 
Hotfix/v4.1.7
 2016-10-28 14:51:47 +03:00
Julia Radzhabova 67cdfb5592 Fix bug with underscore _.each method in IE9. 2016-10-27 14:39:54 +03:00
Julia Radzhabova 28bdc1b91a Update translations. 2016-10-27 13:38:24 +03:00
Julia Radzhabova cf53fc04a1 [PE][SSE] Debug context menu for equations. 2016-10-26 16:20:51 +03:00
Julia Radzhabova 7761977ff6 Merge branch 'hotfix/v4.1.6' into develop 2016-10-26 13:37:10 +03:00
Julia Radzhabova c40b96d685 Update translations. 2016-10-26 13:30:55 +03:00
Julia Radzhabova af438ff5f2 Update translations. 2016-10-25 16:46:21 +03:00
Julia Radzhabova 054319793f [PE] Added equations. 2016-10-25 13:48:31 +03:00
Julia Radzhabova 04acc3ecc8 Autostart plugin after loading plugins. 2016-10-21 17:09:58 +03:00
Julia Radzhabova 1058d48f46 Add parameters to config for hiding toolbar, left menu, right menu. 2016-10-21 16:47:46 +03:00
Julia Radzhabova ed441aac53 [PE] Update toolbar icons. 2016-10-21 13:55:31 +03:00
Julia Radzhabova f5fb3f94f5 Merge branch 'develop' into feature/refactor 2016-10-20 11:59:23 +03:00
Julia Radzhabova 3eecfa1e83 [PE] Delayed loading for some of the toolbar controls. 2016-10-20 11:55:54 +03:00
Julia Radzhabova 1bcc69da7a Get edit rights from server config: asc_getRights. Used to set singletone mode 2016-10-20 10:22:16 +03:00
Julia Radzhabova fb0e00edb9 [PE] Hints in the toolbar are moved to delayed loading. 2016-10-19 16:30:26 +03:00
Julia Radzhabova 65ec79e1a8 [PE] Delay rendering controls on the right panel (slide settings). 2016-10-19 15:54:43 +03:00
Julia Radzhabova 4048b849f8 Optimization for mouse click to document: replace heavy bootstrap function clearMenus. Elements with data-toggle=dropdown must have class dropdown-toggle. 2016-10-19 14:16:46 +03:00
Julia Radzhabova a7e603ca5f [PE] [SSE] Optimization of right panel. 2016-10-18 11:58:27 +03:00
Julia Radzhabova ccd2a7fcea Merge branch 'develop' into feature/refactor 2016-10-14 17:13:51 +03:00
Julia Radzhabova 963202b919 Fix layout in the status bar panel with users count in co-authoring mode. 2016-10-14 17:00:48 +03:00
Julia Radzhabova b303c38d94 Fixed bug: change focus from text field or textarea to another text field or textarea (e.g. click to fiedls in the search dialog in replace mode). 2016-10-14 16:58:57 +03:00
Julia Radzhabova 3e5fff37e8 [PE] Delay rendering controls on the right panel (shape, textart settings) + init shape settings in the right panel before first opening.. 2016-10-14 13:48:04 +03:00
Julia Radzhabova a4acc71b13 Merge branch 'develop' into feature/refactor 2016-10-14 11:40:06 +03:00
Julia Radzhabova 0dd09875b8 Disable download as, print, save and version history when server is disconnected. 2016-10-12 16:32:48 +03:00
Julia Radzhabova 50a5653fb4 [PE] Delay rendering controls on the right panel. 2016-10-11 13:29:21 +03:00
Julia Radzhabova 65afc4894c [PE] Delay rendering controls in Chart Settings on the right panel. 2016-10-07 16:31:11 +03:00
Julia Radzhabova f9613e3a3c File menu: Back to Document -> Close menu. 2016-10-05 16:33:10 +03:00
Julia Radzhabova 10271fa79c [PE] Fix Bug 33178. 2016-10-04 12:47:18 +03:00
Julia Radzhabova a398c46d8d [PE] Open encrypted pptx. 2016-09-29 16:06:22 +03:00
Julia Radzhabova 3eb619db31 Added "Rename" to the File menu. 2016-09-27 15:09:32 +03:00
Julia Radzhabova a362235acf Rename file from editors. 2016-09-26 13:54:25 +03:00
Julia Radzhabova a9cc2ce9ad Merge branch 'hotfix/v4.1.2' into develop 2016-09-20 10:50:17 +03:00
Julia Radzhabova 2ea1534351 Updated translations 2016-09-19 18:21:41 +03:00
Julia Radzhabova 7749b95544 Added developer mode. 2016-09-19 17:04:56 +03:00
Alexander Yuzhin ebd0c0bbee Fixed mobile version on ios. 2016-09-16 11:04:48 +03:00
Julia Radzhabova b304d3e651 Fix Bug 33115. 2016-09-15 15:59:06 +03:00
Julia Radzhabova 3040a32430 Merge pull request #30 from ONLYOFFICE/hotfix/v4.1.2 
Hotfix/v4.1.2
 2016-09-14 15:59:10 +03:00
Alexander Yuzhin 66f4cc1086 Fixed mobile editors 2016-09-14 15:04:28 +03:00
Julia Radzhabova 7d4ce1c7a2 Fix bug with loader logo (when no logo-parameter). 2016-09-14 14:01:59 +03:00
Julia Radzhabova 376990a7a6 Added custom logo to loader of the editors (need parameter in config -> customization). 2016-09-14 12:45:10 +03:00
Julia Radzhabova 4e72c53a8a Load initial value for compact toolbar from editor config. 2016-09-13 15:03:32 +03:00
Julia Radzhabova 35d21fdb65 Load initial zoom value from editor config. 2016-09-13 11:28:21 +03:00
Julia Radzhabova 6cf46f4442 Bug 33044. 2016-09-13 09:40:44 +03:00
Alexey Golubev 2409aa1947 Merge tag 'v4.1.1' into develop 
v4.1.1
 2016-09-12 16:33:17 +03:00