Commit Graph

190 Commits (72ef730f23976d0f941fa415f23988d57d5db03e)

Author SHA1 Message Date
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
yflory 43c045721c Get the channel history 2017-04-14 18:36:36 +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
yflory 2ad0a65b71 Remove shortcuts that override browser actions 2017-04-13 16:43:07 +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 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
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
yflory cb88227e2b Autocomplete on key press in some dropdown menus 2017-03-06 12:20:23 +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 868161a8a8 fix undefined reference in code 2017-03-02 17:59:59 +01:00
ansuz 7db0e14bc0 add 'force' flag to override removal of html elements 2017-03-01 17:05:57 +01:00
yflory 2ad9debe58 Remove the placeholders in /code and /slide 2017-02-27 11:45:23 +01:00
yflory e15a6a347f Fix the forget pad button 2017-02-24 15:22:26 +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 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 914c442615 Do not redirect to home page when logging out from another tab 2017-02-08 12:54:07 +01:00
yflory 7e7d1f7a16 Display the error when opening a document with the wrong app 2017-02-06 12:43:56 +01:00
yflory 7d6e15e465 Throw an error when trying to open a document with the wrong app 2017-02-06 12:06:39 +01:00
yflory fbbf8a2829 Replace initialState by a placeholder in slide and code 2017-02-03 18:45:30 +01:00
yflory ce1e792419 Merge branch 'soon' into newtoolbar 2017-01-24 12:54:07 +01:00
yflory 1e1bfd275c Don't show the tab notification when someone has joined the pad 2017-01-19 15:17:21 +01:00
yflory efdae19f0c Update the lists in the code and slide toolbars to use the new dropdown 2017-01-19 12:14:14 +01:00
yflory 88d5b4cc9c Add a 'New pad' button in the toolbar 2017-01-18 11:00:46 +01:00
yflory a9063e0459 Reload all tabs when the user logs in or out 2017-01-16 14:08:44 +01:00
yflory 767ba8b549 Select what we want to display in the toolbar 2017-01-13 17:14:44 +01:00
yflory 2afdc11327 Replace the username button by a dropdown menu 2017-01-13 17:11:12 +01:00
yflory 605072cfbf Fix empty title with new documents 2017-01-12 15:15:10 +01:00
yflory 4963c77b61 Fix the title reset bug 2017-01-12 14:29:40 +01:00
yflory 1e70af0c16 Use the same network for the apps and the file store 2017-01-06 13:52:53 +01:00
ansuz f020fd5a75 remove /customize/pad.js from main apps 2016-12-28 15:12:22 +01:00
yflory 87abfff66b Fix Flash Of Unstyled Content (fouc) 2016-12-21 18:33:21 +01:00
ansuz f36d15d0db Merge branch 'fileManager' of github.com:xwiki-labs/cryptpad into test-filemanager 2016-12-12 18:03:00 +01:00
yflory 319ce5d8c8 Fix the code app 2016-12-12 10:35:28 +01:00
yflory ee56f5608f Fix the infinite spinner bug with the file manager store 2016-12-08 18:52:36 +01:00
yflory 05fd6c1563 Fix the infinite spinner problem 2016-12-08 16:01:46 +01:00
ansuz a23b3d3517 use new ot in code too 2016-12-06 16:22:58 +01:00
ansuz 4c5cb79c20 Merge pull request #58 from xwiki-labs/replaceState
use replaceState if available
2016-11-07 15:08:49 +01:00
ansuz c2770a7a74 set correct hash even if browser does not implement replaceState 2016-11-07 15:03:17 +01:00
ansuz e77ad4e909 better fixes for export 2016-11-07 12:26:48 +01:00
ansuz 75dd4a5926 slightly better test for variable 2016-11-07 12:11:01 +01:00
ansuz b7d9998b9b fix reference to undefined variable 2016-11-07 12:10:00 +01:00
ansuz 303c65f2c3 use replaceState if available, instead of setting the hash 2016-11-07 11:20:30 +01:00
ansuz 5f6ebb5cc1 fix incorrect regex for c-like title detection 2016-11-03 11:30:46 +01:00
yflory ab1d3958ce Add a pencil icon when hovering the title 2016-10-26 17:49:16 +02:00
yflory 6d1e06cca3 Add notifications when a user joins or leaves the channel 2016-10-26 15:02:30 +02:00
yflory 54a63267cd Add a share button and merge the viewers and editors buttons 2016-10-25 18:34:23 +02:00
yflory 87d86384ac Fix broken elements in the new toolbar 2016-10-25 17:29:13 +02:00
yflory 6351d1856f Remove the top bar and move its content in the applications' toolbars 2016-10-25 15:22:35 +02:00
ansuz c858b247c1 filter absent users from the userlist 2016-10-24 15:11:19 +02:00
Yann Flory 1e003b13a8 ask anonymous, first-time users to set their name when they first join a pad 2016-10-21 15:17:15 +02:00
yflory 39bbf8a6c1 Fix the new userlist button and make the toolbar responsive 2016-10-13 14:24:59 +02:00
yflory 24fbe22c9d Improve the toolbar style and the way the userlist is displayed 2016-10-12 18:40:26 +02:00
ansuz a28daf2715 use websocket url configuration api 2016-10-04 17:13:15 +02:00
ansuz dbc8f01b8b fix merge errors and reach full jshint compliance 2016-10-04 16:58:10 +02:00
yflory a30e17121d Merge branch 'readonlyButton' into soon 2016-10-04 15:48:52 +02:00
yflory e84a54556c Move the toolbar buttons' events handlers in cryptpad-common 2016-10-04 15:44:12 +02:00
yflory 76fdadee7f Store only the strongest hash in the localstorage 2016-10-03 18:23:59 +02:00
yflory 17b4f91810 Do not share the title in the doc if it is the default title 2016-10-03 16:05:39 +02:00
yflory 391728ee6d Use CodeMirror in /slide #2
Fix title errors in the slide app caused by the present mode
2016-10-03 14:21:39 +02:00
yflory 261d2fecbc Get codemirror from bower and use that version in the code app 2016-09-29 16:23:27 +02:00
yflory bc73fa2074 Merge branch 'fontawesome' into soon 2016-09-29 14:52:48 +02:00
yflory f03018f3bc Improve the top bar and use the font awesome icons in /code 2016-09-28 15:28:25 +02:00
ansuz a266f0bee1 query parameter for messages 2016-09-27 11:01:32 +02:00
yflory c16e8d603b Enable reconnecting websocket in code pad 2016-09-26 16:06:23 +02:00
yflory 79884e2400 Use the same username for all pads 2016-09-22 17:12:46 +02:00
yflory 73d5ea967b Fix an error created by the merge 2016-09-22 16:34:06 +02:00
yflory dde519795d Merge branch 'newhash' into newhashNoConflict 2016-09-22 16:14:48 +02:00
yflory 99004428d5 Enable the read-only mode in Cryptpoll 2016-09-22 16:09:20 +02:00
yflory 47e8be1681 Remove the IMPORT button and editor toolbars in read-only mode 2016-09-21 15:03:36 +02:00
ansuz f29e3d7b0d don't let notifications interfere with document titles 2016-09-21 14:34:56 +02:00
yflory 83705ae058 Improve the UI in read-only mode 2016-09-20 18:22:40 +02:00
ansuz 2d42cadb23 push /code/ state once ready to avoid OT collision 2016-09-20 15:14:53 +02:00
Yann Flory bf8c9a2c4b Add a button to get the read only URL 2016-09-20 11:35:57 +02:00
Yann Flory 99b50465c7 Add the read-only mode for /pad and /code 2016-09-19 17:52:37 +02:00
Yann Flory 6363d3fb90 Pad titles are now shared with the userdoc 2016-09-16 12:49:47 +02:00
yflory 25c8d16bf5 Use a new version-prefixed hash parser 2016-09-13 17:43:56 +02:00
ansuz da6e5d73d0 fix undefined reference 2016-08-05 15:55:00 +02:00
ansuz 043041523f on import, fall back to setting language from file extension 2016-08-05 15:48:30 +02:00
ansuz deb63d2447 share syntax highlighting selection with peers 2016-08-05 15:03:42 +02:00
ansuz 975bff5794 show a spinner until the document has loaded 2016-08-04 12:43:06 +02:00
ansuz a58f58535b better regex for pulling titles out of c-like comments 2016-08-03 17:11:41 +02:00
ansuz 600f3151e9 don't use the store until it's ready to be used 2016-08-02 12:11:40 +02:00
ansuz 1f24d7126c big ugly commit that will be really hard to audit
This changeset applies new styles to the poll.

it also uses the new asynchronous wrappers around the localStorage api.
this is necessary because we're migrating to a storage system that will
use an async api.

The changes to the poll just happened to coincide with the async stuff.

My apologies to anyone who wants to read this whole thing
2016-07-28 17:44:40 +02:00
ansuz efd190beca export file with correct file extension, if possible 2016-07-25 11:26:42 +02:00
ansuz 992bc4f449 add missing script 2016-07-25 11:09:25 +02:00
ansuz b8a3a4d188 persist usernames across sessions via localStorage 2016-07-22 14:31:40 +02:00
ansuz 846d1135b9 set mode in the editor, not just the dropdown 2016-07-22 14:16:07 +02:00
ansuz 446266a79b remember the last language used on a particular pad 2016-07-22 12:25:42 +02:00
ansuz 70f8837681 maintain scroll position on remote changes 2016-07-22 11:57:04 +02:00
ansuz c267dd6a88 ensure that 'text' is a string 2016-07-20 12:26:57 +02:00