friendica/js
rabuzarus 01b02dbcaa Merge develop into 1404_reworked_autocomplete
Conflicts:
	include/text.php
	view/templates/head.tpl
	view/theme/duepuntozero/style.css
	view/theme/vier/style.css
2016-04-14 16:23:51 +02:00
..
acl.js ACL: fix TypeError when selecting permissions 2016-02-05 18:43:46 +01:00
ajaxupload.js
autocomplete.js rework autocomplete: some styling if contact is forum 2016-02-03 00:25:33 +01:00
country.js
filebrowser.js js: add new Dialog object 2015-11-08 12:01:19 +01:00
fk.autocomplete.js rework autocomplete: initial commit 2016-01-19 18:11:40 +01:00
jquery-migrate.js updated jquery to version 1.11, updated themes frost and diabook where necessary 2014-09-06 16:21:03 +02:00
jquery.htmlstream.js
jquery.js Update jquery.js 2015-03-26 23:55:32 +01:00
jquery.textinputs.js
main.js Merge develop into 1404_reworked_autocomplete 2016-04-14 16:23:51 +02:00
modernizr.js updated jquery to version 1.11, updated themes frost and diabook where necessary 2014-09-06 16:21:03 +02:00
webtoolkit.base64.js