Commit graph

1680 commits

Author SHA1 Message Date
yflory
6a8274518b Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-04-25 18:42:33 +02:00
yflory
9882a3a923 Add support for the file applicaiton in the drive 2017-04-25 18:42:21 +02:00
ansuz
12898b3358 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-04-25 18:28:48 +02:00
ansuz
74bcec8b31 programming is hard okay 2017-04-25 18:28:39 +02:00
yflory
2a417ddae8 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-04-25 17:22:07 +02:00
yflory
d985b144cc Add a new hash version for the file viewer 2017-04-25 17:19:13 +02:00
ansuz
3309087277 send feedback if isArray is not supported 2017-04-25 17:09:39 +02:00
ansuz
f196b836db fix undefined reference 2017-04-25 16:17:52 +02:00
ansuz
48973bccd6 add tests to assert for hash parsing 2017-04-25 16:11:19 +02:00
ansuz
5194677443 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-04-25 14:57:34 +02:00
yflory
c9c7d61ad1 Media tag viewer 2017-04-25 14:55:38 +02:00
ansuz
729d1460b9 Merge branch 'master' into staging 2017-04-25 14:35:24 +02:00
ansuz
a840fb9e85 add example hashes and start working on hash v2 2017-04-25 14:33:57 +02:00
ansuz
d1fa68e30d build UCF Media Tag 2017-04-24 17:13:32 +02:00
ansuz
cc33c4abe9 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-04-24 15:41:46 +02:00
ansuz
a5ca461a73 update footer for new version 2017-04-24 15:41:29 +02:00
yflory
fdd51ec18d Don't remove a folder moved into unsorted or into itself 2017-04-24 15:38:03 +02:00
ansuz
4b95a1da48 unbreak assert/translations 2017-04-24 14:32:56 +02:00
ansuz
4fdc5f897e only feedback migration if user had legacy store 2017-04-24 14:26:55 +02:00
ansuz
218f2ff76c feedback when logging in or registering 2017-04-24 14:15:17 +02:00
yflory
4c3e842664 Fix focus issues with the history input in ckeditor 2017-04-24 13:55:03 +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
ansuz
18e2e66b06 jshint compliance 2017-04-24 11:39:39 +02:00
yflory
92ea03d7d9 View and restore the history of a pad 2017-04-21 17:31:47 +02:00
ansuz
4c0d7bf8e8 support multiple calls to cryptpad.ready 2017-04-21 16:51:32 +02:00
ansuz
ec041c88e2 console.log when providing feedback
also notify server if a users browser does not support proxies
2017-04-21 15:53:13 +02:00
ansuz
c51073f211 support batch getFileSize calls 2017-04-21 14:51:20 +02:00
ansuz
1af621bfe5 Merge remote-tracking branch 'origin/auth' into staging 2017-04-20 17:27:32 +02:00
ansuz
3afaf029cb feedback about how often we migrate an old drive 2017-04-20 17:06:09 +02:00
Caleb James DeLisle
0e8b55edc0 Added an authentication page to allow getting the user pubkey 2017-04-20 10:15:07 +02:00
ansuz
df9c312b7d make new text translateable 2017-04-18 18:31:58 +02:00
ansuz
e8b053e48b use bootloader in feedback.html 2017-04-18 17:31:35 +02:00
ansuz
a6dbfcecf3 remove old/unused assertions 2017-04-18 17:28:09 +02:00
ansuz
b658bda421 use bootloader to fix paths to jquery and json.sortify 2017-04-18 17:24:46 +02:00
ansuz
347459781c show the size of your files, if you're logged in 2017-04-18 15:49:04 +02:00
ansuz
2b8579e8b7 add pretty-printers for byte-counts 2017-04-18 15:44:15 +02:00
ansuz
2a25afae5f Merge branch 'soon' into staging 2017-04-18 12:24:45 +02:00
ansuz
e0ecf651e2 add a note about showing pinned file usage 2017-04-18 12:23:58 +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
da69c1822c ask users to sign back if signing keys are missing 2017-04-18 11:58:41 +02:00
ansuz
107e75b287 remove invalid semicolon 2017-04-14 19:24:20 +02:00
ansuz
821c1a3ec6 annotate code which we hope to be able to deprecate in the future 2017-04-14 18:44:08 +02:00
yflory
43c045721c Get the channel history 2017-04-14 18:36:36 +02:00
ansuz
f6d6f81d55 send feedback when a user registers 2017-04-14 18:21:11 +02:00
ansuz
deeb47c40b reportAppUsage for settings 2017-04-14 18:19:04 +02:00
ansuz
5a83759ee2 add usage button to settings page 2017-04-14 17:18:17 +02:00
ansuz
a27cc76fc0 uppercase LOL 2017-04-14 15:35:02 +02:00
ansuz
402ce2db93 better validation of inputs 2017-04-14 15:34:22 +02:00
ansuz
c7eae9675b keep exporting isArray for backwards compatibility
but prevent internal use
2017-04-14 15:34:05 +02:00
ansuz
fbebbf0dca minor clean up 2017-04-14 15:32:12 +02:00
ansuz
525d35c9ec redefine alert 2017-04-14 14:54:43 +02:00
ansuz
f694a81a5c move more interface code out of cryptpad-common 2017-04-14 12:25:32 +02:00
ansuz
a4157b9908 remove more unused functions 2017-04-14 12:14:10 +02:00
ansuz
e10901edb2 begin to move interface code out of cryptpad-common 2017-04-14 12:09:00 +02:00
ansuz
95789d3cbe expose rpc for pinned usage 2017-04-14 11:41:51 +02:00
ansuz
8f4dbcf4c6 remove getPadTitle 2017-04-14 11:41:18 +02:00
ansuz
f42da4ecd8 move hashChannelList into common-hash.js 2017-04-14 11:40:28 +02:00
ansuz
63960bd38c Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-04-13 19:47:04 +02:00
ansuz
520ae822fc correct undefined reference 2017-04-13 19:46:52 +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
bf047fcf65 Merge pull request #110 from pbondoer/newpoll
Fix flash of autocomplete in poll
2017-04-13 19:43:30 +02:00
Pierre Bondoerffer
96ff487271
fix flash of content 2017-04-13 19:36:04 +02:00
ansuz
5a7eea08c8 Merge pull request #108 from pbondoer/newpoll
Poll fixes
2017-04-13 18:04:13 +02:00
Pierre Bondoerffer
248f88034b
important fixes 2017-04-13 17:56:28 +02:00
yflory
633d60ccd0 Remove a TODO 2017-04-13 17:19:32 +02:00
Pierre Bondoerffer
6b57bb2bbb
poll: press enter to validate input 2017-04-13 17:09:31 +02:00
Pierre Bondoerffer
d483e10e77
poll fixes 2017-04-13 17:07:09 +02:00
yflory
81d83897ec Rename hash.js 2017-04-13 17:04:15 +02:00
yflory
2ad0a65b71 Remove shortcuts that override browser actions 2017-04-13 16:43:07 +02:00
Pierre Bondoerffer
ea5301be13
poll improved(tm) 2017-04-13 16:31:57 +02:00
Pierre Bondoerffer
7434dbcb0f
what i have 2017-04-13 15:27:37 +02:00
yflory
07705cd5c1 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-04-13 15:04:23 +02:00
yflory
eb2a3c1bbf Fix lint errors 2017-04-13 15:04:17 +02:00
ansuz
607d9652f5 jshint compliance 2017-04-13 14:48:15 +02:00
yflory
3ba90332bb Merge branch 'refactor' into staging 2017-04-13 14:44:55 +02:00
Pierre Bondoerffer
f11cf8e6ac
move poll styles to separate file 2017-04-13 14:14:12 +02:00
yflory
daabb0b3ad Integrate and fix the new fileObject (userObject) 2017-04-13 14:06:40 +02:00
ansuz
df4a250359 use feedback api instead of app= 2017-04-13 12:18:08 +02:00
ansuz
86c37bfa37 fix find+replace error 2017-04-13 11:11:45 +02:00
ansuz
e618483395 extract all code for encoding and decoding hashes 2017-04-13 11:05:28 +02:00
ansuz
fdd2716ad5 move constants to the top of cryptpad-common.js 2017-04-13 10:31:08 +02:00
yflory
c1e0316d43 Refactor fileObject 2017-04-12 18:54:22 +02:00
ansuz
5212539a16 move standalone functions from common into their own file 2017-04-12 17:54:44 +02:00
ansuz
7437d6b902 remove unused function 2017-04-12 17:09:42 +02:00
ansuz
4e590a9dd1 remove even more dead code 2017-04-12 16:16:58 +02:00
ansuz
85fcaa9bbc remove more dead code 2017-04-12 16:13:25 +02:00
ansuz
401936a91e move singly-used css file out of /common/ 2017-04-12 16:09:05 +02:00
ansuz
9a46b58c85 deprecate this 90 days after f-release 2017-04-12 16:03:41 +02:00
ansuz
7a59183bb1 pinpad.create should always be async 2017-04-12 16:02:42 +02:00
ansuz
8de3610532 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-04-12 16:02:09 +02:00
ansuz
9aa0548b1f remove dead cursor code 2017-04-12 15:59:30 +02:00
yflory
4e61b79f9a Clean fileObject 2017-04-11 15:11:33 +02:00
yflory
cde724399c Pin the pads 2017-04-11 14:53:44 +02:00
yflory
74ea2fce5a Fix lint error... 2017-04-10 19:18:46 +02:00
yflory
aa49c97d6e Fix lint error 2017-04-10 19:13:36 +02:00
ansuz
2c8d1b8183 jshint compliance 2017-04-10 19:12:22 +02:00
yflory
f0836f745e Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-04-10 18:25:17 +02:00
yflory
528deb11da Add missing file for whiteboard 2017-04-10 18:25:02 +02:00
ansuz
cde9ea9887 update footer version 2017-04-10 18:09:22 +02:00
ansuz
05a50b1f4c Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-04-10 17:42:43 +02:00
ansuz
a14bb1480a progress for implicit pinning 2017-04-10 17:42:35 +02:00
ansuz
f82278a25c handle return of undefined hash 2017-04-10 17:38:25 +02:00
yflory
d5e69653c0 Select opacity in draw mode in the canvas app 2017-04-10 17:03:50 +02:00
ansuz
1d933be5a6 make reset return the hash, not an array with containing it 2017-04-10 15:57:38 +02:00
yflory
f34492be94 Remove duplicates uid in the user list 2017-04-10 15:27:01 +02:00
yflory
cfc5d634f4 Merge branch 'templates' into staging 2017-04-10 14:19:48 +02:00
yflory
bd16e0f0e7 Templates in polls and canvas, and ability to disable templates 2017-04-10 14:19:15 +02:00
yflory
63a130c678 Add a button to delete the selection in canvas 2017-04-10 11:55:39 +02:00
yflory
33e19d5918 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-04-10 11:44:17 +02:00
yflory
126498585e Add a context menu on the ROOT folder in the drive 2017-04-10 11:44:11 +02:00
yflory
be1db2a1ec Ability to remove an object when draw mode is off 2017-04-10 11:28:41 +02:00
ansuz
108ab7e9de comment out a style assignment that doesn't seem necessary 2017-04-09 11:55:27 +02:00
ansuz
8c629185e1 cleaner less file 2017-04-09 11:49:14 +02:00
ansuz
0db141e48d rename style files 'whiteboard' instead of main 2017-04-09 11:48:01 +02:00
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
yflory
84d8615cf1 Save and use templates in pad, code and slides 2017-04-07 18:20:03 +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
yflory
a13261abaa Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-04-07 14:54:13 +02:00
yflory
dedf2b3c69 Display selected color and button to turn off draw mode in canvas 2017-04-07 14:54:02 +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
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
3380cf0348 implement getTotalSize rpc 2017-04-07 10:09:59 +02:00
ansuz
6e1ffcc18d define better color palette 2017-04-06 18:45:40 +02:00
yflory
84029ac2d7 Fix the color picker in Chromium 53 and improve the cursor 2017-04-06 12:38:11 +02:00
ansuz
5c292fb1fa jshint compliance 2017-04-06 08:32:31 +02:00
yflory
b14d89360d Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-04-05 19:00:13 +02:00
yflory
8e29e30a35 Realtime palette + cursor corresponding to the brush 2017-04-05 18:59:58 +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
yflory
d07acc5364 Don't redraw the drive if filesData changes while in unsorted 2017-04-05 16:08:39 +02:00
yflory
13514dff63 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-04-05 15:00:10 +02:00
yflory
46a5eee597 Display the spinner in the toolbar for local changes 2017-04-05 14:57:07 +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
yflory
54d271c4e7 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-04-05 12:04:18 +02:00
yflory
a9777ce560 Fix input losing focus in polls with Chrome 57 2017-04-05 12:04: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
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
9b4b642d4a protect against subtly corrupted user objects 2017-03-30 17:19:49 +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
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
yflory
7ede430db3 Fix 'search.oldLocation is undefined' error 2017-03-28 14:26:41 +02:00
ansuz
df7363f416 regenerate templated files for new footer 2017-03-28 11:50:42 +02:00
yflory
72fecb9549 Fix lint errors 2017-03-28 11:05:45 +02:00
yflory
af68e41fb6 Always set the focus to the search bar in the drive 2017-03-28 10:57:13 +02:00
yflory
67f4096396 Fix cursor in the drive search bar 2017-03-28 10:48:29 +02:00
yflory
12cc49b575 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-03-27 18:31:07 +02:00
yflory
72c60ec676 Add background to the whiteboard app 2017-03-27 18:30:48 +02:00
yflory
2732b7aa82 Fix module.onLocal not defined 2017-03-27 18:21:14 +02:00
ansuz
a0c17d7c9b latest rpc code 2017-03-27 18:15:15 +02:00
yflory
4ddf9b4e04 Improve whiteboard UI 2017-03-27 18:12:11 +02:00
yflory
89877baa69 Fix read-only mode in canvas app 2017-03-27 17:15:54 +02:00
yflory
c2cb24c072 Add toolbar to the whiteboard app 2017-03-27 17:08:44 +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
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
yflory
5322eff607 Use the current values for the checkboxes in the print options dialog 2017-03-27 11:23:51 +02:00
yflory
53c60a31f6 Set the properties and backup inputs to read-only in the drive 2017-03-27 11:14:37 +02:00
yflory
0c5a930cb9 Fix an issue with the 'Properties' entry not always displayed in context menu 2017-03-27 10:58:23 +02:00
ansuz
3e9eb03e5a display a user's public signing key in settings if it exists 2017-03-24 14:26:36 +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
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
yflory
994d640f8b Fix an issue causing the lag icon to lose its color 2017-03-21 14:52:49 +01:00
yflory
819c7e3bae Fix style issue with drag&drop in the active folder 2017-03-21 14:49:02 +01:00
yflory
6fbd1f0028 Store the dates as number and not strings to avoid ot issues 2017-03-21 14:46:40 +01:00
yflory
8556ce9d17 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-03-21 12:45:53 +01:00
yflory
8ce8401107 Fix issues with middle click in context menus 2017-03-21 12:45:39 +01:00
yflory
5f4990cc80 Display or hide the context menu in a more intuitive way with multiselect 2017-03-21 12:37:45 +01:00
yflory
51033ab70a Remove useless links in the context menu and properties for readonly pads in the drive 2017-03-21 12:09:07 +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
yflory
7afde2309d Add properties to the files not in the trash 2017-03-21 11:34:18 +01:00
yflory
61d33f2dd6 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into prop 2017-03-21 10:44:10 +01:00
yflory
66a80ea50c Add properties for pads in the drive 2017-03-20 18:59:27 +01:00
ansuz
b542245086 fix lint error 2017-03-20 18:11:26 +01:00
ansuz
cc43bb8362 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-03-20 18:05:39 +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
yflory
29174b2922 Update the lag icon 2017-03-20 16:39:33 +01:00
yflory
26edb77cf0 Fix style and usability issues in slides 2017-03-20 15:20:42 +01:00
yflory
85105a1382 Active folder in drive is not underlined anymore 2017-03-20 14:16:44 +01:00
yflory
cd77f50717 Fix transitions in slides, add swipe event handlers, and fix print in firefox 2017-03-20 12:50:46 +01:00
yflory
e139295d7e Add transitions in present mode 2017-03-17 18:39:39 +01:00
yflory
45ac3e40a2 Copy print options to present mode 2017-03-17 18:03:00 +01:00
yflory
a5f11d0d0d Uniform the slides rendering in present and print mode 2017-03-17 15:30:27 +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
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
ansuz
c9c9dd0999 use userChannelList if a list is not supplied to pinpad 2017-03-16 14:46:17 +01:00
ansuz
e8c3cf6aa5 implement rpc message signing 2017-03-16 14:45:38 +01:00
ansuz
d85a42c776 include User_hash in user channel list 2017-03-16 14:43:57 +01:00
yflory
f98c825dc3 Fix keyboard shortcuts not working in CryptDrive 2017-03-16 14:43:00 +01:00
yflory
7b27f1dc2c Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-03-16 14:16:54 +01:00
yflory
7761aaa89f Add search UI 2017-03-16 14:16:42 +01:00
ansuz
b578803136 clean up registration code a little bit 2017-03-16 10:37:16 +01:00
ansuz
c3c866fa2b Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-03-15 18:59:53 +01:00
yflory
d19bbcb001 Add support for search in the drive 2017-03-15 18:59:55 +01:00
ansuz
5eb32b33ee Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-03-15 18:59:38 +01:00
ansuz
298725b3c2 don't show usage tips on error screens 2017-03-15 18:58:39 +01:00
ansuz
0a6373852e add signing keys to user object at login and register time 2017-03-15 18:57:13 +01:00
yflory
9a32fb1999 Fix sub-folders changing position in the tree when renaming them 2017-03-15 17:34:06 +01:00
yflory
931f7619c0 Keep the scroll position on redraw in drive 2017-03-15 17:30:52 +01:00
yflory
0607c3bbf3 Add a title to the 'new' button in drive 2017-03-15 17:20:08 +01:00
yflory
b9c64a526a Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-03-15 17:15:03 +01:00
yflory
15e9af77bb Remove the langauge selector from toolbar and add it in settings 2017-03-15 17:14:49 +01:00
ansuz
8129b8cdc1 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-03-15 16:05:05 +01:00
ansuz
15a67afc75 jshint compliance 2017-03-15 16:04:52 +01:00