Commit graph

291 commits

Author SHA1 Message Date
yflory
c1b43db363 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-05-15 18:21:25 +02:00
ansuz
1542aa96bc Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-05-15 18:17:56 +02:00
yflory
dc2cdb7c08 Add the usage bar in the settings page 2017-05-15 18:16:22 +02:00
ansuz
2dd04f7631 get limits from the server 2017-05-15 18:03:12 +02:00
yflory
771348720b Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-05-15 13:54:25 +02:00
yflory
57979f6314 Display the public key using a href in the settings page 2017-05-15 13:53:43 +02:00
ansuz
06f3d0eefe shim isArray if not exists. correctly report how often this occurs 2017-05-15 10:26:52 +02:00
yflory
601226115b New anonymous drive 2017-05-12 18:06:29 +02:00
yflory
ed95bbb08f Fix lint errors 2017-05-12 16:43:01 +02:00
yflory
89a993be3c Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-05-12 16:33:56 +02:00
yflory
0f13198119 Move the parseHash code into parsePadUrl 2017-05-12 16:33:45 +02:00
yflory
57ee7de7d4 Update and return the storage limit 2017-05-11 16:12:44 +02:00
yflory
5c8586f8a3 Fix typo in file upload 2017-05-10 15:00: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
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
bbc08bbcfd Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-05-05 17:57:05 +02:00
yflory
6847906ac9 Move the userlist code in a separate file 2017-05-05 15:47:46 +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
78b11584f8 remove unused variables 2017-05-04 16:16:09 +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
yflory
afb0061d7b Fix an issue with anonymous user unable to store new pads 2017-04-28 17:11:07 +02:00
yflory
a51a35da70 Fix an issue with hashes ending with a slash 2017-04-28 15:47:31 +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
ansuz
12898b3358 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-04-25 18:28:48 +02:00
ansuz
74bcec8b31 programming is hard okay 2017-04-25 18:28:39 +02:00
yflory
2a417ddae8 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-04-25 17:22:07 +02:00
yflory
d985b144cc Add a new hash version for the file viewer 2017-04-25 17:19:13 +02:00
ansuz
3309087277 send feedback if isArray is not supported 2017-04-25 17:09:39 +02:00
ansuz
4fdc5f897e only feedback migration if user had legacy store 2017-04-24 14:26:55 +02:00
ansuz
218f2ff76c feedback when logging in or registering 2017-04-24 14:15:17 +02:00
ansuz
f7e96b4e8c resolve merge conflicts and jquery errors 2017-04-24 13:43:18 +02:00
yflory
5fc2e4cf71 Remove the toolbar in ckeditor history mode + history configurable 2017-04-24 11:41:00 +02:00
yflory
92ea03d7d9 View and restore the history of a pad 2017-04-21 17:31:47 +02:00
ansuz
4c0d7bf8e8 support multiple calls to cryptpad.ready 2017-04-21 16:51:32 +02:00
ansuz
ec041c88e2 console.log when providing feedback
also notify server if a users browser does not support proxies
2017-04-21 15:53:13 +02:00
ansuz
3afaf029cb feedback about how often we migrate an old drive 2017-04-20 17:06:09 +02:00
ansuz
347459781c show the size of your files, if you're logged in 2017-04-18 15:49:04 +02:00
ansuz
2b8579e8b7 add pretty-printers for byte-counts 2017-04-18 15:44:15 +02:00
ansuz
2a25afae5f Merge branch 'soon' into staging 2017-04-18 12:24:45 +02:00