Mikael Nordfeldth 980085a8a3 Merge branch 'master' of git.gnu.io:gnu/gnu-social into mmn_fixes ... Conflicts: plugins/Minify/extlib/minify/README.txt plugins/Minify/extlib/minify/UPGRADING.txt plugins/Minify/extlib/minify/min/README.txt plugins/Minify/extlib/minify/min/builder/index.php plugins/Minify/extlib/minify/min/lib/JSMin.php plugins/Minify/extlib/minify/min/lib/Minify.php plugins/Minify/extlib/minify/min/lib/Minify/CSS.php plugins/Minify/extlib/minify/min/lib/Minify/CSS/Compressor.php plugins/Minify/extlib/minify/min/lib/Minify/Controller/Page.php plugins/Minify/extlib/minify/min/lib/Minify/Packer.php plugins/Recaptcha/RecaptchaPlugin.php		2016-03-21 03:10:19 +01:00
..
extlib	Remove Google References	2016-03-20 13:06:58 +00:00
emailsettings.js	Changed .attr() to .prop() for checked and disabled. Removed "style" removal which I assume was tied to opacity setting on line 9. Replaced "style" setting via attr() on line 12 with css().	2013-09-10 13:29:00 +02:00
identica-badge.js	Fixed innerHTML problem in IE7 and 8 for badge script	2010-01-26 01:15:39 +01:00
install.js	Shortcut for (document).ready(). Changed .attr() to .prop() for checked and disabled.	2013-09-10 13:29:01 +02:00
jcrop.go.js	updated and moved jquery-jcrop (no longer .min.js)	2013-09-14 13:31:16 +02:00
util.js	Iterate through input=file attachments (not multi yet)	2016-03-01 18:20:50 +01:00
xbImportNode.js	Break xbImportNode.js and geometa.js back out of util.js; the Makefile in js has been updated to combine them with util.js source when building util.min.js	2010-12-22 15:22:02 -08:00