Commit graph

578 commits

Author SHA1 Message Date
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 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 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 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
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
Julia Radzhabova 89e6d51ddc [DE] Fix Bug 33117. 2016-09-15 16:29:34 +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
Julia Radzhabova d0216389f5 Bug with closing password window using Enter. 2016-09-14 15:57:39 +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
Alexander Trofimov 5d6df7dfbe Update Readme.md 2016-09-14 10:58:40 +03:00
Julia Radzhabova 4e72c53a8a Load initial value for compact toolbar from editor config. 2016-09-13 15:03:32 +03:00
Julia Radzhabova 7853348669 [SSE] Bug with delayed loading of toolbar (clone object properties). 2016-09-13 11:56:42 +03:00
Julia Radzhabova bc979bc539 Merge branch 'develop' into refactor 2016-09-13 11:44:49 +03:00
Julia Radzhabova 428bddd013 Merge pull request #29 from ONLYOFFICE/hotfix/v4.1.2
[DE] Bug with delayed loading of toolbar.
2016-09-13 11:43:12 +03:00
Julia Radzhabova 24ae06f271 [DE] Bug with delayed loading of toolbar. 2016-09-13 11:41:33 +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
Alexey Golubev 8c71394932 Merge branch 'hotfix/v4.1.1' 2016-09-12 16:33:07 +03:00
Julia Radzhabova fbf371080a Revert commit 2bb4486c72 (Bug 29737). 2016-09-09 17:52:19 +03:00
Julia Radzhabova 665e3b77a5 Merge pull request #28 from ONLYOFFICE/hotfix/v4.1.1
Hotfix/v4.1.1
2016-09-08 19:29:05 +03:00
Julia Radzhabova 848152eb3f Fix Bug 33085. 2016-09-08 19:27:43 +03:00
Julia Radzhabova 6812a5b9a0 [PE] Fix Bug 32442. 2016-09-08 15:04:31 +03:00
Julia Radzhabova a46308852c Updated plugin icons. 2016-09-07 14:58:12 +03:00
Maxim Kadushkin 664ea58e1e permissions didn't initialize at app start 2016-09-06 14:46:15 +03:00
Julia Radzhabova 4549b770ab Merge pull request #27 from ONLYOFFICE/hotfix/v4.1.1
Hotfix/v4.1.1
2016-09-06 13:57:50 +03:00
Julia Radzhabova a92ae8bf8f Fixed loading mask in plugin dialog. 2016-09-06 13:54:22 +03:00
Julia Radzhabova 6bfd3d80bb Absolute urls in plugins. 2016-09-05 18:28:56 +03:00
Julia Radzhabova f821bd04fa [PE][SSE] Changed pluigns config. 2016-09-05 17:43:29 +03:00
Alexander Trofimov 12c1b688d3 Update Readme.md 2016-09-05 17:24:22 +03:00
Julia Radzhabova 1f76033e5d [DE] Changed pluigns config. 2016-09-05 16:06:24 +03:00