Commit Graph

2173 Commits (f2320190b8985b3b38c9527b970476a58e7ffb09)

Author SHA1 Message Date
yflory 159d72f33b Merge branch 'msg' into staging 2017-07-10 11:48:22 +02:00
yflory 8e2e8b1653 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-07-10 11:46:16 +02:00
yflory ff10c282d4 Avatar in the user admin button 2017-07-10 11:46:06 +02:00
yflory be6ee672d3 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-07-10 11:16:52 +02:00
yflory f0523a0153 Avatar in the user admin menu 2017-07-10 11:16:44 +02:00
ansuz e10de1219b feedback on view hash usage 2017-07-10 11:13:56 +02:00
ansuz 52eb8e307c feedback for language used 2017-07-10 10:59:32 +02:00
ansuz 086e5909dd Merge branch 'soon' into staging 2017-07-10 10:43:41 +02:00
ansuz 781974ec7c center 'Create a profile' button 2017-07-10 10:42:39 +02:00
yflory 1c531ccd47 Pin the chat channels 2017-07-10 10:39:57 +02:00
ansuz 4a37bc4a1c abort the realtime session if it does not synchronize for 30 seconds 2017-07-10 10:34:25 +02:00
ansuz 29c6ed6e9b hide slide arrows when there are no more slides in that direction 2017-07-10 09:51:15 +02:00
ansuz c096872467 Merge branch 'msg' of github.com:xwiki-labs/cryptpad into msg 2017-07-10 09:30:44 +02:00
ansuz eff27ff6c5 focus username button 2017-07-10 09:24:46 +02:00
ansuz c60a71e210 add connect button and view profile button 2017-07-10 09:23:58 +02:00
ansuz 94f8e4b8a3 use validateKeys when instantiating object 2017-07-10 09:21:58 +02:00
ansuz 22fbc7e5d8 implement getter for public keys 2017-07-10 09:21:27 +02:00
ansuz ecef970250 float connect button right because flex styles messed up the pencil icon 2017-07-10 08:57:09 +02:00
yflory df103c4074 Messaging app 2017-07-07 18:53:21 +02:00
ansuz f9a43d6570 select everything before file extensions in drive when renaming 2017-07-07 10:37:12 +02:00
ansuz 1c462d5c4a use random token for feedback instead of date 2017-07-07 10:16:54 +02:00
yflory 21f1527c71 Merge branch 'msg' of github.com:xwiki-labs/cryptpad into msg 2017-07-06 18:39:06 +02:00
yflory 5c7441f82c Display the friend list in the friend app 2017-07-06 18:38:58 +02:00
ansuz fac715dd09 Merge branch 'msg' of github.com:xwiki-labs/cryptpad into msg 2017-07-06 18:35:21 +02:00
ansuz 4b23ef74d7 add support for curve message signing and curve validateKeys 2017-07-06 18:30:16 +02:00
yflory a5e8f6ae81 Add friend app and fix avatar size 2017-07-06 18:00:03 +02:00
yflory af31771e3a Share a channel id, not a hash 2017-07-06 14:47:02 +02:00
yflory 852b2eaf1d Merge branch 'msg' of github.com:xwiki-labs/cryptpad into msg 2017-07-06 14:27:32 +02:00
yflory 26a83003b5 Create an owned channel 2017-07-06 14:27:13 +02:00
yflory 5b5a7ab286 Hide the friend button when the resquest is accepted 2017-07-06 12:31:31 +02:00
ansuz f02285d103 fix lowercased p 2017-07-06 10:49:33 +02:00
ansuz 5d96c68ad7 fix profile app display on chrome 2017-07-06 10:43:14 +02:00
yflory de420de021 Fix the folder's path in the search results page 2017-07-06 10:40:21 +02:00
ansuz d3bbdc27c0 lint compliance 2017-07-06 10:33:31 +02:00
ansuz bce0b03ba4 Merge branch 'msg' of github.com:xwiki-labs/cryptpad into msg 2017-07-06 10:25:53 +02:00
ansuz 909e00bbc3 create a listmap object using public key crypto 2017-07-06 10:25:43 +02:00
yflory 96fde4e5ed Add missing file 2017-07-06 10:24:28 +02:00
ansuz df53166b37 implement and use prototype curve encryptors 2017-07-06 10:22:20 +02:00
ansuz d293ba4d44 add support for invite hashes 2017-07-06 09:44:39 +02:00
yflory 37d5b0afb9 Merge branch 'msg' of github.com:xwiki-labs/cryptpad into msg 2017-07-05 18:42:51 +02:00
yflory 95e2efab89 Add to friend list 2017-07-05 18:42:32 +02:00
ansuz e353627204 log users out if they do not have curve keys. add curve keys to object on registration and login. 2017-07-05 17:19:28 +02:00
ansuz 4016a95540 prototype invite app 2017-07-05 16:01:50 +02:00
yflory 465ef74f2b Fix rpc 2017-07-05 16:02:22 +02:00
yflory bf17ad3f1e Friend button in the userlist 2017-07-05 15:59:36 +02:00
yflory 8dc8aa27ab Lint 2017-07-05 12:27:40 +02:00
yflory 35e8c1a63b Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-07-05 12:27:08 +02:00
yflory 43ac71603c Move pad attributes in pad data 2017-07-05 12:26:42 +02:00
ansuz 9f6ecea5d9 fix nacl reference error in media tag 2017-07-05 11:57:53 +02:00
yflory 3e802c2443 Fix overflowing content in profile 2017-07-05 10:14:43 +02:00
ansuz dfad622b76 Merge branch 'soon' into staging 2017-07-05 10:14:30 +02:00
yflory 69f4ce2abd Fix middle click on the drive button 2017-07-04 17:03:54 +02:00
ansuz cbd9fc4076 Merge branch 'staging' 2017-07-04 17:03:20 +02:00
ansuz 3fe0baa956 disable pin limit caching 2017-07-04 15:50:52 +02:00
ansuz 9c1eaf9c1a lint compliance 2017-07-04 15:48:20 +02:00
ansuz fa06f9d413 fix minor bugs in poll 2017-07-04 15:09:09 +02:00
ansuz 90bcadd87b Merge branch 'soon' into staging 2017-07-04 14:58:45 +02:00
ansuz be7e7fec43 don't bypass warnings when registering 2017-07-04 14:56:07 +02:00
yflory cab595f959 Fix duplicate folders in the drive 2017-07-04 14:51:35 +02:00
ansuz 42375190e6 style buttons for long titles 2017-07-04 14:24:07 +02:00
ansuz c27c140130 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-07-04 12:37:50 +02:00
ansuz ac8da0d52d load codemirror in the correct context. fix selection events 2017-07-04 12:37:24 +02:00
yflory 789274fd4f Fix font-size in slides 2017-07-04 12:32:14 +02:00
ansuz 7377d39b39 hide print button 2017-07-04 10:35:55 +02:00
ansuz 43b877ad27 fix styling on media tag download button 2017-07-04 10:28:50 +02:00
ansuz 1fd0ba488a Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-07-04 10:21:35 +02:00
ansuz 04a28433ae replace inner content of media tag download buttons 2017-07-04 10:21:29 +02:00
ansuz f85af7ef4c hide useless messages 2017-07-04 10:19:18 +02:00
ansuz a59853f9c2 use new media tag 2017-07-04 10:15:45 +02:00
yflory 8cf694bea6 Lint 2017-07-03 18:41:41 +02:00
yflory 47c6c64b8a Allow emojis in default avatars 2017-07-03 18:37:50 +02:00
yflory ffd184d50e Fix overflowing names in the new userlist 2017-07-03 17:41:34 +02:00
ansuz 92d88d1644 don't change allowed media types until we have media-tag scoping 2017-07-03 16:45:40 +02:00
ansuz 678986dac4 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-07-03 16:43:57 +02:00
yflory fa2d857d70 Fix css issues with Safari 2017-07-03 16:11:41 +02:00
ansuz efedfe0667 show preview pane by default in /slide/ 2017-07-03 14:53:50 +02:00
yflory 81c8949aee Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-07-03 14:43:17 +02:00
yflory 1df5e6e855 Fix toolbar buttons for Safari 2017-07-03 14:32:54 +02:00
ansuz 8b0210baf1 hide useless error 2017-07-03 12:26:34 +02:00
yflory 991cb896bd Fix avatar in /pad 2017-07-03 12:25:05 +02:00
yflory 70c9f3df75 Fix avatar size 2017-07-03 12:13:37 +02:00
ansuz f09ae9b19c jshint compliance 2017-07-03 11:51:47 +02:00
ansuz 4a9a564913 don't try to handle error thta never happens anymore 2017-07-03 11:40:52 +02:00
ansuz b15aa3360a Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-07-03 11:39:21 +02:00
ansuz 6ac056e314 make explicit file size RPCs unauthenticated 2017-07-03 11:38:39 +02:00
yflory 9b131dc49c Fix CSS in the slide app 2017-07-03 11:34:30 +02:00
yflory 5694505719 Fix syntax highlighting 2017-07-03 11:16:28 +02:00
yflory 335898a4c7 Hack the drawer to close it when clicking outside 2017-06-30 18:23:23 +02:00
yflory 472a62730b Fix profile creation and add a link to the profile app 2017-06-30 17:24:22 +02:00
yflory f357ec32c2 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-06-30 16:57:37 +02:00
yflory b153dda6ff Add avatars in the user list 2017-06-30 16:57:23 +02:00
ansuz c2e153e8ed more fouc fixes 2017-06-30 16:20:10 +02:00
yflory 555d0a09f8 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-06-30 12:36:34 +02:00
yflory 568ce70afd Add a spinner for the history and update history buttons 2017-06-30 12:36:21 +02:00
Caleb James DeLisle 2144587919 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-06-30 12:11:55 +02:00
Caleb James DeLisle c25f2df721 Added caching versions to some of the images which are loaded by js 2017-06-30 12:11:44 +02:00
yflory 4ab82710ab Remove the background color from the text-color button in the slide app 2017-06-30 11:55:29 +02:00
yflory 7e69d051c4 Lint errors 2017-06-30 11:46:20 +02:00
yflory 26193aeaa7 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-06-30 11:42:59 +02:00
yflory b9320e6005 Toolbar improvements 2017-06-30 11:42:54 +02:00