Commit Graph

203 Commits (310909dc9ee26012a5090c9ad6ddb7aa5f04f41f)

Author SHA1 Message Date
yflory c00158d23a Move code to common-history 2017-05-10 13:39:14 +02:00
yflory ff16084719 Fix lint errors 2017-05-09 18:10:02 +02:00
yflory c79a6e3b2b Move Metadata, CodeMirror and title functions in separate files 2017-05-09 17:47:47 +02:00
yflory 5a883d5a57 Use the new toolbar and move the userlist code in a separate file 2017-05-05 17:56:49 +02:00
ansuz 78b11584f8 remove unused variables 2017-05-04 16:16:09 +02:00
yflory a165332c15 Don't store a pad in the drive if the limit has been reached 2017-04-28 12:08:05 +02:00
ansuz f7e96b4e8c resolve merge conflicts and jquery errors 2017-04-24 13:43:18 +02:00
yflory 5fc2e4cf71 Remove the toolbar in ckeditor history mode + history configurable 2017-04-24 11:41:00 +02:00
yflory 92ea03d7d9 View and restore the history of a pad 2017-04-21 17:31:47 +02:00
Caleb James DeLisle c341fa8e94 Pull jquery using require.js rather than as a script tag and fix require to pass jquery as a parameter 2017-04-18 12:14:32 +02:00
ansuz 50277cb0ae don't rely on 'info' in onRemote so we can call it anywhere 2017-04-13 19:46:38 +02:00
ansuz df4a250359 use feedback api instead of app= 2017-04-13 12:18:08 +02:00
yflory 84d8615cf1 Save and use templates in pad, code and slides 2017-04-07 18:20:03 +02:00
yflory 71c59d7ae2 Remove unnecessary TODOs 2017-03-27 11:53:13 +02:00
yflory d92a875ce5 Translate the 'wrong application' error message 2017-03-27 11:34:54 +02:00
yflory a8ffac5dcd Remove old code 2017-03-27 11:30:09 +02:00
ansuz 912215185f add uid to userdata for better notifications 2017-03-24 13:32:42 +01:00
ansuz 4a173e30dc set user's cursor to either the beginning or end of the document 2017-03-20 17:51:56 +01:00
yflory 15e9af77bb Remove the langauge selector from toolbar and add it in settings 2017-03-15 17:14:49 +01:00
yflory a286599f93 Fix fast reconnect, and add support for reconnecting ws in polls 2017-03-15 16:01:00 +01:00
ansuz 8a48612de2 add some notes for later 2017-03-07 14:40:06 +01:00
ansuz c04819538b Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-03-03 18:16:39 +01:00
ansuz fcb9848b3a hide toolbar when in read-only mode 2017-03-03 18:16:34 +01:00
yflory 2a1b241592 Display a button to open the editing link while in read-only mode if we know it 2017-03-03 18:14:53 +01:00
ansuz 7db0e14bc0 add 'force' flag to override removal of html elements 2017-03-01 17:05:57 +01:00
yflory 412815b042 Merge branch 'security' of git.xwikisas.com:xwiki-labs/cryptpad into security 2017-03-01 13:10:55 +01:00
yflory 11d54256da Make sure the display name is displayed in the same way everywhere 2017-03-01 13:10:06 +01:00
ansuz 639376f1cb don't use hyperjson.toString 2017-03-01 12:36:10 +01:00
yflory 8741b50f5b Set the file name as default title if a pad is created from the drive 2017-02-27 18:15:18 +01:00
yflory e38df7ce47 Fix creation of new pads in /pad 2017-02-27 17:47:11 +01:00
yflory f8d653406a Add the new content for the default pad and add french translation 2017-02-27 17:23:28 +01:00
yflory d4bf7cf9aa Send the initial state only if it is a new pad in /pad 2017-02-27 14:29:38 +01:00
yflory fadddb297c Readonly mode in /pad had contenteditable set to true 2017-02-27 12:41:29 +01:00
yflory 5303e76ece Make sure the content is correctly applied in onReady 2017-02-24 18:55:41 +01:00
yflory e15a6a347f Fix the forget pad button 2017-02-24 15:22:26 +01:00
yflory a0340f1419 Open link in a new tab in /pad 2017-02-23 14:27:18 +01:00
yflory 0ce17ebbad CryptDrive usability improvements (new file in drive + context menu) 2017-02-22 12:25:29 +01:00
ansuz 3d0e7cb9a7 pull ckeditor config out of main.js 2017-02-21 18:21:30 +01:00
yflory c72bbd4c37 Use the file name as initial title 2017-02-21 17:42:58 +01:00
yflory 47b8fefd9e Load messages.js only once, in cryptpad-common 2017-02-21 14:16:23 +01:00
yflory c17f28e5fe Fix race condition #2 2017-02-17 15:39:34 +01:00
yflory e4dbe97d71 Update display name in realtime across tabs and remember 'anonymous' name 2017-02-16 15:35:03 +01:00
yflory 2851ceb95a Merge branch 'soon' into staging 2017-02-13 11:59:49 +01:00
ansuz 1232aa8a79 jshint compliance 2017-02-10 14:25:02 +01:00
ansuz a995df25f6 disable new OT in pad and code app 2017-02-09 17:20:13 +01:00
yflory d54262c8df Use the same disconnecter error translation key for all the apps 2017-02-09 15:34:14 +01:00
yflory 3af7c9cff8 Replace the expand/collapse ckeditor button by our own to save space 2017-02-08 15:32:55 +01:00
yflory 914c442615 Do not redirect to home page when logging out from another tab 2017-02-08 12:54:07 +01:00
yflory 373b07ed28 Fix lint errors 2017-01-25 10:21:31 +01:00
yflory ce1e792419 Merge branch 'soon' into newtoolbar 2017-01-24 12:54:07 +01:00