GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity
15,639 Commits 8 Branches 4 Tags 310 MiB
3ef8322b03
Commit Graph

15639 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Evan Prodromou
330af9991f Show blocked users from group in section 2011-08-27 15:46:05 -04:00
Zach Copley
32fa6dd7a2 Fix logging level in log msg 2011-08-27 12:42:09 -07:00
Evan Prodromou
a14224d687 Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x 2011-08-27 15:22:14 -04:00
Evan Prodromou
725524c667 Take members and group off of group nav 2011-08-27 15:21:54 -04:00
Zach Copley
be321242d3 Add "Single User" to installer's site profile form 2011-08-27 12:14:41 -07:00
Jordan Conway
9bf815be0d fixed typo http://status.net/open-source/issues/3289 2011-08-27 12:11:00 -07:00
Evan Prodromou
6ae214afb6 move edit choice to group profile block 2011-08-27 15:10:47 -04:00
Evan Prodromou
ebaf5a972e add a return to the error path for new events 2011-08-27 14:56:02 -04:00
Evan Prodromou
8501ddf0ee don't use fetchAll() for profile lists ever 2011-08-27 13:34:14 -04:00
Evan Prodromou
6132bddabc don't use fetchAll() when you've done a query() 2011-08-27 13:14:31 -04:00
Evan Prodromou
f81c1f7554 use an array of profiles rather than a looping cursor for profile lists 2011-08-27 12:53:15 -04:00
Evan Prodromou
01fd24ce6a Make joinAdd() explicit in OStatusPlugin::onStartProfileCompletionSearch() 2011-08-27 12:06:34 -04:00
Evan Prodromou
bce337e7c3 Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x 2011-08-27 11:29:26 -04:00
Evan Prodromou
dd5da6c9e8 Move common nav stuff to GroupAction 2011-08-27 11:28:32 -04:00
Evan Prodromou
817e1507ed Catch missing profile in realtime server 2011-08-27 10:58:11 -04:00
Samantha Doherty
21011cfc92 Don't italicize replies to activity events. 2011-08-27 10:54:19 -04:00
Samantha Doherty
34d9c35885 Remove duplicate icons from base theme. 2011-08-27 10:49:18 -04:00
Evan Prodromou
4f86e05d03 wrap use of repeated element in existence check 2011-08-27 10:02:11 -04:00
Evan Prodromou
507fd9bd69 upgrade version to beta3 2011-08-27 09:42:02 -04:00
Evan Prodromou
c751be1c06 Merge branch '1.0.x' into testing 2011-08-27 09:40:19 -04:00
Evan Prodromou
95abad5abb attachment notice section uses explicit joinAdd() 2011-08-27 09:38:46 -04:00
Samantha Doherty
38eefd1b32 Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x 2011-08-27 07:58:58 -04:00
Samantha Doherty
c2d5c8cd39 A little more theme cleanup. 2011-08-27 07:58:20 -04:00
Zach Copley
af97bc896e Make site profiles work 2011-08-26 21:10:24 -07:00
Zach Copley
a6000f3051 Update install form to include installation profile dropdown 2011-08-26 13:37:04 -07:00
Samantha Doherty
41f06d96d4 Quick fix to make custom site logos work better. 2011-08-26 15:35:00 -04:00
Samantha Doherty
2601b57505 Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x 2011-08-26 12:52:18 -04:00
Samantha Doherty
37bb0e6d20 Style cleanup for ostatus forms. 2011-08-26 12:51:55 -04:00
Evan Prodromou
34a0525b67 Profile uses joinAdd() with explicit arguments 2011-08-26 11:48:40 -04:00
Evan Prodromou
a47c372ac4 explicit join for subscribers to a profile list 2011-08-26 11:39:06 -04:00
Evan Prodromou
f251c2e036 Explicit joins for people tags 2011-08-26 11:38:39 -04:00
Evan Prodromou
04dccad3bb Activity notices on by default 2011-08-26 11:38:05 -04:00
Evan Prodromou
b83af83b82 return links for foreign keys 2011-08-26 11:37:45 -04:00
Samantha Doherty
a3769e4bf9 A few quick general form fixes. 2011-08-26 10:51:51 -04:00
Samantha Doherty
a0514281a0 Style for header search form. 2011-08-25 22:30:09 -04:00
Samantha Doherty
8c84637612 Move header search before nav in the HTML; give it a unique ID. 2011-08-25 22:29:11 -04:00
Zach Copley
5f1ace8c04 * Update copyright in version info 
* add sammyd to contributors
* sort contributors
 2011-08-25 16:33:41 -07:00
Evan Prodromou
c0bae505d9 Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x 2011-08-25 18:03:30 -04:00
Evan Prodromou
44a46de7ff use a form for search 2011-08-25 17:59:27 -04:00
Samantha Doherty
8ea5cd0cac Check for existence of RTL stylesheets; placeholder files for base and neo themes. 2011-08-25 17:48:27 -04:00
Samantha Doherty
2dd13b071c Update DirectionDetector style for 1.0 and move to base stylesheet. 2011-08-25 17:14:13 -04:00
Samantha Doherty
f0443aff1a Style for Activity notices. 2011-08-25 16:24:54 -04:00
Zach Copley
3bdae5aed4 Link in additional stylesheet for RTL languages 2011-08-25 13:12:44 -07:00
Zach Copley
8b9258c0ec Function to test for RTL language 2011-08-25 12:48:36 -07:00
Zach Copley
e8d45a4644 * Add conversation ID to Twitter compatible API 
* Fix formatting of blocking info in JSON API output
 2011-08-25 11:30:07 -07:00
Evan Prodromou
d55a3bf99d Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x 2011-08-25 13:11:28 -04:00
Zach Copley
297d603feb Update activity streams JSON to match spec 
Squashed commit of the following:

commit 0722450267a1d0f4bdc2853f52a85b850329db73
Author: Zach Copley <zach@status.net>
Date:   Thu Aug 25 09:58:29 2011 -0700

    Updgrade activity object json

commit 882ba1dceaba8a0b3ec3513760aa09f68e41f270
Author: Zach Copley <zach@status.net>
Date:   Wed Aug 24 16:30:07 2011 -0700

    Update to the JSON activity serialization document

commit 121e441b314b93e184711c3dcc79ada69d429eba
Author: Zach Copley <zach@status.net>
Date:   Wed Aug 24 15:08:06 2011 -0700

    Output application/json instead of application/stream+json (at least for now)

commit e045e214bffe5e0ddeb0a42555d440b75ae4edde
Author: Zach Copley <zach@status.net>
Date:   Wed Aug 24 15:06:40 2011 -0700

    Update to use latest property names from the JSON activity spec
 2011-08-25 10:01:20 -07:00
Evan Prodromou
654fdf2fa4 Don't try to read the URLs in system notices 2011-08-25 12:59:40 -04:00
Evan Prodromou
94503a50fd Don't prefill for each conversation 2011-08-25 12:41:25 -04:00
Evan Prodromou
1593c97bc1 Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x 2011-08-25 12:34:32 -04:00