Commit graph

5558 commits

Author SHA1 Message Date
Julia Radzhabova 811757a8bc Show shape (not text art) settings in the right panel when selecting shape or text art. Show text art settings when adding text art to document. 2016-09-29 16:26:05 +03:00
Julia Radzhabova a398c46d8d [PE] Open encrypted pptx. 2016-09-29 16:06:22 +03:00
Julia Radzhabova dee3dede32 Merge branch 'develop' into feature/sparklines 2016-09-29 13:36:42 +03:00
Julia Radzhabova 24c332b914 [SSE] Fix bug with selecting data range. 2016-09-29 13:36:11 +03:00
Julia Radzhabova d71a5a777e Merge branch 'develop' into feature/sparklines 2016-09-29 12:53:21 +03:00
Julia Radzhabova e7ad410744 [SSE] Select data range for charts from the right panel. 2016-09-29 12:38:39 +03:00
Julia Radzhabova 652a3f1c28 [SSE] Updated layout for sparkline settings. 2016-09-28 16:30:37 +03:00
Julia Radzhabova 245c8d6638 [SSE] Changed control for sparkline style, updated layout for sparkline settings. 2016-09-28 15:21:36 +03:00
Julia Radzhabova 2e34d7b1f0 [SSE] Update sparkline styles in advanced settings. 2016-09-27 16:20:55 +03:00
Julia Radzhabova 5fe026ec86 Merge branch 'develop' into feature/sparklines 2016-09-27 15:13:05 +03:00
Julia Radzhabova 3eb619db31 Added "Rename" to the File menu. 2016-09-27 15:09:32 +03:00
Julia Radzhabova 998f6f48d5 [SSE] Update sparkline styles. 2016-09-27 13:43:59 +03:00
Julia Radzhabova a440a825ce [SSE] Update sparkline settings 2016-09-26 17:23:56 +03:00
Julia Radzhabova 4bd7b56a4b [SSE] Load spark styles. 2016-09-26 16:53:11 +03:00
Julia Radzhabova 954f36aeff [DE] Fix Bug 33142. 2016-09-26 15:07:51 +03:00
Julia Radzhabova 5a276c6e48 Fix Bug 33141. 2016-09-26 14:56:39 +03:00
Julia Radzhabova a362235acf Rename file from editors. 2016-09-26 13:54:25 +03:00
Julia Radzhabova 28f1d07c43 Merge branch 'develop' into feature/sparklines 2016-09-23 14:25:56 +03:00
Julia Radzhabova e0575a4db6 Fix Bug 33139. 2016-09-23 14:24:54 +03:00
Julia Radzhabova cfb39ba890 [SSE] Sparkline settings: change type of Line Weight component. 2016-09-23 11:23:23 +03:00
Julia Radzhabova d4c0969dbc [DE] Update style for version history. 2016-09-22 16:55:01 +03:00
Julia Radzhabova f178d63915 Don't load document if the config parameter "document.key" isn't string. 2016-09-22 16:27:52 +03:00
Julia Radzhabova f55ce0d375 [DE] Don't restore last version. Don't show changes by default. 2016-09-22 14:57:41 +03:00
Julia Radzhabova 2afdb191df [DE] Update layout for history versions + hide changes for revision. 2016-09-22 12:43:31 +03:00
Alexey Golubev 6874a5bb1d Merge tag 'v4.1.2' into develop
v4.1.2
2016-09-22 12:06:07 +03:00
Alexey Golubev c083753f78 Merge branch 'hotfix/v4.1.2' 2016-09-22 12:05:52 +03:00
Julia Radzhabova caa0d1aee7 [DE] Update style for history changes. 2016-09-21 16:07:45 +03:00
Julia Radzhabova 73cfc7efb2 Merge branch 'develop' into feature/sparklines 2016-09-21 14:25:06 +03:00
Julia Radzhabova 5739d6cd73 Merge pull request #34 from ONLYOFFICE/feature/restore-version
Feature/restore version
2016-09-21 13:35:44 +03:00
Julia Radzhabova 7dee06c9c7 Merge pull request #33 from ONLYOFFICE/refactor
Refactor
2016-09-21 12:11:11 +03:00
Julia Radzhabova 17342c5ccd Merge branch 'develop' into refactor 2016-09-21 11:41:59 +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 e9882cbfad [SSE] Load advanced sparkline settings. 2016-09-20 14:46:36 +03:00
Julia Radzhabova 516d986c1d [SSE] Fix bug with loading spark properties. 2016-09-20 13:33:22 +03:00
Julia Radzhabova 88a76ed509 [SSE] Load sparkline properties to the right panel. 2016-09-20 13:26:47 +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
Julia Radzhabova 28be3e9f70 [DE] Restore revision from changes. 2016-09-19 15:58:12 +03:00
Julia Radzhabova c23a1350d5 [SSE] Update spark icons. 2016-09-19 15:29:30 +03:00
Julia Radzhabova 18221c0945 [SSE] Show sparkline properties. 2016-09-19 12:54:30 +03:00
Julia Radzhabova b33f00e0a7 [DE] Restore from changes in versions history. 2016-09-19 10:41:02 +03:00
Julia Radzhabova fee0e4362e [SSE] Use c_oAscSparklineType. 2016-09-16 16:24:46 +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
Alexander Yuzhin bf566734ee [DE] Fix bug 33051 2016-09-16 14:49:01 +03:00
Alexander Yuzhin e7589a5f3e [DE] Fix Bug 33051 2016-09-16 11:52:37 +03:00
Alexander Yuzhin 36f49fa837 Merge branch 'hotfix/v4.1.2' of https://github.com/ONLYOFFICE/web-apps into hotfix/v4.1.2 2016-09-16 11:05:16 +03:00
Alexander Yuzhin ebd0c0bbee Fixed mobile version on ios. 2016-09-16 11:04:48 +03:00
Alexander Yuzhin 6b18a65ab4 Update sencha touch 2016-09-15 17:14:43 +03:00
Julia Radzhabova 02951be6c1 Merge pull request #31 from ONLYOFFICE/hotfix/v4.1.2
[DE] Fix Bug 33117.
2016-09-15 16:30:32 +03:00