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 getOffset() now falls back to old slower version for CSS layouts which cannot figure out bounding box widths. This fixes the photo and attachment upload buttons for some themes such as vier. 2013-10-23 19:21:53 +03:00
autocomplete.js rework autocomplete: some styling if contact is forum 2016-02-03 00:25:33 +01:00
country.js Friendicaland. 2012-11-06 21:17:46 +00:00
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 Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
jquery.js Update jquery.js 2015-03-26 23:55:32 +01:00
jquery.textinputs.js Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00
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 Merge branch 'master' of https://github.com/friendica/friendica 2012-04-05 13:39:15 +02:00