Commit Graph
100 Commits
Author SHA1 Message Date
ansuz 395d8625a8 draw the palette on pad creation 2017-04-08 10:44:12 +02:00
ansuz 3b99c42e22 no more inline styles 2017-04-07 22:05:31 +02:00
ansuz ef821c3e7e integrate @lukevers improvements and clean up js a bit 2017-04-07 19:39:08 +02:00
ansuz bd2034c47b prepare rpc before 'ready' if pinning is enabled 2017-04-07 17:24:25 +02:00
ansuz a70388284d disable unnecessary messages 2017-04-07 17:21:04 +02:00
ansuz abd87e1322 jshint compliance 2017-04-07 16:33:14 +02:00
ansuz e4b15bc616 implement 'getCanonicalChannelList' 2017-04-07 15:52:34 +02:00
ansuz 09f8e139fe Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-04-07 15:20:39 +02:00
ansuz a2f692b9a3 clean up serverside and clientside pinning logic 2017-04-07 15:20:30 +02:00
ansuz fdede0d1fd remove some dead code 2017-04-07 12:18:03 +02:00
ansuz e87992c7ec implement atomic pin reset rpc 2017-04-07 11:37:19 +02:00
ansuz 89bca1606b remove debugging code 2017-04-07 10:34:03 +02:00
ansuz 166e70f628 test new rpc apis 2017-04-07 10:32:26 +02:00
ansuz 2a566671f2 remove outdated rpc example 2017-04-07 10:31:38 +02:00
ansuz 7acf52405d return new hash when pinning a channel 2017-04-07 10:30:40 +02:00
ansuz 3380cf0348 implement getTotalSize rpc 2017-04-07 10:09:59 +02:00
ansuz 2ecabbe6e3 add brown and pink to the palette 2017-04-06 19:05:06 +02:00
ansuz 6e1ffcc18d define better color palette 2017-04-06 18:45:40 +02:00
ansuz 5c292fb1fa jshint compliance 2017-04-06 08:32:31 +02:00
ansuz 8bbbf8e252 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-04-05 17:28:11 +02:00
ansuz 64089c5f6b implement pad pinning 2017-04-05 17:28:04 +02:00
ansuz 6c7cdc90a9 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-04-05 12:24:17 +02:00
ansuz 212baeb3a6 better cookie schema. expire old sessions 2017-04-05 12:24:01 +02:00
ansuz 3484515283 enable more tests 2017-04-05 10:44:14 +02:00
ansuz 3e47b8a38d remove dead code 2017-04-05 10:42:24 +02:00
ansuz fe7f7f4e6d Merge branch 'master' of https://github.com/gustavohmsilva/cryptpad into staging 2017-04-05 10:36:23 +02:00
ansuz 31b178a306 use pinpad api 2017-04-04 12:25:34 +02:00
ansuz 182dbfc874 implement pinning logic in pinpad.js 2017-04-04 12:13:31 +02:00
ansuz a5e5ddae08 rpc all the things 2017-04-03 19:24:57 +02:00
ansuz 4f7e25eeb9 show labels for brush width 2017-04-03 10:43:57 +02:00
ansuz 2a6de5163b jshint compliance 2017-03-31 18:54:50 +02:00
ansuz 04069cc7f4 fix font size 2017-03-31 13:28:30 +02:00
ansuz 1e51f89096 wipe the userdoc when the canvas is cleared 2017-03-31 12:01:52 +02:00
ansuz e2981c0223 try to make the color picker show the current color 2017-03-31 12:01:30 +02:00
ansuz 96dac80bd5 better color picker in whiteboard 2017-03-31 11:02:59 +02:00
ansuz bd07b3a80f less cramped styling on text inputs on /settings/ 2017-03-31 09:36:22 +02:00
ansuz 6e9968f989 add 'lol' code theme 2017-03-31 09:19:45 +02:00
ansuz b85324a29e jshint compliance 2017-03-31 09:18:57 +02:00
ansuz 73d4fd1700 handle reconnection attempts 2017-03-30 18:52:43 +02:00
ansuz b07248ad42 prompt with setName if name is unset 2017-03-30 18:52:20 +02:00
ansuz 5a85e4464c fix poor visibility on green pencils 2017-03-30 18:05:08 +02:00
ansuz 9b4b642d4a protect against subtly corrupted user objects 2017-03-30 17:19:49 +02:00
ansuz 7908f3b4f0 make sure green UI elements use the same green 2017-03-30 15:50:06 +02:00
ansuz 18469edf18 extend list item rendering to support gfm task lists 2017-03-30 12:02:31 +02:00
ansuz 055bc03092 strip carriage return 2017-03-30 12:00:46 +02:00
ansuz 74c322bad5 add example nginx conf 2017-03-30 11:43:20 +02:00
ansuz 36b02d71f5 add ckeditor indentblock plugin.
closes #101
2017-03-30 10:55:22 +02:00
ansuz bca13ad5a5 add notifications to whiteboard 2017-03-29 18:57:46 +02:00
ansuz 233bb7a14f reorganize some html tags for smaller diffs 2017-03-29 18:38:06 +02:00
ansuz 76471f7b90 add forget button to whiteboard and handle disconnection better 2017-03-29 18:35:52 +02:00
ansuz d4ce3dc6b9 don't rewrite css rules. FOUC is too long 2017-03-29 16:02:04 +02:00
ansuz 3cfd0a4326 commit some garbage 2017-03-29 15:40:34 +02:00
ansuz 364dae2882 update templated html 2017-03-29 12:56:08 +02:00
ansuz ed89a13fe6 progress on adding version string to some css 2017-03-29 12:55:36 +02:00
ansuz 4d5baa717d Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-03-29 11:56:13 +02:00
ansuz 76990ac1b2 version toolbar.css for cache-busting 2017-03-29 11:56:03 +02:00
ansuz 9d3f859657 add a contextMenu entry for the whiteboard app 2017-03-29 11:55:24 +02:00
ansuz a3a0592e5e add English and French keys for the whiteboard app 2017-03-29 11:54:46 +02:00
ansuz 6186953a12 make whiteboard a default app 2017-03-29 11:54:19 +02:00
ansuz 869cf09630 set version number 2017-03-28 12:33:34 +02:00
ansuz df7363f416 regenerate templated files for new footer 2017-03-28 11:50:42 +02:00
ansuz a0c17d7c9b latest rpc code 2017-03-27 18:15:15 +02:00
ansuz b50b76bf81 remove unnecessary lines 2017-03-27 18:13:21 +02:00
ansuz 973aeba0da remove bundled fabric.js 2017-03-27 12:48:54 +02:00
ansuz 6eab52c33d use secure fabric.js 2017-03-27 12:45:39 +02:00
ansuz 59a80d5fde remove silly TODO 2017-03-27 12:08:19 +02:00
ansuz ce5dbaeafd use alertify instead of browser prompt 2017-03-27 12:00:21 +02:00
ansuz 69edce5491 remove unused translation keys 2017-03-27 11:29:19 +02:00
ansuz 304c7b7fe4 mention the importance of CSP headers in the readme 2017-03-24 15:43:49 +01:00
ansuz b176426213 increase default ckeditor font size to 16px 2017-03-24 14:55:29 +01:00
ansuz 3e9eb03e5a display a user's public signing key in settings if it exists 2017-03-24 14:26:36 +01:00
ansuz ba53b50e0b update path for whiteboard app 2017-03-24 13:33:29 +01:00
ansuz 912215185f add uid to userdata for better notifications 2017-03-24 13:32:42 +01:00
ansuz fa9249ef29 don't notify for userlist changes if a user joins twice 2017-03-24 13:17:51 +01:00
ansuz 40f5e1706f add a unique id to user objects, define a getter 2017-03-24 12:17:49 +01:00
ansuz d1c32ea1f8 define english, french, and spanish labels for whiteboard app 2017-03-23 16:50:37 +01:00
ansuz e2ee80d4e7 set icon for whiteboard app 2017-03-23 16:16:24 +01:00
ansuz dbca94437e rename canvas app to 'whiteboard' 2017-03-23 16:16:00 +01:00
ansuz 2b2e581779 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-03-21 11:47:27 +01:00
ansuz 2e8484ad4c notes about what to improve. transform json on OT instead of just validating 2017-03-21 11:47:11 +01:00
ansuz acc094654d remove funny file 2017-03-21 10:18:50 +01:00
ansuz b542245086 fix lint error 2017-03-20 18:11:26 +01:00
ansuz f301592a83 Merge branch 'spanish' of github.com:pbondoer/cryptpad into spanish 2017-03-20 18:08:08 +01:00
ansuz cc43bb8362 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-03-20 18:05:39 +01:00
ansuz ef0e1d7aa0 add a non-breaking space to pad initialState 2017-03-20 18:05:07 +01:00
ansuz 98027dad27 jshint compliance 2017-03-20 18:02:11 +01:00
ansuz eeecb1baab Make Canvas Work Again 2017-03-20 18:01:13 +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
ansuz 2add39ee40 fix default config 2017-03-16 17:29:12 +01:00
ansuz 25a2215846 reconcile merge conflict from master 2017-03-16 17:24:36 +01:00
ansuz d422c7e165 support old hashes in getUserChannelList 2017-03-16 17:14:54 +01:00
ansuz 7d5ff27900 better rpc tests, sum up your channel usage 2017-03-16 17:03:45 +01:00
ansuz 7ab65367c5 don't try to verify messages if you can't decode base64 2017-03-16 17:01:53 +01:00
ansuz e8fbbf9984 fix default config to be very permissive with CSP headers 2017-03-16 15:40:16 +01:00
ansuz 3185e2a4cc comment out config lines which break local usage of cryptpad 2017-03-16 15:18:57 +01:00
ansuz 737ffe8430 comment out config lines which break local usage of cryptpad 2017-03-16 15:18:29 +01:00
ansuz e207895ffc Merge branch 'master' of github.com:xwiki-labs/cryptpad 2017-03-16 15:17:49 +01:00
ansuz b38ba6dbec comment out config lines which break local usage of cryptpad 2017-03-16 15:17:40 +01:00
ansuz 5ed6223313 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-03-16 14:47:03 +01:00
ansuz 7f2f1f7191 correctly initialize RPC object 2017-03-16 14:46:55 +01:00