43 Commits

Author SHA1 Message Date
Victor Dubiniuk
4f5f51a085 A pile of fixups 2015-06-11 21:12:55 +03:00
Victor Dubiniuk
1f9288176b Patch Tools manually 2015-06-11 01:33:33 +03:00
Victor Dubiniuk
28f377dc8f Patch EditorSession manually 2015-06-11 01:33:33 +03:00
Victor Dubiniuk
c3f8c8d13d Patch MemberListView manually 2015-06-11 01:33:33 +03:00
Victor Dubiniuk
7898d5bc31 Add vanilla webodf 2015-06-11 01:33:26 +03:00
Victor Dubiniuk
f03a1a0edf Apply some upstream patches 2015-01-26 23:51:28 +03:00
Victor Dubiniuk
fa35da1802 Fix broken title in some cases 2015-01-22 20:52:55 +03:00
Victor Dubiniuk
755fa560a7 Place OC controls inside own toolbar as dijit widgets 2014-12-19 00:02:40 +03:00
Victor Dubiniuk
5cef103648 Group members by userId. Ref #125 2014-11-19 19:56:27 +03:00
Victor Dubiniuk
cf9fb6c809 Send Json content-type to avoid guessing 2014-10-28 20:23:15 +03:00
VicDeo
c7e584f405 Merge pull request #378 from owncloud/fix-373
Translate relative path into absolute for fonts
2014-10-15 19:40:44 +03:00
Victor Dubiniuk
77a074232e Translate relative path into absolute for fonts stripping index.php 2014-10-15 00:09:36 +03:00
Victor Dubiniuk
cabf831bc9 Zooming with combobox 2014-10-08 02:51:05 +03:00
Victor Dubiniuk
d5861b8bc4 Zooming with dropdown instead of slider 2014-10-07 00:45:38 +03:00
Victor Dubiniuk
068390bf83 Cleaner way to get current memberId 2014-03-26 23:14:01 +03:00
Victor Dubiniuk
8153b08362 First user is me 2014-03-22 01:37:13 +03:00
Victor Dubiniuk
f26e107504 No more barrier to enter for guests. Closes #200 2014-03-14 20:49:17 +03:00
Victor Dubiniuk
5cfea26265 Move ServerFactory downstream. Closes #221 2014-03-13 00:15:32 +03:00
Aditya Bhatt
b192e4828d Sync to WebODF 8d8fc0216874b9dd9e3e3eef68dd2474a11f02f3
Make virtual selections have draggable handles on touch
screens.
2014-03-12 11:30:12 +01:00
Aditya Bhatt
205f9198f9 Sync to WebODF 8d8fc0216874b9dd9e3e3eef68dd2474a11f02f3.
* Collaborative virtual selections for iOS Safari.
2014-03-07 19:06:21 +01:00
VicDeo
a0746968a1 Merge pull request #216 from owncloud/kill-routes.json
Replace OC.Router.generate() with OC.generateUrl()
2014-03-07 17:58:53 +02:00
Aditya Bhatt
90b2bdd42c Sync to WebODF dbdc4e91827d460dbf71785a16b7a472bef548a1.
* Fixes a bug with blocky rendering of multi-paragrap selections on iOS.
* Gets rid of the second blue native caret alongside the user's caret.
2014-03-05 13:58:15 +01:00
Aditya Bhatt
3cd491a5ef Sync with WebODF e50bc588ff3e380178ffabecfe2fbca92bef6aed.
* Keyboard support in iOS and other touchscreens
* Pinch-zoom support on touch devices
* SVG selections that look like those in LibreOffice
* Major speed improvements with all editing operations and cursor movements
* IME support on desktop browsers
* Word-by-word navigation with Ctrl+Left/Right
* Fixes for IE11
* Ability to add/edit/remove Hyperlinks.
2014-03-04 16:19:31 +01:00
Thomas Müller
c9f5e23c92 Replace OC.Router.generate() with OC.generateUrl() 2014-03-02 23:42:38 +01:00
Aditya Bhatt
5ff78040fb Sync with webodf fc3a4e615597be18da1e23e03302ef472b9a95e5
* Improve text insertion and paragraph splitting OT -
therefore no more conflict and sync failure when multiple
users insert text or split the paragraph at the same
position.
* Increase performance of virtual selections
2013-12-06 15:55:22 +01:00
Victor Dubiniuk
3a8bea040e Ignore avatar faults. ref #140 2013-12-06 00:48:19 +03:00
Friedrich W. H. Kossebau
e3adf6bd19 Sync with webodf 82510ae020f8ee8a1f7b65a27b6af107b6023e90
* exposes some state-change/error events in the Editor API
* catches more possible errors and handles them
  (e.g. staying cool on temporary disconnection to server, but warning about it)
