Commit graph

2341 commits

Author SHA1 Message Date
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
ansuz
1af621bfe5 Merge remote-tracking branch 'origin/auth' into staging 2017-04-20 17:27:32 +02:00
ansuz
3afaf029cb feedback about how often we migrate an old drive 2017-04-20 17:06:09 +02:00
Caleb James DeLisle
0e8b55edc0 Added an authentication page to allow getting the user pubkey 2017-04-20 10:15:07 +02:00
ansuz
df9c312b7d make new text translateable 2017-04-18 18:31:58 +02:00
ansuz
e8b053e48b use bootloader in feedback.html 2017-04-18 17:31:35 +02:00
ansuz
a6dbfcecf3 remove old/unused assertions 2017-04-18 17:28:09 +02:00
ansuz
b658bda421 use bootloader to fix paths to jquery and json.sortify 2017-04-18 17:24:46 +02:00
ansuz
fd067510fe support logging feedback api via config.js 2017-04-18 15:51:42 +02:00
ansuz
8f352c8433 add justify plugin to default ckeditor config 2017-04-18 15:49:31 +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
ansuz
e0ecf651e2 add a note about showing pinned file usage 2017-04-18 12:23:58 +02:00
ansuz
ee99310e99 Merge pull request #112 from xwiki-labs/jquery-require2
Jquery require2
2017-04-18 12:18:31 +02:00
Caleb James DeLisle
c341fa8e94 Pull jquery using require.js rather than as a script tag and fix require to pass jquery as a parameter 2017-04-18 12:14:32 +02:00
ansuz
da69c1822c ask users to sign back if signing keys are missing 2017-04-18 11:58:41 +02:00
ansuz
107e75b287 remove invalid semicolon 2017-04-14 19:24:20 +02:00