Commit Graph

406 Commits (820f2a0054d0ff78efb1f4d41776d317874f9efd)

Author SHA1 Message Date
ansuz 76c530037b enable donate button in all apps 2017-05-30 15:51:07 +02:00
ansuz 99a44f119f don't send referrer headers on pads which may link outward 2017-05-30 10:44:40 +02:00
ansuz 1240b864ef fix misconfigured history 2017-05-29 17:25:06 +02:00
ansuz cf658c1b3a backport live changes 2017-05-26 12:41:30 +02:00
ansuz a04f179d8b hide preview mode on phones 2017-05-24 19:00:14 +02:00
ansuz dc2b0ae6b4 jshint compliance 2017-05-24 18:45:48 +02:00
ansuz b32c329269 remember whether you were using preview mode for a pad 2017-05-24 18:41:19 +02:00
ansuz a5ffd278a7 write styles for code in .less 2017-05-24 17:27:03 +02:00
ansuz 3803f6a20f only render preview if preview container is visible 2017-05-24 17:25:33 +02:00
ansuz 617e027f12 catch markdown preview errors 2017-05-24 15:50:35 +02:00
ansuz c5bb830757 don't preview if hightlight mode is not markdown 2017-05-24 14:21:31 +02:00
ansuz 378bf2aa94 yflory's word wrap fix 2017-05-24 11:27:31 +02:00
ansuz dc80b6b11f throttle markdown preview 2017-05-24 11:27:16 +02:00
ansuz 97cc4a6d54 add styling for tables in markdown preview 2017-05-23 18:03:35 +02:00
ansuz 6faca87e73 set preview content in read only mode 2017-05-23 15:54:04 +02:00
ansuz 0a54f0cf2d better alignment of preview and code entry 2017-05-19 16:21:26 +02:00
yflory 620f4dc512 Add translations for the markdown preview button title 2017-05-18 15:05:37 +02:00
yflory 0bd4caeb7e Add the task list code to the markdown renderer 2017-05-18 14:57:04 +02:00
yflory 56bcdff890 Add a preview of the markdown content in the code editor 2017-05-18 12:16:26 +02:00
yflory c00158d23a Move code to common-history 2017-05-10 13:39:14 +02:00
yflory 50c8a859e6 Move the CodeMirror cursor code to common-codemirror 2017-05-09 17:57:27 +02:00
yflory c79a6e3b2b Move Metadata, CodeMirror and title functions in separate files 2017-05-09 17:47:47 +02:00
yflory 63710e1ccc Move the code related to the title in another file 2017-05-09 14:32:41 +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
yflory 6847906ac9 Move the userlist code in a separate file 2017-05-05 15:47:46 +02:00
ansuz a0c420af8e jshint compliance 2017-05-04 16:37:25 +02:00
yflory a190c99426 Toolbar refactoring 2017-05-04 16:08:12 +02:00
yflory bf7c7c45d0 Add the storage limit warning in the toolbar 2017-04-27 18:46:46 +02:00
ansuz f7e96b4e8c resolve merge conflicts and jquery errors 2017-04-24 13:43:18 +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
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
ansuz 233bb7a14f reorganize some html tags for smaller diffs 2017-03-29 18:38:06 +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 459b18c97b Add the loading screen in the HTML so that it is displayed before JS is loaded 2017-03-08 18:05:15 +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
Caleb James DeLisle 91eda5fa83 Implement stronger content-security-policy except in /pad/ which does not allow it.
Implement a "loader" which allows for applying a version number to everything.
Added a cache control for anything which has a version.
2017-03-01 21:06:53 +01:00
ansuz 7db0e14bc0 add 'force' flag to override removal of html elements 2017-03-01 17:05:57 +01:00
ansuz 86adfbf27d update cache-busting directive in all supported apps 2017-02-28 10:47:18 +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
ansuz 8167ed9048 implement cache-busting everywhere 2017-02-17 12:39:01 +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 367a02c031 Add mobile support for the code app 2017-02-07 16:49:25 +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 a4286f1c83 Merge branch 'soon' into newtoolbar 2017-01-27 16:52:49 +01:00
yflory ce1e792419 Merge branch 'soon' into newtoolbar 2017-01-24 12:54:07 +01:00
yflory f8455875a9 Fix the NoScript (iframe not loaded) bug with inner iframes 2017-01-23 15:07:38 +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
ansuz e9376a66c2 apply 'cp' class for unified styles 2016-12-27 14:29:20 +01:00
yflory 87abfff66b Fix Flash Of Unstyled Content (fouc) 2016-12-21 18:33:21 +01:00
ansuz dd46b9425a Merge branch 'fileManager' of github.com:xwiki-labs/cryptpad into test-filemanager 2016-12-19 12:37:02 +01:00
yflory 5bc7766f44 Use a consistent toolbar across all apps 2016-12-16 18:35:49 +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 8c33218ceb Move the codemirror themes in /common 2016-10-03 14:19:37 +02:00
yflory b5b0eacebc Remove the old (non-bower) codemirror 2016-09-29 16:24:26 +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 fd0a7337a3 wait a full minute until requirejs times out 2016-08-04 12:44:27 +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 9b16d529ca add one more missing script that caused handlebar highlighting to break 2016-07-29 16:21:27 +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 5e71a5473c add another missing script 2016-07-25 11:26:07 +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
ansuz 1a63faf188 infer names from the first comment on code pad 2016-07-20 12:21:33 +02:00
ansuz 44fe95c76b add titles to buttons on pad and code 2016-07-16 12:38:21 +02:00
ansuz d39ab5c250 point to the actual translation file 2016-07-12 15:52:36 +02:00
ansuz dea8e225db fix double scrollbar issue 2016-07-12 15:45:49 +02:00
ansuz 6f598682f8 templates for custom themes 2016-07-12 12:36:13 +02:00
ansuz 02cd2fbee0 style fixes for the ansuz theme 2016-07-12 12:35:17 +02:00
ansuz 3eccec7054 better effort for translation 2016-07-11 17:36:53 +02:00
ansuz 2a7a84b774 use constants exported from toolbar for selections
make things a little less brittle
address linter warnings
2016-07-08 16:50:56 +02:00
ansuz 750731d3db workaround for favicon magic 2016-07-07 14:03:06 +02:00
ansuz fd3cd73d0b try to fix favicon bug 2016-07-07 13:40:03 +02:00
ansuz e32c0aaac8 use alertify UI in /code/ 2016-07-07 12:47:23 +02:00
ansuz 1ae212af44 let users know when changes have occurred while tabs lack focus 2016-07-06 22:19:01 +02:00
ansuz 6075849ed7 add favicons to /pad/ and /code/ 2016-07-06 22:17:18 +02:00
ansuz d844551fba add a forget button. clean up toolbar a bit 2016-06-30 17:24:25 +02:00
ansuz 7da58a0de9 improve pad naming UX, slight refactoring
* prevent naming conflicts
* migrate localestorage to use named attributes
* use ctime and atime
* display default names in table
* sort pads by most recent atime
* move more functions into cryptpad common
* change table styles
2016-06-30 15:10:32 +02:00
ansuz ec0dba3f7c correct undefined reference 2016-06-30 14:47:37 +02:00
ansuz a3da10766a add rename button to /code/ and /pad/ 2016-06-30 10:51:19 +02:00
ansuz 93fed83a08 remove annoying border around editor 2016-06-29 15:13:45 +02:00
ansuz 23788bca67 add 'ansuz' theme because I'm horribly vain 2016-06-29 15:13:24 +02:00
ansuz 22929fd3f5 add title attributes for dropdown menus 2016-06-29 12:02:39 +02:00
ansuz 8b1a2b7b8b commit theme choices to localStorage 2016-06-29 12:00:12 +02:00
ansuz fb2ca04c34 add a theme selector 2016-06-29 11:51:53 +02:00
ansuz dc8e36bf20 move themes directly into ./code/ 2016-06-29 11:45:57 +02:00
ansuz 5b79775810 infer modes from MIME types 2016-06-23 16:37:51 +02:00
ansuz df99395b4d fix a few more paths that I missed 2016-06-23 12:44:30 +02:00
ansuz b3deb9531d fix paths that I broke when updating codemirror 2016-06-23 12:44:11 +02:00
ansuz 82a9b05d5f upgrade to newest codemirror 2016-06-23 12:30:40 +02:00
ansuz 1a5905d9fd more work on highlighting modes in codemirror
* style the select menu
* add more modes
* preset language selection to 'javascript'
* don't prompt the user with a silly hash when changing their name
2016-06-23 12:07:51 +02:00
ansuz a89511985f add _really_ basic multilanguage support. I'll come back for css later 2016-06-22 22:54:42 +02:00
ansuz 31aa09d6f6 work a bit more on import/export and code highlighting 2016-06-22 20:58:50 +02:00
ansuz 1526c26f8e remember code and wysiwyg pads 2016-06-21 18:49:37 +02:00
ansuz 849683d586 update to use new style crypto module 2016-06-21 15:17:09 +02:00
ansuz c3d2568d3c add file export for codepad
addresses #24
2016-06-17 10:59:45 +02:00
ansuz beba78d7f8 update prototype dependencies 2016-06-06 12:14:07 +02:00
ansuz 297d8c2d44 reformat code for jshint compliance 2016-05-20 13:39:40 +02:00
ansuz ad3c53c344 use textpatcher from bower for all pads 2016-05-13 17:32:56 +02:00
ansuz aef6f3a85b lock codemirror editor until chain has synced 2016-04-27 16:21:10 +02:00
ansuz 6736335db2 add 'made with <3' toolbar to code 2016-04-27 15:43:31 +02:00
ansuz d79b3616c9 remove unused files 2016-04-27 15:32:15 +02:00
ansuz 4c84758265 disable textpatcher logging 2016-04-27 15:30:53 +02:00
Yann Flory 492054a938 Fix the cursor position when a remote patch is applied 2016-04-27 12:17:06 +02:00
Yann Flory cc51e6d6ed Update CodeMirror pad to work with Netflux 2016-04-27 10:44:04 +02:00
Yann Flory f5f8f6e1eb Remove the delay between a change and its propagation to chainpad 2016-04-26 17:50:54 +02:00
ansuz fa6914037c start rewriting codepad to use realtime-input 2016-04-26 17:34:57 +02:00
ansuz 1a9e7299fc working state 2016-04-23 00:15:39 +02:00
Yann Flory 360fee9feb Fix a new cursor error with Codepad 2016-04-11 17:58:30 +02:00
Yann Flory c2e0dded3a Fix an issue with the cursor sometimes disappearing when a patch was received
Update CodeMirror to the latest version (5.13.2)
2016-04-11 15:47:40 +02:00
Yann Flory c53baab99d Update Codepad with the latest improvements 2016-04-11 14:43:39 +02:00
ansuz 3cb94b8d80 jshint compliance 2016-02-15 16:07:46 +01:00
ansuz fe3917c0f1 fix jshint complaints in codemirror directory 2016-02-12 16:20:55 +01:00
ansuz 0fbbb51f7f drop this useless line 2016-02-12 11:19:36 +01:00
ansuz d1dd497457 html-patcher.js : add missing semicolon 2016-02-12 11:17:10 +01:00
ansuz 62ea172ff4 errorbox.js : add missing semicolon so jshint doesn't complain 2016-02-12 11:15:59 +01:00
ansuz 2d8ffdf31c Merge branch 'master' of github.com:ansuz/cryptpad 2016-01-29 11:54:26 +01:00
ansuz 4cf2a8a0bd rtwiki.js : catch some typeErrors 2016-01-26 11:32:12 +01:00
Lars-Magnus Skog 84c0ea6d26 refactor: pass in ifrw.CodeMirror into andThen() 2016-01-17 00:43:10 +01:00
ansuz 663e987345 fix race condition in codemirror initialization
over slow connections, iframes don't load fast enough to be ready for code
which depends on certain features existing.

wait until they're ready, then initialize.
2016-01-16 07:37:00 -05:00
mouhb af80bed07b XWR-190: Make CryptPad version with rtwiki/CodeMirror 2016-01-08 11:52:33 +01:00
mouhb 9626dfc365 XWR-190: Make CryptPad version with rtwiki/CodeMirror 2016-01-07 18:13:45 +01:00
Yann Flory 9a932a3f56 Patch Realtime into CodeMirror in CryptPad 2015-11-25 10:09:23 +01:00
Yann Flory 32f44161a7 Patch Realtime into CodeMirror in CryptPad 2015-11-25 09:48:30 +01:00