GNUsocial
/
gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity
2,917 Commits 8 Branches 4 Tags 309 MiB
Commit Graph

1233 Commits

Author SHA1 Message Date
Evan Prodromou c4097750ad Revert "Fixup already-subscribed string" 
This reverts commit 6055516aaf.
 2009-01-27 20:34:57 -05:00
Meitar Moscovitz 44162e07c3 Fix scrolling for groups 2009-01-26 16:16:51 +01:00
Evan Prodromou f3db32d151 Fix direct addressing of messages 2009-01-26 15:45:54 +01:00
Adrian Lang 6055516aaf Fixup already-subscribed string 2009-01-26 14:21:01 +01:00
Adrian Lang 5b211271f9 Fix pagination on user groups page 2009-01-26 14:19:49 +01:00
Evan Prodromou 0e9cdf5859 Merge branch 'master' of evan@dev.controlyourself.ca:/var/www/trunk 2009-01-26 14:14:49 +01:00
Zach Copley 55a4fac6a6 trac750 Better permissions workflow and styling hooks 2009-01-26 06:31:25 +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 e2a965c999 Rss10Action::showImage() was trying to call pre-uiredesign XML output functions 2009-01-24 22:08:27 -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 db4271692a wrong action for groups 2009-01-24 11:26:28 +01:00
Evan Prodromou 4e44b0b8d7 Fix the group url (Closes #971) 2009-01-24 11:24:37 +01:00
Evan Prodromou 1b07e65277 Merge branch 'master' of evan@dev.controlyourself.ca:/var/www/trunk 2009-01-24 10:38:11 +01:00
sarven 18eb40c988 Search form markup and style 2009-01-24 00:58:12 +00:00
Zach Copley 44d1e723df trac750 fixed dumb sql query that was pulling ancient notices 2009-01-23 12:12:51 +00:00
Zach Copley 767c7d293d trac750 Better CSS file organization and linking fore the FB app 2009-01-23 10:51:49 +00:00
Evan Prodromou 447e2b8e35 Bad link for popular notices 2009-01-23 11:51:48 +01:00
Zach Copley d06a929d70 Merge branch 'master' of /var/www/trunk 2009-01-23 09:47:09 +00:00
Zach Copley ef3f47b8f5 trac750 Better styling for the Facebook profile box widget 2009-01-23 09:46:29 +00: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
sarven 927576e3f0 Using openidlogin instead of openid in order to show the current local 
nav item
 2009-01-23 08:58:54 +00: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 7aa496cd8a Merge branch 'master' of evan@dev.controlyourself.ca:/var/www/trunk 2009-01-23 08:23:40 +01:00
Zach Copley 8114676bd4 trac750 Let's try that again - fix for base css href 2009-01-23 07:22:01 +00:00
Evan Prodromou aadf10cedb Update version number 2009-01-23 08:15:40 +01:00
Evan Prodromou 50ec1cc26e Upload logos for groups 2009-01-23 08:15:29 +01:00
sarven 538518ead6 Not using thickbox... yet 2009-01-23 06:18:00 +00:00
Robin Millette 171d89aab7 Merge branch 'master' of /var/www/trunk 2009-01-23 05:57:15 +00:00
Robin Millette fbd1cf4dfa use new error actions classes to display error 2009-01-23 05:57:08 +00:00
Evan Prodromou 277a6e984c Merge branch 'master' of evan@dev.controlyourself.ca:/var/www/trunk 2009-01-23 06:47:43 +01:00
Zach Copley df25b5f5f5 Merge branch 'master' of /var/www/trunk 2009-01-23 05:37:45 +00:00
Zach Copley 240231a8bd trac750 linked in stylesheets for login and permissions prompt screens 2009-01-23 05:37:21 +00:00
Evan Prodromou 9dc5d8d0f6 Made avatar upload a two-stage process; first upload, then crop 2009-01-23 06:16:55 +01:00
Evan Prodromou a7b80ef230 Better math for seciton 2009-01-23 06:11:05 +01:00
Evan Prodromou a130bb9d6d A section 2009-01-23 06:10:25 +01:00
Robin Millette 597245ffc3 make avatar bigger on single notice pages 2009-01-23 04:52:39 +00:00
Zach Copley 8dad87ea95 trac750 FB script to update statuses working again with new uiredesign stuff 2009-01-23 04:23:44 +00:00
Robin Millette 45f5094b46 uiredesign 2009-01-23 03:31:38 +00:00
Zach Copley adf77944e8 trac750 Facebook app proper integrated into new uiredesign 2009-01-23 03:16:03 +00:00
Evan Prodromou 21d156c05b Keep checking who's received stuff in jabber broadcast 2009-01-23 03:58:18 +01:00
Evan Prodromou eb156741f8 Merge branch 'master' of evan@dev.controlyourself.ca:/var/www/trunk 2009-01-23 03:49:56 +01:00
sarven 8ba19b0686 Merge branch 'master' of ../trunk 2009-01-23 02:43:55 +00:00
sarven 0daf242100 Using util.js to set onclick reply anchor 2009-01-23 02:43:18 +00:00
Evan Prodromou 4bd3eae79d Make sure group messages go out over Jabber 2009-01-23 03:29:26 +01:00