* improves selection by mouse
* fixes selected paragraph style not being set to all selected paragraphs
* fixes leaking of some helper attributes into saved ODT files
2013-12-03 20:34:48 +01:00
Victor Dubiniuk
190e161b44 Fixing avatar 2013-11-26 23:16:39 +03:00
Friedrich W. H. Kossebau
c0da073794 Sync with webodf 6c0affd94e1aa9d706ea8aadd3509db04bc17235
* write correct meta-data into every document on save
* remove need for regular polling of data about sessionmember
* fix for spaces entered after a tab
* small performance improvements
2013-11-26 17:52:09 +03:00
Friedrich W. H. Kossebau
15b7bdfd9d Sync with webodf 1875ef27bc220bc49dc6092e7de9b5e184c2e855
* adds support for direct text styling:
  + bold
  + italic
  + underline
  + strikethrough,
  + font
  + fontsize
* fixes broken OT on selections vs. other editing operations
* performance improvements with big documents
2013-11-15 19:02:20 +01:00
Friedrich W. H. Kossebau
47c0cbc5e8 Sync with webodf 379ba3bfff4a7d736109f48c8ab72ea649a77918
* enables initial support for integrating into OC-Docs translation system
* fixes broken paragraphstyle dialog on 2nd and later editor start with the same OC-App page-life-cycle
* showing selections of other users, not just the cursor
* lots of small fixes with cursor/selection
2013-11-09 18:01:43 +01:00
Victor Dubiniuk
efcc0ed3f9 Integrate bootstrap, wait for js components to load 2013-10-22 16:18:03 +03:00
Victor Dubiniuk
d8037312c0 Align avatars correctly 2013-09-30 20:53:47 +03:00
Victor Dubiniuk
e47267adb1 Disable show member caret on click 2013-09-30 19:47:45 +03:00
Victor Dubiniuk
886273dd10 Hacking WebODF to fix #51 2013-09-30 19:32:35 +03:00
Friedrich W. H. Kossebau
93c774d81e Update to latest WebODF pullbox branch
Noticable changes:
* no more freezing on closing a document where edited paragraphs had been removed
2013-09-27 20:53:40 +02:00
Victor Dubiniuk
fd60eddf2c Hide user avatar in document by default. Ref #30, #42 2013-09-25 16:34:54 +03:00
Friedrich W. H. Kossebau
a7ad5632cb Update to latest WebODF pullbox branch
Noticable changes:
* focus returns to canvas after usage of zoom tool or paragraph style dialog
* Default paragraph style is listed with normal paragraph styles
* Cursor is not hidden, but shown non-blinking if tool is used
2013-09-25 00:37:56 +02:00
Victor Dubiniuk
670016580f Fix path to otpoll for external requests 2013-09-24 15:49:00 +03:00
Friedrich W. H. Kossebau
ff5c0ec6ff Update to latest pullbox branch
Noticable changes:
* focus returns to canvas after paragraph style selection
2013-09-17 17:04:22 +02:00
Friedrich W. H. Kossebau
70ad7f824b Move webodf.js to proper location 2013-09-17 16:56:23 +02:00
Victor Dubiniuk
89fdf22265 Move WebODF js/css code to 3rdparty 2013-09-17 16:21:38 +03:00
Victor Dubiniuk
86268cdccd Move WebODF js code to 3rdparty 2013-09-17 14:58:57 +03:00