diff options
| author | Joey Hess <joey@kitenet.net> | 2011-06-16 13:05:05 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2011-06-16 13:05:05 -0400 |
| commit | 6d80bdda7c0cea5fa538733d5ed5c510bb7b1ee1 (patch) | |
| tree | 006ed4460a76e6473f4e5a1a1465e6598f759d00 /debian | |
| parent | 107583ff7b8cf521459b3e38c8708cb7bf5f3fc1 (diff) | |
| parent | 6ebb4e262ef70ec85436b7f0bff134009ce08f3b (diff) | |
| download | ikiwiki-6d80bdda7c0cea5fa538733d5ed5c510bb7b1ee1.tar ikiwiki-6d80bdda7c0cea5fa538733d5ed5c510bb7b1ee1.tar.gz | |
Merge branch 'tova'
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 10 | ||||
| -rw-r--r-- | debian/copyright | 21 |
2 files changed, 29 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog index 4fe011f4a..c807c6da2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,16 @@ ikiwiki (3.20110609) UNRELEASED; urgency=low * userlist: New plugin, lets admins see a list of users and their info. * aggregate: Improve checking for too long aggregated filenames. + * Updated to jQuery 1.6.1. + * attachment: Speed up multiple file uploads by storing uploaded files + in a staging area until the page is saved/previewed, rather than + refreshing the site after each upload. + (Sponsored by The TOVA Company.) + * attachment: Files can be dragged into the edit page to upload them. + Multiple file batch upload support. Upload progress bars. + AJAX special effects. Impemented using the jQuery-File-Upload widget. + (If you don't have javascript don't worry, I kept that working too.) + (Sponsored by The TOVA Company.) -- Joey Hess <joeyh@debian.org> Thu, 09 Jun 2011 10:06:44 -0400 diff --git a/debian/copyright b/debian/copyright index 82c72d734..bcd9642b6 100644 --- a/debian/copyright +++ b/debian/copyright @@ -203,10 +203,27 @@ Comment: From http://code.google.com/p/openid-selector/ License: BSD-2-clause -Files: underlays/openid-selector/ikiwiki/openid/jquery.js -Copyright: © 2005-2008 by John Resig, Branden Aaron & Jörn Zaefferer +Files: underlays/jquery/* +Copyright: © 2005-2011 by John Resig, Branden Aaron & Jörn Zaefferer + © 2011 The Dojo Foundation License: GPL-2 +Files: underlays/attachments/ikiwiki/jquery-ui* +Copyright: © 2008 Paul Bakaus + © 2011 the jQuery UI Authors (http://jqueryui.com/about) +License: GPL-2 + +Files: underlays/attachments/ikiwiki/jquery.tmpl.min.js +Copyright: © Boris Moore +License: GPL-2 + +Files: underlays/attachments/ikiwiki/ +Copyright: 2010, 2011 Sebastian Tschan +Comment: + blueimp / jQuery-File-Upload widget, + from https://github.com/blueimp/jQuery-File-Upload +License: Expat + Files: underlays/themes/blueview/style.css Copyright: © 2009,2010 Bernd Zeimetz © 2008 Yahoo! Inc. |