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

2835 Commits

Author SHA1 Message Date
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
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 750ed7899f Merge branch 'master' of evan@dev.controlyourself.ca:/var/www/trunk 2009-01-23 08:15:59 +01: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
Zach Copley 78bf361291 trac750 fix href for theme stylesheet 2009-01-23 07:09:00 +00:00
sarven 493b77b2e1 Minor 2009-01-23 06:49:14 +00:00
sarven b84868d059 Default stylesheet 2009-01-23 06:39:48 +00:00
Evan Prodromou da5c5499b8 Merge branch 'master' of /var/www/trunk 2009-01-23 06:33:08 +00:00
Evan Prodromou 745885902a Add several more help files 2009-01-23 06:32:56 +00:00
sarven 538518ead6 Not using thickbox... yet 2009-01-23 06:18: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
Zach Copley 3af566d1ec Merge branch 'master' of /var/www/trunk 2009-01-23 05:59:35 +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 36d55526d3 trac750 fix for crash when a user logs in and hasn't already posted a notice 2009-01-23 05:47:34 +00: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
sarven d98f8c646a Merge branch 'master' of ../trunk 2009-01-23 05:24:00 +00:00
sarven 500ed2f5eb Cleanup 2009-01-23 05:23:28 +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
Robin Millette c628bbb192 make avatar bigger on single notice pages 2009-01-23 05:11:04 +00:00
Evan Prodromou a130bb9d6d A section 2009-01-23 06:10:25 +01:00
sarven 7afb2be83f Merge branch 'master' of ../trunk 2009-01-23 04:55:09 +00:00
sarven e2afca803d Cleanup 2009-01-23 04:54:54 +00:00
Robin Millette 597245ffc3 make avatar bigger on single notice pages 2009-01-23 04:52:39 +00:00
Robin Millette 488bf16bc8 Merge branch 'master' of /var/www/trunk 2009-01-23 04:29:28 +00:00
Robin Millette 998e6044e5 uiredesign 2009-01-23 04:29:21 +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 e59b8c8758 Merge branch 'master' of /var/www/trunk 2009-01-23 04:10:57 +00:00
Robin Millette 4c58e6b312 uiredesign 2009-01-23 04:10:49 +00:00
sarven 112dd08c62 anon_notice 2009-01-23 04:10:40 +00:00
sarven 651a7dc324 Merge branch 'master' of ../trunk 2009-01-23 04:08:31 +00:00
sarven fbe6aa703e Tag cloud font-size and line-height 2009-01-23 04:08:12 +00:00
Robin Millette 3f328256bd uiredesign 2009-01-23 04:07:52 +00:00
Robin Millette 11b99b8144 Merge branch 'master' of /var/www/trunk 2009-01-23 04:03:11 +00:00
Robin Millette 1e1a24d8c1 small bugfix, it's prepare() not initialize() 2009-01-23 04:03:04 +00:00
sarven 8b7c71ac24 Reduced .aside .tag-cloud font-size 2009-01-23 03:51:35 +00:00
sarven 961c5af3ce Anonymous notice 2009-01-23 03:47:32 +00:00
Robin Millette c8b606f17e Merge branch 'master' of /var/www/trunk 2009-01-23 03:32:12 +00:00
Robin Millette 63c5e34bed uiredesign 2009-01-23 03:32:06 +00:00
Evan Prodromou 13bd15b0b5 p -> div for markup wrapper 2009-01-23 04:31:50 +01:00
Robin Millette 45f5094b46 uiredesign 2009-01-23 03:31:38 +00:00
Evan Prodromou ed09eece28 Merge branch 'master' of evan@dev.controlyourself.ca:/var/www/trunk 2009-01-23 04:21:08 +01:00
sarven bf50e4a25a favicon for identica 2009-01-23 03:20:02 +00:00
Evan Prodromou 3c8f41deb0 Anonymous message for group page 2009-01-23 04:19:03 +01:00