Olaf Conradi
94c8d7693f
Keep html in template, use data attribute for img
...
Revert previous changes to fix browser preloading a template variable as image.
Images use a data attribute within templates as src.
Javascript will substitute them.
2012-12-29 23:44:26 +01:00
Olaf Conradi
239110a2bc
Change acl selection box templating
...
Keep dynamic templating in javascript so browsers don't
prefetch non-existing files.
2012-12-28 23:28:53 +01:00
Alexander Kampmann
355c42cb30
Merge branch 'master' of https://github.com/friendica/friendica
...
Conflicts:
include/config.php
update.php
2012-04-05 13:39:15 +02:00
friendica
8aa2552372
add remove_user hook (it looks like dreamhost changed all my file permissions, this will make a nasty commit)
2012-01-18 16:21:30 -08:00
friendica
e764990ce4
better handling of the display of conflicting group permissions
2011-12-21 18:04:24 -08:00
friendica
2e088aad8d
bug #246
2011-12-20 19:11:46 -08:00
friendica
7fbfbdae07
audio/video bb tags showing up on Diaspora
2011-12-20 17:01:41 -08:00
Friendika
7e2284043f
show profile url in ACL hovertips, add fork identifier to json siteinfo
2011-09-27 05:02:25 -07:00
Fabio Comuni
9d2afc2d3c
Merge remote-tracking branch 'friendika/master' into newui
2011-09-16 09:39:29 +02:00
Fabio Comuni
20ca451200
move js to js folder
2011-09-05 11:15:30 +02:00
