Commit Graph

2546 Commits (5641a4a839cad73bf63ef64fee9215c446df276f)

Author SHA1 Message Date
yflory ce5cdce917 Fix an issue where the username was lost on websocket reconnect 2017-05-09 14:31:28 +02:00
ansuz 1d4d4cffdb correct some copypasted code 2017-05-09 14:26:17 +02:00
ansuz 2b4f503aff Merge branch 'master' of github.com:xwiki-labs/cryptpad 2017-05-09 11:55:31 +02:00
ansuz 4a104052b4 handle errors in file 2017-05-09 11:55:25 +02:00
ansuz 28f90a2893 document nginx config changes 2017-05-09 11:51:32 +02:00
yflory b818fd8a37 Fix 'undefined' error with the context menu 2017-05-09 11:20:06 +02:00
yflory c34c1cb07c Press enter to open a folder 2017-05-09 11:03:47 +02:00
yflory e57e4e60da Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-05-09 10:32:48 +02:00
yflory ca6f910f0b Add french translations for 'log out everywhere' 2017-05-09 10:32:41 +02:00
ansuz 31c59068d4 Merge pull request #114 from realitygaps/master
Adding a warning and header to delete/reset docs
2017-05-09 10:11:36 +02:00
ansuz 7da01d0862 unlist removed examples 2017-05-09 08:08:00 +02:00
ansuz ea3dc8a852 remove file upload test 2017-05-09 08:05:20 +02:00
realitygaps d4ca28e63e Adding a warning and header to delete/reset docs 2017-05-05 21:33:45 +02:00
ansuz 42dcfb9661 unceremoniously kick web clients when you 'log out everywhere' 2017-05-05 18:25:55 +02:00
yflory 1547063b7f Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-05-05 18:13:31 +02:00
yflory a20a319a7a Fix focus issues in the CryptDrive search bar 2017-05-05 18:13:14 +02:00
ansuz 36ab38f3ac Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-05-05 17:58:33 +02:00
yflory 9206d89531 Fix lint errors 2017-05-05 17:58:32 +02:00
yflory bbc08bbcfd Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-05-05 17:57:05 +02:00
yflory 5a883d5a57 Use the new toolbar and move the userlist code in a separate file 2017-05-05 17:56:49 +02:00
yflory 6847906ac9 Move the userlist code in a separate file 2017-05-05 15:47:46 +02:00
ansuz 6471b572eb correct off-by-one 2017-05-05 15:40:31 +02:00
ansuz 3a338e0890 fix undefined reference 2017-05-05 15:20:41 +02:00
ansuz 6909f663b6 modify 'log out everywhere' text 2017-05-05 15:18:32 +02:00
ansuz a173e4c7a0 add 'log out everywhere' functionality in settings 2017-05-05 15:09:07 +02:00
yflory 5a5b02b82b Don't store in the drive pads without a hash 2017-05-05 11:55:19 +02:00
ansuz c07d3e6162 update version strings for upcoming release 2017-05-05 11:51:41 +02:00
ansuz 4c359bbb29 add notes about upgrading 2017-05-05 11:50:10 +02:00
ansuz 486d96e818 document upload configuration 2017-05-05 11:28:31 +02:00
ansuz 3ad99be1ef restrict uploads to authenticated users 2017-05-05 11:17:55 +02:00
ansuz f329726fa4 fix undefined reference 2017-05-05 09:12:16 +02:00
ansuz 3e118c6a38 allow instance-wide custom salt for login 2017-05-05 09:10:31 +02:00
ansuz d923fd1b76 close writeStreams before expiring a stream 2017-05-05 09:00:54 +02:00
ansuz 6a00d11a15 fix undefined reference 2017-05-04 18:28:52 +02:00
ansuz c3d1554e8c Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-05-04 18:25:23 +02:00
ansuz 660cda6573 set title when uploading 2017-05-04 18:25:06 +02:00
yflory 706120ae5b Display images uploaded in the File app with the Media app 2017-05-04 18:24:58 +02:00
yflory 28cb40d7ee Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-05-04 17:14:30 +02:00
yflory 1b6fae4dd2 Update mediatag 2017-05-04 17:14:24 +02:00
ansuz a0c420af8e jshint compliance 2017-05-04 16:37:25 +02:00
ansuz 1864dac84f Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-05-04 16:16:16 +02:00
ansuz 78b11584f8 remove unused variables 2017-05-04 16:16:09 +02:00
yflory 4335b050af Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-05-04 16:08:21 +02:00
yflory a190c99426 Toolbar refactoring 2017-05-04 16:08:12 +02:00
ansuz 5739c3d973 blow up if you ever run out of nonce-space 2017-05-04 12:20:38 +02:00
ansuz 2232518c64 set title after uploading 2017-05-04 12:01:37 +02:00
ansuz 5f700c7451 cleanup and jshint compliance 2017-05-04 11:46:11 +02:00
ansuz f644dc6c0b WIP support encrypted file upload via base64 chunks 2017-05-04 11:37:46 +02:00
ansuz ca7b76a812 prototype of encypted file uploads 2017-05-04 11:36:56 +02:00
ansuz 7573b86946 call back with error if an RPC is made while disconnected 2017-05-04 11:36:24 +02:00