Commit graph

2158 commits

Author SHA1 Message Date
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
ansuz
fe93da8817 get ready to implement blob storage 2017-04-28 11:46:13 +02:00
ansuz
e132ccf94a prepare for upload 2017-04-28 11:45:53 +02:00
yflory
bf7c7c45d0 Add the storage limit warning in the toolbar 2017-04-27 18:46:46 +02:00
yflory
197b366712 Ability to drag&select in the drive 2017-04-27 17:01:56 +02:00
ansuz
e2942f959b add crypto for decrypting a chunked file 2017-04-27 12:56:42 +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
yflory
f50aa5c29b Move the mediatag viewer into a media app 2017-04-26 14:55:06 +02:00
yflory
6a8274518b Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-04-25 18:42:33 +02:00
yflory
9882a3a923 Add support for the file applicaiton in the drive 2017-04-25 18:42:21 +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
f196b836db fix undefined reference 2017-04-25 16:17:52 +02:00
ansuz
f8f97036be ignore media-tag.js 2017-04-25 16:12:28 +02:00
ansuz
48973bccd6 add tests to assert for hash parsing 2017-04-25 16:11:19 +02:00
Caleb James DeLisle
211113fb1a little flowey 2017-04-25 16:04:17 +02:00
ansuz
5194677443 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-04-25 14:57:34 +02:00
yflory
c9c7d61ad1 Media tag viewer 2017-04-25 14:55:38 +02:00
ansuz
729d1460b9 Merge branch 'master' into staging 2017-04-25 14:35:24 +02:00
ansuz
a840fb9e85 add example hashes and start working on hash v2 2017-04-25 14:33:57 +02:00
ansuz
9c2da10d79 bump version to 1.5.0 2017-04-25 11:01:19 +02:00
ansuz
d1fa68e30d build UCF Media Tag 2017-04-24 17:13:32 +02:00
ansuz
e40203480f Merge pull request #113 from pbondoer/staging
Update spanish
2017-04-24 16:09:53 +02:00
ansuz
cc33c4abe9 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-04-24 15:41:46 +02:00
ansuz
a5ca461a73 update footer for new version 2017-04-24 15:41:29 +02:00
yflory
fdd51ec18d Don't remove a folder moved into unsorted or into itself 2017-04-24 15:38:03 +02:00
Pierre Bondoerffer
ba407322e8
Update spanish 2017-04-24 15:16:30 +02:00
yflory
3e28d1b966 Add a missing key in the french translation 2017-04-24 14:41:55 +02:00
yflory
6cb331887e Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-04-24 14:39:36 +02:00
yflory
9abfadb32f Update french translation 2017-04-24 14:39:30 +02:00
ansuz
4b95a1da48 unbreak assert/translations 2017-04-24 14:32:56 +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
yflory
4c3e842664 Fix focus issues with the history input in ckeditor 2017-04-24 13:55:03 +02:00
ansuz
f7e96b4e8c resolve merge conflicts and jquery errors 2017-04-24 13:43:18 +02:00
ansuz
81c5e26a0a validate rpc messages more carefully 2017-04-24 12:10:12 +02:00
yflory
5fc2e4cf71 Remove the toolbar in ckeditor history mode + history configurable 2017-04-24 11:41:00 +02:00
ansuz
9e749b7cd8 handle invalid channels 2017-04-24 11:40:13 +02:00
ansuz
18e2e66b06 jshint compliance 2017-04-24 11:39:39 +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
c51073f211 support batch getFileSize calls 2017-04-21 14:51:20 +02:00