Commit Graph

687 Commits (97a28d3938865e732cd9508cb5b71faffb0ecda9)

Author SHA1 Message Date
ansuz 922e7803e9 remove extraneous slashes from hashes when parsing 2017-05-10 11:54:05 +02:00
ansuz a338b23f40 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-05-09 18:36:27 +02:00
ansuz df47b913e3 fetch array buffers in cryptpad-common 2017-05-09 18:36:18 +02:00
yflory ff16084719 Fix lint errors 2017-05-09 18:10:02 +02:00
yflory 50c8a859e6 Move the CodeMirror cursor code to common-codemirror 2017-05-09 17:57:27 +02:00
yflory 9eb8e55cf6 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-05-09 17:48:07 +02:00
yflory c79a6e3b2b Move Metadata, CodeMirror and title functions in separate files 2017-05-09 17:47:47 +02:00
yflory 63710e1ccc Move the code related to the title in another file 2017-05-09 14:32:41 +02:00
yflory ce5cdce917 Fix an issue where the username was lost on websocket reconnect 2017-05-09 14:31:28 +02:00
ansuz 42dcfb9661 unceremoniously kick web clients when you 'log out everywhere' 2017-05-05 18:25:55 +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 3a338e0890 fix undefined reference 2017-05-05 15:20:41 +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 3e118c6a38 allow instance-wide custom salt for login 2017-05-05 09:10:31 +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 7573b86946 call back with error if an RPC is made while disconnected 2017-05-04 11:36:24 +02:00
ansuz 410a9dfb17 temporary solution for testing pin limits 2017-05-04 11:20:52 +02:00
yflory ef89451a83 Display the storage limit in the drive 2017-05-02 17:14:53 +02:00
ansuz f2672d587a fix variable redefinition 2017-05-02 09:42:51 +02:00
ansuz 0e7eeb285c Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-04-29 14:24:14 +02:00
yflory f414d480a9 Add the history mode to the CryptDrive 2017-04-28 18:23:41 +02:00
ansuz cf4dee28f7 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-04-28 17:13:18 +02:00
ansuz 28e4ef1b13 WIP RPC code 2017-04-28 17:11:50 +02:00
yflory afb0061d7b Fix an issue with anonymous user unable to store new pads 2017-04-28 17:11:07 +02:00
yflory 56aaeea003 Fix the drive toolbar not displaying the displayName 2017-04-28 17:03:47 +02:00
ansuz 3fa0a73025 prevent using string methods on undefined variable 2017-04-28 16:09:46 +02:00
ansuz 1b3ce5aa96 fix typo 2017-04-28 16:08:47 +02:00
yflory a51a35da70 Fix an issue with hashes ending with a slash 2017-04-28 15:47:31 +02:00
yflory ef58120819 Prevent multiple concurrent clicks to get the history 2017-04-28 14:09:59 +02:00
yflory 16f6ab813c Make it clear that the number is the history represents a version 2017-04-28 13:06:55 +02:00
yflory c820b3485c Fix function undefined when loading a template 2017-04-28 12:16:45 +02:00
yflory 0ef1c14d7f Fix lint errors 2017-04-28 12:12:17 +02:00
yflory fc760b4820 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-04-28 12:08:21 +02:00
yflory a165332c15 Don't store a pad in the drive if the limit has been reached 2017-04-28 12:08:05 +02:00
ansuz e51c7f9cf0 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-04-28 11:46:24 +02:00
yflory bf7c7c45d0 Add the storage limit warning in the toolbar 2017-04-27 18:46:46 +02:00
ansuz aedc46bdaf Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-04-27 12:47:27 +02:00
ansuz a97e7223f1 implement getBlobPathFromHex 2017-04-27 12:47:21 +02:00
yflory 520dabe094 Remove the unsorted files category 2017-04-26 18:46:40 +02:00