Commit Graph

4618 Commits

Author SHA1 Message Date
Zach Copley
0e2d9432b5 Fix parameratized static function call so it works in PHP 5.2 2011-08-29 11:17:59 -07:00
Zach Copley
8665969890 Move conversation id output to statusnet-specific section 2011-08-27 19:01:02 -07:00
Zach Copley
552cbb3370 Revert "add conversation ID to notice output"
This reverts commit 00be58829c.

I already added this with commit e8d45a46
2011-08-27 18:55:51 -07:00
Zach Copley
500ec79e39 Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x
* '1.0.x' of gitorious.org:statusnet/mainline:
  add conversation ID to notice output
  For fave count, don't use distinct
  Static -> static
  allow posting to groups through atompub
2011-08-27 18:47:19 -07:00
Zach Copley
eaaa978d20 Set site profile after creating initial user during installation 2011-08-27 16:02:00 -07:00
Evan Prodromou
00be58829c add conversation ID to notice output 2011-08-27 18:49:10 -04:00
Zach Copley
e26d3b0ede Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x
* '1.0.x' of gitorious.org:statusnet/mainline:
  Issue #546: enable case-insensitive searching in MySQL
  remove more groupnav
  remove group nav
  shorter title for tag cloud section on groups
  remove group nav
  move pending queue to sidebar
  Move group logo edit from object nav to block actions
  Show blocked users from group in section
2011-08-27 14:27:15 -07:00
Zach Copley
e565477e3f Merge branch 'singleuser-profile' into 1.0.x
* singleuser-profile:
  * Allow setting single user site profile * Fix site profile array munging
  Add "Single User" to installer's site profile form
2011-08-27 14:26:57 -07:00
Zach Copley
7f5080d5e3 * Allow setting single user site profile
* Fix site profile array munging
2011-08-27 14:25:12 -07:00
Evan Prodromou
acc4df9edd shorter title for tag cloud section on groups 2011-08-27 16:08:01 -04:00
Evan Prodromou
d4bfe77f1c remove group nav 2011-08-27 16:06:45 -04:00
Evan Prodromou
804c343a9f move pending queue to sidebar 2011-08-27 16:05:58 -04:00
Evan Prodromou
ffd387e2dd Move group logo edit from object nav to block actions 2011-08-27 15:50:56 -04:00
Evan Prodromou
330af9991f Show blocked users from group in section 2011-08-27 15:46:05 -04:00
Evan Prodromou
725524c667 Take members and group off of group nav 2011-08-27 15:21:54 -04:00
Evan Prodromou
6ae214afb6 move edit choice to group profile block 2011-08-27 15:10:47 -04:00
Evan Prodromou
8501ddf0ee don't use fetchAll() for profile lists ever 2011-08-27 13:34:14 -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
dd5da6c9e8 Move common nav stuff to GroupAction 2011-08-27 11:28:32 -04:00
Evan Prodromou
507fd9bd69 upgrade version to beta3 2011-08-27 09:42:02 -04:00
Evan Prodromou
95abad5abb attachment notice section uses explicit joinAdd() 2011-08-27 09:38:46 -04:00
Zach Copley
af97bc896e Make site profiles work 2011-08-26 21:10:24 -07: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
Samantha Doherty
8c84637612 Move header search before nav in the HTML; give it a unique ID. 2011-08-25 22:29:11 -04: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
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
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
94503a50fd Don't prefill for each conversation 2011-08-25 12:41:25 -04:00
Evan Prodromou
1cab702df9 add source class to notice list items 2011-08-25 12:19:22 -04:00
Evan Prodromou
3fbcba40a6 Don't show large image if it's not available 2011-08-25 11:37:15 -04:00
Evan Prodromou
a053d96bf2 Better list-unwrapping in MoreMenu 2011-08-23 00:32:46 -04:00
Evan Prodromou
5e61ec5e01 avoid producing notices for last element in MoreMenu 2011-08-22 23:53:34 -04:00
Evan Prodromou
0022bb8110 fix calls to staticGet() to avoid problems with default args 2011-08-22 18:06:06 -04:00
Evan Prodromou
7c6399a51a Remove now-unused statusnet.ini 2011-08-22 18:03:05 -04:00
Evan Prodromou
2f1751568a pre-fill repeats of notices 2011-08-22 12:39:37 -04:00
Evan Prodromou
d3399e93e8 use listGet() for ConversationNoticeStream 2011-08-22 12:25:04 -04:00
Evan Prodromou
0a17e7cf9f Merge remote-tracking branch 'gitorious/1.0.x' into 1.0.x
Conflicts:
	classes/Memcached_DataObject.php
2011-08-22 11:25:13 -04:00
Siebrand Mazeland
5d557a2656 Add translator documentation.
Whitespace updates.
2011-08-19 18:13:25 +02:00
Siebrand Mazeland
b1ff67a55e Add translator documentation.
L10n updates.
Whitespace updates.
2011-08-19 18:11:31 +02:00
Zach Copley
76c48a7099 Fix syntax err 2011-08-18 18:17:38 -07:00
Evan Prodromou
ff656a8b3a Merge remote-tracking branch 'gitorious/1.0.x' into 1.0.x 2011-08-18 17:27:55 -07:00
Siebrand Mazeland
edd8045375 Message tweaks and elaborations as well as translator documentation tweaks. Based on comments by OsamaK. 2011-08-18 15:11:10 +02:00
Evan Prodromou
827b13a2a4 Merge remote-tracking branch 'gitorious/1.0.x' into 1.0.x 2011-08-16 15:59:06 -04:00
Siebrand Mazeland
0a420fd7d0 More list... 2011-08-15 16:06:35 +02:00
Siebrand Mazeland
6f386b2f8b Update translator documentation. 2011-08-15 15:50:36 +02:00