Commit Graph

4010 Commits (c0d33040b602446cc420113159fdaee97264d39c)

Author SHA1 Message Date
yflory 88d23039b6 Remove old code and add comments 2019-01-24 15:46:04 +01:00
yflory ec2f21ec64 Implement lock mechanisms for spreadsheets 2019-01-24 15:26:35 +01:00
ansuz 21d035393d disable english translations 2019-01-24 14:48:18 +01:00
ansuz 5410728bff lint compliance 2019-01-24 14:47:39 +01:00
Paul Libbrecht 73a75c11c9 Actualizing German translations. PL 2019-01-23 19:04:05 +01:00
yflory e993925d81 Better implementation of the IE fix 2019-01-22 13:36:21 +01:00
yflory 01f93f6f7b FIx unrecoverable errors when using IE11 2019-01-22 12:25:49 +01:00
yflory 2ac176eeec Share the correct index in onlyoffice messages 2019-01-21 16:54:31 +01:00
yflory 7d0f34a684 Debugging tools 2019-01-21 16:54:15 +01:00
yflory a66d8c1384 Use lastKnownHash to handle checkpoints in the realtime channel 2019-01-18 18:17:34 +01:00
ansuz 93c5dc9202 Merge branch 'soon' into staging 2019-01-18 15:45:02 +01:00
ansuz 69b50dd102 Merge branch 'master' into soon 2019-01-18 15:44:52 +01:00
yflory 1ecc460686 Fix a backup and restore issue from the settings 2019-01-18 15:41:09 +01:00
yflory ef452d1221 Fix language detection in codemirror when importing a markdown file 2019-01-15 18:20:33 +01:00
yflory 8dbeee1af9 Realtime spreadsheets 2019-01-15 17:54:44 +01:00
yflory a41a31a574 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2019-01-15 14:34:17 +01:00
yflory 6fa7b147e9 Add C, C++, Objective-C and Java to the list of languages in the code app 2019-01-15 14:34:11 +01:00
yflory c5f554fe7b Test with onlyoffice 5.2.6 2019-01-15 14:28:49 +01:00
yflory b79ba61984 Improve realtime channel for onlyoffice 2019-01-15 10:46:39 +01:00
ansuz 5a61453492 Merge branch 'soon' into staging 2019-01-14 16:42:37 +01:00
ansuz 6cf8720458 update how the async store chooses to prune history to avoid the diverged checkpoint bug 2019-01-14 16:40:54 +01:00
ansuz 9105a89eab intantiate ephemeral channels with 34 hex characters 2019-01-14 15:32:49 +01:00
yflory efdecd4059 First step for realtime in onlyoffice apps 2019-01-14 14:01:22 +01:00
ansuz 6f89156415 guard against calling an undefined function 2019-01-11 17:01:43 +01:00
yflory 41a1148c17 Use the same code for the different frontend channels 2019-01-11 15:30:26 +01:00
ansuz 20959f84ae return Boolean from our test for WebRTC support 2019-01-10 18:21:39 +01:00
ansuz 060e5a12a2 lint compliance 2019-01-09 16:16:44 +01:00
ansuz 0f644b04b2 send feedback related to full drive export 2019-01-09 16:16:32 +01:00
yflory b4aae68c0c Fix access rights in the file app 2019-01-09 12:15:08 +01:00
yflory 6a45f5233e Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2019-01-08 17:47:38 +01:00
yflory 6af7d393fd Fix cache issue with ckeditor css 2019-01-08 17:47:22 +01:00
ansuz 0783944e1c Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2019-01-08 15:17:51 +01:00
ansuz 424a14625d add feedback keys for password change and drive migration 2019-01-08 15:17:43 +01:00
yflory 573a3557f1 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2019-01-08 15:03:16 +01:00
yflory 5b80fafe5e Add feedback 2019-01-08 15:03:02 +01:00
ansuz ab832f38b7 send feedback for the subscription button in the settings sidebar 2019-01-08 14:44:40 +01:00
ansuz bcd6a4b6c6 add feedback keys 2019-01-08 14:33:02 +01:00
yflory 107c352922 Update translations 2019-01-08 14:02:54 +01:00
yflory f760253137 Fix typo 2019-01-08 14:02:03 +01:00
yflory d87a87410d Preserve hidden owned pads from a deleted folder 2019-01-08 13:57:22 +01:00
yflory a9e030a6a8 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2019-01-08 10:54:00 +01:00
yflory 6140952763 Hide duplicated owned pads settings for anon users 2019-01-08 10:53:40 +01:00
ansuz 611fb4895c Merge branch 'soon' into staging 2019-01-07 17:07:21 +01:00
Paul Libbrecht 1cd79e12f2 Latest update of the German translation (cursors, shared folders, ...). 2019-01-07 12:25:19 +01:00
yflory 1e672c4a6b Use onlyoffice spreadsheets without ooserver 2019-01-07 12:02:38 +01:00
yflory 047a4a3ab4 Copy files to a shared folder instead of moving them 2019-01-07 10:25:13 +01:00
rhoio 5294604b90
Style, grammar and typo fixes in german translation 2019-01-06 17:40:36 +01:00
yflory 0a7adb3e88 Hide duplicated owned pads 2019-01-04 15:10:13 +01:00
yflory 7658fb90a2 Translations for spellcheck 2019-01-03 18:47:27 +01:00
yflory cef9733262 Enable spellcheck in pad 2018-12-21 18:16:29 +01:00
yflory c6acd191b9 Own drive translations 2018-12-20 11:18:12 +01:00
yflory f2f9b57505 Own drive migration 2018-12-19 18:59:20 +01:00
yflory b2b23446e8 Add missing translations 2018-12-18 14:48:52 +01:00
yflory bbc06f668f Fix undefined hash for deleted shared folders 2018-12-17 15:49:48 +01:00
yflory a11a883cff Cursor improvements in pad, code and slide 2018-12-17 11:44:08 +01:00
yflory d76c21fcf5 Register link in the login page 2018-12-14 16:50:25 +01:00
yflory 2031d535d7 Cursor in pads (again) 2018-12-14 16:40:15 +01:00
yflory ee3102143f Remove debugging logs 2018-12-14 15:38:04 +01:00
yflory 760f58b74c Merge branch 'staging' into oo2 2018-12-13 16:24:11 +01:00
yflory 47fa7f29c9 Merge branch 'disableApps' into staging 2018-12-13 14:46:24 +01:00
yflory 2498f45eb3 Clickable links in pad 2018-12-13 13:22:19 +01:00
yflory ae7d97b3dd Ability to disable apps using appconfig 2018-12-12 14:52:58 +01:00
yflory f883fb7e04 Preserve chat and cursor channel when importing a template 2018-12-12 13:48:28 +01:00
yflory 1a0344547b Improve cursor in pad 2018-12-11 15:59:40 +01:00
yflory 7bbf6951f2 Disable cursors in pad 2018-12-11 14:16:15 +01:00
yflory bfd94c7f2b Merge branch 'cursor' into staging 2018-12-11 13:36:49 +01:00
yflory 95a0bc9fc1 Merge branch 'rochat' into staging 2018-12-11 13:36:41 +01:00
yflory 489a99c5c4 Don't delete the old chat for now 2018-12-11 13:35:00 +01:00
yflory 0197f583f2 Translations for the cursor position settings 2018-12-11 12:04:11 +01:00
yflory 13da052325 Update translation key 2018-12-11 11:09:34 +01:00
yflory fb5ad34299 Fix typo... 2018-12-11 10:57:43 +01:00
yflory a121df2600 Delete validateKey in the messenger memory when we leave the channel 2018-12-11 10:52:11 +01:00
ansuz 8affe4053c Merge branch 'staging' of github.com:joldie/cryptpad into print-code 2018-12-11 10:41:17 +01:00
yflory d88dee9a83 Restrict sending messages in a pad chat to editors only 2018-12-10 17:47:47 +01:00
yflory 32fc941141 Merge branch 'staging' into cursor 2018-12-10 13:46:27 +01:00
yflory a2e28e6e25 Fix missing avatar in cursor tooltip 2018-12-10 13:46:21 +01:00
joldie b2c20682df Removed unnecessary media query. 2018-12-10 13:23:56 +01:00
yflory 186e4b14fe Add missing file 2018-12-10 11:58:34 +01:00
yflory c6f63d4d54 Cursor position in pad 2018-12-10 11:57:39 +01:00
joldie 35c39fae5d Added print button to code pad page. 2018-12-06 16:43:48 +01:00
yflory 600c984576 Only show the user colors in the userlist if the app supports it 2018-12-06 13:59:56 +01:00
yflory 081fc01694 Add a settings category about the cursor 2018-12-06 13:48:14 +01:00
yflory c81b4d77e8 lint compliance 2018-12-06 11:55:40 +01:00
yflory 690cba2b8f Add cursor in slide 2018-12-06 11:54:49 +01:00
yflory f157f852b1 Fix and improve cursor 2018-12-06 11:54:34 +01:00
yflory 1ba80a344b See other users' cursor position 2018-12-04 17:18:42 +01:00
yflory 008b5a3e9f Fix an ownership issue in friend channels 2018-11-27 16:57:55 +01:00
yflory ca45ff31d1 Refactor messenger to use commands from UI to store 2018-11-27 16:55:56 +01:00
yflory cc3e6f3924 Fix scrollbar position in ckeditor #296 2018-11-27 14:07:17 +01:00
yflory f5965716b6 Minor update because of flow... 2018-11-27 13:58:33 +01:00
yflory 2a46b8f855 Fix an issue with last known hash in the messenger 2018-11-27 13:42:11 +01:00
yflory dbad925e5e New cursor recovery system (beta) 2018-11-26 16:23:16 +01:00
yflory 13d6579861 Add typing test in the code app 2018-11-22 14:45:12 +01:00
yflory 015449832c Fix missing characters caused by concurrent editing 2018-11-22 14:44:46 +01:00
yflory 0e6057ee3c Merge branch 'soon' 2018-11-20 15:02:12 +01:00
yflory 3e45cff7c0 Merge branch 'staging' into soon 2018-11-20 15:01:48 +01:00
yflory 56267f4ee1 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2018-11-20 15:01:17 +01:00
yflory aa3f6cb7d7 Update some icons in the drive 2018-11-20 15:01:12 +01:00
ansuz 1b83431382 Merge branch 'master' of https://git.xwikisas.com/xwiki-labs/cryptpad 2018-11-20 13:11:49 +01:00
ansuz d407f9af74 downgrade an XXX to a FIXME 2018-11-20 11:27:59 +01:00