eliseuamaro
/
gnu-social
forked from GNUsocial/gnu-social
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
2,909 Commits 8 Branches 0 Tags 309 MiB
Commit Graph

1247 Commits

Author SHA1 Message Date
Evan Prodromou 0e9cdf5859 Merge branch 'master' of evan@dev.controlyourself.ca:/var/www/trunk 2009-01-26 14:14:49 +01:00
Evan Prodromou 3e0e7ddb2c Make the newmessage page better with new framework 2009-01-26 14:05:59 +01:00
Evan Prodromou 80e04a8d9f Show a new message form on message/new 2009-01-26 13:46:04 +01:00
Zach Copley 55a4fac6a6 trac750 Better permissions workflow and styling hooks 2009-01-26 06:31:25 +00:00
Robin Millette 89a668344f added group rss action 2009-01-25 19:16:19 +00:00
Evan Prodromou f06d5eff10 Merge branch 'master' of evan@dev.controlyourself.ca:/var/www/trunk 2009-01-25 18:07:55 +01:00
Zach Copley 688d38b101 Fixed broken SQL for people tags view 2009-01-25 02:03:49 -08:00
Evan Prodromou 0d34cd24ab Update notice deletion 
Changed the errors in notice deletion so it now works. Also,
consistently delete records from related tables that refer
to the notice.
 2009-01-24 19:38:40 +01:00
Evan Prodromou 1f4edd70cb whitespace in deletenotice.php 2009-01-24 19:12:47 +01:00
Evan Prodromou 4c9f3297f2 fix title on replies 2009-01-24 18:28:47 +01:00
Zach Copley 40928cd27a Wow, let's try this once more. peopletag.php should be converted to new uiredesign now 2009-01-24 03:21:39 -08:00
Zach Copley 25de8fa06d Okay, let's try that again. uiconversion of peopletag.php 2009-01-24 03:06:46 -08:00
Zach Copley 7a45489f09 converted peopletag.php to new uiredesign; css still looks bad 2009-01-24 02:44:32 -08:00
Evan Prodromou a611408dca Revert "try to fix groups with a new qry" 
This reverts commit 8f19855cd0.
 2009-01-24 11:05:38 +01:00
Evan Prodromou 8f19855cd0 try to fix groups with a new qry 2009-01-24 10:53:28 +01:00
sarven 8e4f985e45 Minor 2009-01-24 03:45:44 +00:00
sarven 08030196ca new group markup in usergroups matching groups 2009-01-24 03:23:40 +00:00
sarven 0cdaf3e155 Invitation markup and style 2009-01-24 03:18:34 +00:00
sarven 4980f654a8 Notice search markup and style 2009-01-24 03:14:27 +00:00
sarven 18eb40c988 Search form markup and style 2009-01-24 00:58:12 +00:00
sarven 7fa5e22438 Twitter settings styles 2009-01-23 11:42:38 +00:00
sarven 1e5ad33f72 Matching it to avatar layout 2009-01-23 10:47:11 +00:00
Evan Prodromou 11cb85820d Merge branch 'master' of evan@dev.controlyourself.ca:/var/www/trunk 2009-01-23 10:37:27 +01:00
Evan Prodromou e566b8929b These aren't readonly 2009-01-23 10:37:04 +01:00
Evan Prodromou 32c9c03cdc remove top posters from public 2009-01-23 10:36:16 +01:00
Zach Copley 0ef33663ce Merge branch 'master' of ssh://zach@dev.controlyourself.ca/var/www/trunk 2009-01-23 01:20:00 -08:00
Zach Copley b13374faa5 Bring the Twitter compatible API inline with new uiredesign stuff 2009-01-23 01:19:19 -08:00
Robin Millette 4c7f3faf92 mark nudge action read-only 2009-01-23 09:15:57 +00:00
Robin Millette 0f6bc2190a mark a bunch of actions read-only 2009-01-23 09:15:15 +00:00
Evan Prodromou 25ff381486 Merge branch 'master' of evan@dev.controlyourself.ca:/var/www/trunk 2009-01-23 09:52:46 +01:00
sarven 0aa2cb35f1 Merge branch 'master' of ../trunk 2009-01-23 08:52:24 +00:00
sarven 6c9bbdb561 openid markup and style 2009-01-23 08:52:04 +00:00
Evan Prodromou daf32e43cd usergroups is read only 2009-01-23 09:51:10 +01:00
Evan Prodromou cdd2032540 groups are readonly 2009-01-23 09:49:38 +01:00
Evan Prodromou 5f89b88650 showstream is readonly 2009-01-23 09:45:48 +01:00
Evan Prodromou 9c5ab86d0e Merge branch 'master' of evan@dev.controlyourself.ca:/var/www/trunk 2009-01-23 09:43:41 +01:00
Zach Copley 1305ecf4bd Merge branch 'master' of /var/www/trunk 2009-01-23 08:43:34 +00:00
Zach Copley 76cf3cc3d0 trac750 Fixed bad url that made the 'skip' step when adding status_update permission fail 2009-01-23 08:42:40 +00:00
Evan Prodromou ad929011a3 public is readonly 2009-01-23 09:42:23 +01:00
Evan Prodromou 4e5be119d3 Merge branch 'master' of evan@dev.controlyourself.ca:/var/www/trunk 2009-01-23 09:17:51 +01:00
Zach Copley 85321cede0 Fix for Twitter bridge bug introduced by uiredesign merge 2009-01-23 00:11:05 -08:00
Evan Prodromou e7d5310a2f Merge branch 'master' of evan@dev.controlyourself.ca:/var/www/trunk 2009-01-23 09:01:06 +01:00
Evan Prodromou a7c85bebd5 Merge branch 'master' of /var/www/mublog 
Conflicts:

	actions/api.php
	actions/deletenotice.php
	actions/recoverpassword.php
	actions/remotesubscribe.php
	actions/tag.php
	actions/tagrss.php
	actions/twitapiaccount.php
	actions/twitapiusers.php
	classes/Notice.php
	classes/User.php
	lib/common.php
	lib/language.php
	lib/subs.php
	lib/twitterapi.php
	lib/util.php
	scripts/inbox_users.php
	scripts/update_translations.php

Merged development trunk into laconica head. woohoo!
 2009-01-23 08:58:31 +01:00
Robin Millette aa100884fb Merge branch 'master' of /var/www/trunk 2009-01-23 07:51:02 +00:00
Robin Millette 965d4db265 Group search 2009-01-23 07:50:55 +00:00
Evan Prodromou 750ed7899f Merge branch 'master' of evan@dev.controlyourself.ca:/var/www/trunk 2009-01-23 08:15:59 +01:00
Evan Prodromou 50ec1cc26e Upload logos for groups 2009-01-23 08:15:29 +01:00
Zach Copley 78bf361291 trac750 fix href for theme stylesheet 2009-01-23 07:09:00 +00:00
sarven c97980b145 Missing closing li 2009-01-23 06:14:56 +00:00
Zach Copley 94b926be65 trac750 small fix to FBJS redirect 2009-01-23 06:02:41 +00:00