Commit graph

12 commits

Author SHA1 Message Date
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
Michael Johnston
581b54c974 allow users to set categories on their posts 2012-04-01 21:28:31 -04:00
friendica
53f799f2bc handle escaped file chars in display and search 2012-03-31 15:25:17 -07:00
friendica
bcc5801608 rename "file as" to "save to folder" 2012-03-30 02:42:36 -07:00
friendica
0aa99acd35 profile_tabs hook 2012-03-27 20:15:15 -07:00
friendica
6780b76b0c improved the inivitations and added a bit of sales pitch. 2012-03-24 23:04:18 -07:00
friendica
be48fff157 file as widget and basic filing implementation for duepuntozero,slackr
much more work needed - this is just for test/evaluation currently
2012-03-13 18:13:03 -07: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
cfe8094b45 nets widget - allow all children of specified parent net regardless of network 2012-01-06 00:23:05 -08:00
friendica
c3ada095f4 network select widget 2012-01-05 20:40:48 -08:00
Friendika
e38aa67263 link suggestions into the main code 2011-11-01 21:27:11 -07:00
Friendika
2206d894b3 add contact_widgets and provide widgets on appropriate pages, fix the saved search widget
fix directory page on testbubble, don't use system theme for community, directory, and search if the viewer is logged in.
2011-10-11 19:27:58 -07:00