Commit Graph

3080 Commits (5fa20836cf357805b5f13d46c9a9e8dd962dea80)

Author SHA1 Message Date
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
ansuz 63fd7b4dde implement EXPIRE_SESSION rpc 2017-07-05 16:00:54 +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
ansuz cb7efeebe1 don't require admins to explicitly enable uploads 2017-07-05 11:54:27 +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
ansuz b0a0b29770 add missing diff-dom dependency 2017-07-05 10:09:42 +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 9bf9130b9d fix error in pin reset 2017-07-04 17:02:29 +02:00
yflory 2acbb37291 Merge branch 'soon' 2017-07-04 15:58:30 +02:00
yflory d7f9ddd8d2 Fix icon colors in the new menu (/pad app) 2017-07-04 15:57:34 +02:00
yflory cc67838786 Fix horizontal scrollbar in /pad anonymous mode 2017-07-04 15:56:18 +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 43d4597f38 merge to master 2017-07-04 14:19:08 +02:00
ansuz 34fd6f4285 new version 2017-07-04 14:11:56 +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
Caleb James DeLisle 25905d13fa wip 2017-07-03 20:40:19 +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
yflory fcf983854d Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-07-03 17:05:13 +02:00
yflory 1a27f11e73 Fix dropdown menus in static pages 2017-07-03 17:04:59 +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
ansuz 708d5ae35f remove noisy log calls 2017-07-03 16:43:49 +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