friendica/friendica
6
0
Fork 1
mirror of https://github.com/friendica/friendica synced 2024-05-20 11:16:43 +02:00
Code Issues Packages Projects Releases 1 Wiki Activity
7622 commits 2 branches 63 tags 241 MiB
Commit graph

6 commits

Author SHA1 Message Date
Michael Vogel 93143702ed Merge remote-tracking branch 'upstream/master' 
Conflicts:
	boot.php
	database.sql
	library/fancybox/jquery.fancybox-1.3.4.css
	mod/search.php
	update.php
 2013-02-17 12:35:40 +01:00
Michael Vogel c9307eb96a OStatus conversation are now checked every 30 minutes for new answers. 2013-02-04 00:57:23 +01:00
Fabrixxm a875bec75c update fancybox, remove tiptip from head.tpl 2013-01-22 08:17:23 -05: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
Fabio Comuni 1c9ed08620 show acl selector in a popup with fancybox 2011-07-20 10:00:33 +02:00