wamo/gnu-social
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
13,849 Commits 8 Branches 0 Tags 330 MiB
383f14c781
Commit Graph

13849 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Evan Prodromou
506958f2c8 Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x 2011-05-31 17:01:11 -04:00
Evan Prodromou
60a1b0a15a Change 'listening to your notices' to 'following you' 2011-05-31 17:00:23 -04:00
Brion Vibber
712ba64fa6 Apply upstream fix to MSN library for darkip 
Upstream fix
http://code.google.com/p/phpmsnclass/source/diff?spec=svn52&old=47&r=52&format=unidiff&path=%2Ftrunk%2Fphpmsnclassv2%2Fmsn.class.php
 2011-05-31 11:46:50 -07:00
Samantha Doherty
5791697bb0 Oops; tiny mistake in IE7 addressee stylin. 2011-05-31 12:48:59 -04:00
Samantha Doherty
dddb6185f3 Last bit of style cleanup for addressees and mobile profile. 2011-05-31 12:42:28 -04:00
Samantha Doherty
a026608953 Only use mobile doctype on actual mobile devices. 2011-05-31 12:14:26 -04:00
Evan Prodromou
ac55efeecf Don't show empty addressees in noticelistitem 2011-05-30 16:20:52 -04:00
Evan Prodromou
412adfb587 Merge branch '1.0.x' into testing 2011-05-30 15:37:46 -04:00
Evan Prodromou
d544c78276 correctly get profile for scope in apitimelinementions 2011-05-30 15:29:18 -04:00
Evan Prodromou
650af0a271 get the correct context for apitimelinementions 2011-05-30 15:09:42 -04:00
Evan Prodromou
d44000077d use ReplyNoticeStream for mentions API 2011-05-30 11:22:52 -04:00
Evan Prodromou
5a9d969f22 use ReplyNoticeStream for replies page 2011-05-30 11:22:36 -04:00
Evan Prodromou
0dbdcf2936 Merge branch 'master' into 1.0.x 2011-05-30 11:18:34 -04:00
Evan Prodromou
19b965d991 Merge branch 'master' into testing 2011-05-30 11:18:22 -04:00
Evan Prodromou
cb4f271002 test to check that Bookmark related links are appearing correctly 2011-05-30 10:04:25 -04:00
Evan Prodromou
9167ba8d2d ActivityImporter catches thrown exceptions by plugins and marks entry done 2011-05-30 09:57:49 -04:00
Evan Prodromou
97debbab68 use integer iterator for childNodes in ActivityUtils::getLinks() 2011-05-30 09:57:11 -04:00
Samantha Doherty
1264db7f78 A little more style fixing for MobileProfile. 2011-05-27 12:07:24 -04:00
Samantha Doherty
70f01b2b34 Remove privacy checkbox replacement from Mobile Profile. 2011-05-27 11:50:49 -04:00
Evan Prodromou
aca6338d50 Merge branch '1.0.x' into testing 2011-05-27 11:25:55 -04:00
Evan Prodromou
d7a16929b9 Set the current user on API calls 2011-05-25 14:01:22 -04:00
Evan Prodromou
a838891c0e set the current user in api actions 2011-05-25 13:04:35 -04:00
Evan Prodromou
32f47004df get correct profile for friends timeline 2011-05-25 12:51:21 -04:00
Samantha Doherty
ba55d4d010 First batch of IE fixes. 2011-05-24 12:56:49 -04:00
Evan Prodromou
b34e267e53 Merge branch '1.0.x' into testing 
Conflicts:
	plugins/EmailRegistration/scripts/cancelemailregistration.php
 2011-05-23 18:20:18 -04:00
Evan Prodromou
fd847c29c5 Make emailregistration more invitation-friendly 2011-05-23 17:45:41 -04:00
Evan Prodromou
c85eeb868e note converted user id on registration 2011-05-23 17:25:00 -04:00
Evan Prodromou
b0b8d36439 registered_user_id can be null 2011-05-23 17:23:54 -04:00
Evan Prodromou
cb283be071 Add registered_user_id column to invitation 
It's valuable for us to know which, if any, invitations have been converted.
 2011-05-23 16:40:48 -04:00
Evan Prodromou
cb090ab48d increment alpha version revision 2011-05-23 12:37:29 -04:00
Evan Prodromou
86a7889012 render question description in QnA plugin 2011-05-23 12:33:16 -04:00
Evan Prodromou
f1772b75d5 render question description in QnA plugin 2011-05-23 12:30:34 -04:00
Evan Prodromou
3f3babbcf2 Merge remote-tracking branch 'origin/1.0.x' into 1.0.x 2011-05-23 12:29:08 -04:00
Siebrand Mazeland
def0483c5e Small change to kick syntax highlighter into shape. 2011-05-20 16:58:02 +02:00
Siebrand Mazeland
4aaba2d5f4 Superfluous whitespace removed. 2011-05-20 16:57:21 +02:00
Siebrand Mazeland
e48c26e156 Update translator documentation, i18n and L10n. 2011-05-20 16:57:05 +02:00
Siebrand Mazeland
3501ad6c77 Add FIXME for missing i18n. 2011-05-20 16:56:12 +02:00
Siebrand Mazeland
1d1a929718 Update translator documentation and L10n. 2011-05-20 16:03:53 +02:00
Evan Prodromou
5a86900a34 minor alpha version for i18n build errors 2011-05-20 06:09:37 -07:00
Evan Prodromou
9c4c2c710f remove stray newlines that were causing problems with the build 2011-05-20 06:08:42 -07:00
Evan Prodromou
c2f735a84e rev to alpha3 2011-05-20 06:03:36 -07:00
Evan Prodromou
b9f8e6e8cc fail quickly if we can't find a for DomainStatusNetwork 2011-05-19 15:30:38 -04:00
Samantha Doherty
1a165a5636 Interim style update for mobile profile. 2011-05-18 14:36:05 -04:00
Samantha Doherty
fbc5de3268 Add missing li tags in settings and admin menus. 2011-05-18 12:13:34 -04:00
Samantha Doherty
2a0dc2291d Toggle to show and hide local nav. 2011-05-18 11:08:31 -04:00
Samantha Doherty
e3acf5b72b Remove primary nav and notice form overrides, and extra notice forms, from MobileProfile. 2011-05-18 10:13:06 -04:00
Samantha Doherty
4549d36862 Change addressees arrow from hardcoded to CSS. 2011-05-18 09:49:01 -04:00
Samantha Doherty
0f5aab8cd5 Small syntax fix for inline reply placeholder. 2011-05-18 09:23:55 -04:00
Zach Copley
73251c7629 Script to cancel an email registration 2011-05-16 13:37:55 -07:00
Zach Copley
4718063a78 Script to cancel an email registration 2011-05-16 13:25:26 -07:00