Commit Graph

3061 Commits (cba113a2b00395af508c989c5df8cb487489fd13)

Author SHA1 Message Date
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 6f7c60bf12 Merge pull request #154 from evalica/153
Issue #153: On Register, add spacing between checkboxes and labels
2017-07-07 17:17:30 +02:00
ansuz 8f32809d99 Merge pull request #152 from evalica/151
Issue #151: Spacing between "Log-in" and "Register" buttons
2017-07-07 17:16:56 +02:00
Ecaterina Moraru (Valica) e8e8858e44 Issue #153: On Register, add spacing between checkboxes and labels 2017-07-07 17:26:34 +03:00
Ecaterina Moraru (Valica) fc065a0484 Issue #151: Spacing between "Log-in" and "Register" buttons
- Removed ".first" class from Register button
- Increase spacing between buttons
2017-07-07 17:04:26 +03: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
ansuz 9e30bc995c Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-07-07 10:15:27 +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
Caleb James DeLisle 607d4fa57e Fixed broken pinneddata.js and added blob data to the stats 2017-07-06 17:19:29 +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
ansuz 377f9625b5 Merge pull request #148 from pbondoer/master_spanish
Spanish update
2017-07-06 10:43:42 +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
Pierre Bondoerffer 56ed1dd457
spanish update 2017-07-06 10:13:56 +02:00
ansuz 3d2e628e57 Merge pull request #144 from irregulator/master
Fix readme cryptpad-docker doc link
2017-07-06 10:02:42 +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
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