eliseuamaro/gnu-social
1
0
Fork 0
forked from GNUsocial/gnu-social
Code Issues Pull Requests Releases Wiki Activity
14,767 Commits 8 Branches 3 Tags 310 MiB
806f7d439a
Commit Graph

4826 Commits

Author SHA1 Message Date
Brion Vibber
1b25b75b53 Use older-style top reply form when replying from old-school conversation tree view (labeled with .old-school class on one of its parent nodes). 2011-09-26 12:54:33 -07:00
Siebrand Mazeland
c9c8c9ffdc Remove punctuation in e-mail subject. Spotted by OsamaK. 2011-09-26 00:10:34 +02:00
Evan Prodromou
8e04dce947 Old-school settings page 
A page to set or remove old-school settings.
 2011-09-24 10:14:45 -04:00
Evan Prodromou
ea1a11a087 site-wide option to enable old-school settings 2011-09-24 09:46:13 -04:00
Evan Prodromou
ae0b4d49c7 optional conversation tree view 2011-09-24 09:29:12 -04:00
Evan Prodromou
61a3ccf2bf users can choose to just see nicknames in streams 2011-09-24 07:19:52 -04:00
Zach Copley
4c91dc4546 Use array_merge instead of array_replace (same effect, and array_merge works with PHP versions < 5.3) 
fixes http://status.net/open-source/issues/3393
 2011-09-22 12:51:24 -07:00
Samantha Doherty
bcb0709401 Only load theme-specific IE stylesheets if they exist. 2011-09-22 09:22:08 -04:00
Evan Prodromou
d214d4533c don't cause an error on non-user profile in api 2011-09-21 17:15:55 -04:00
Evan Prodromou
7d64d8c78c Merge commit 'refs/merge-requests/165' of git://gitorious.org/statusnet/mainline into merge-requests/165 
Conflicts:
	lib/noticelist.php
 2011-09-21 15:33:52 -04:00
Evan Prodromou
12588b1cf7 Merge commit 'refs/merge-requests/166' of git://gitorious.org/statusnet/mainline into merge-requests/166 2011-09-21 15:24:17 -04:00
Evan Prodromou
ad726a15de Use an event to signal that IM settings are available 
Rather than enumerating available classes, define an event that sets a
flag indicating that there's an IM plugin available. Implemented in
implugin.php, so all IM plugins that use that class should
work. Others can hook the event, too.
 2011-09-21 15:15:59 -04:00
Evan Prodromou
c48cdc7d50 Merge commit 'refs/merge-requests/169' of git://gitorious.org/statusnet/mainline into merge-requests/169 2011-09-21 15:09:05 -04:00
Evan Prodromou
1817b25dfc Update the version info for 1.1.x 2011-09-21 10:11:23 -04:00
Ciaran Gultnieks
084bb851aa Make im confirmation codes work instead of sending an invalid URL 2011-09-21 12:25:12 +01:00
Evan Prodromou
4c9dc2530b Update documentation for 1.0.0rc1 2011-09-20 16:05:00 -04:00
Evan Prodromou
6e166b2418 don't show group tagcloud in high-performance mode 2011-09-20 14:04:09 -04:00
Evan Prodromou
081d4edbf5 fallback theme 2011-09-20 12:32:49 -04:00
Evan Prodromou
2d30ed73f3 don't try to add publictagcloud to menu if it's not there 2011-09-19 22:01:28 -04:00
Evan Prodromou
223b806a81 make performance optimization off by default 2011-09-19 22:01:13 -04:00
Evan Prodromou
ddf166e144 setting to turn off expensive queries 2011-09-19 21:55:11 -04:00
Luke Fitzgerald
1f7f0690b3 Correct ImPlugin to XmppPlugin 2011-09-20 02:45:02 +01:00
Luke Fitzgerald
c99e469c5e Show IM configuration page if XMPP, IRC or MSN plugins are enabled 2011-09-20 02:40:15 +01:00
Evan Prodromou
a5518ce35e move more routes around from most specific to least 2011-09-19 19:21:59 -04:00
Evan Prodromou
e2cc7f550a move some routes around to make more specific stuff first 2011-09-18 19:31:29 -04:00
Evan Prodromou
e79cd6eac0 show remote groups correctly in groupsnav 2011-09-18 19:28:56 -04:00
Evan Prodromou
ffe5702dc3 Move more specific routes ahead of more general routes 
A lot of API routes have versions with or without params. I moved the
ones with params up so they match correctly.
 2011-09-18 19:20:55 -04:00
Evan Prodromou
48625da04b Automatically add or drop fulltext indexes 2011-09-18 18:28:44 -04:00
Evan Prodromou
3eaa3234f9 Drop fulltext indexes that aren't used in new def 2011-09-18 17:54:48 -04:00
Evan Prodromou
951601633b better handling of tagged notice streams 2011-09-18 12:33:35 -04:00
Evan Prodromou
13e1fab919 be more careful with returned table def for schema 2011-09-18 10:59:01 -04:00
Evan Prodromou
4d09d3c680 Merge branch 'master' of gitorious.org:statusnet/mainline 2011-09-17 17:00:49 -04:00
Evan Prodromou
945bdf649b show correct favorites link 2011-09-17 17:00:30 -04:00
Zach Copley
2d6b4497a4 Fix undefined variable 2011-09-17 13:34:08 -07:00
Evan Prodromou
467b840c44 move OMB-specific remote login button to OMB Plugin 2011-09-17 15:08:38 -04:00
Evan Prodromou
fc3d52c120 disable routes that aren't available in single-user mode 2011-09-17 14:37:19 -04:00
Evan Prodromou
ce84555a50 upgrade to beta4 2011-09-16 15:28:11 -04:00
Zach Copley
dcbf2f6871 Better error handling when the email subsystem isn't working. The 
installer was dying trying to send a confirmation email to the initial
user.
 2011-09-15 16:58:28 -07:00
Zach Copley
0bd26ed3f0 Store a list of all paths the router knows about (backward compatibility with Net_URL_Mapper) 2011-09-15 16:58:12 -07:00
Evan Prodromou
7c03a50947 exact match for paths 2011-09-15 09:54:25 -04:00
Evan Prodromou
7c57aab44e change category on urlmapper.php 2011-09-15 09:51:33 -04:00
Evan Prodromou
601573a8a9 don't forget to add qstring to static paths 2011-09-14 16:13:54 -04:00
Evan Prodromou
f6f147c0db with new URLMapper, cached router takes more memory, time than re-generating 2011-09-14 12:41:54 -04:00
Evan Prodromou
a4240db48f Deal with default param patterns more effectively 2011-09-14 12:27:20 -04:00
Evan Prodromou
11f2a3d551 Merge branch '1.0.x' into nummedout 2011-09-14 12:20:37 -04:00
Evan Prodromou
15ae1cddfe two useful functions for profiling 2011-09-14 12:19:29 -04:00
Evan Prodromou
40924842f4 new URLMapper without Net_URL_Mapper 2011-09-14 12:15:56 -04:00
Brion Vibber
8454b1fbad Fix for schema upgrade issue when primary keys change; fixes upgrade direct from 0.8.x 
Previously we were failing to update the primary key during ensureTable(), which could lead to failures when updating some tables (eg queue_item where we changed keys, and the addition of an autoincrement column failed because it conflicted with the old key).
Now if the key is different, we remove the old key at the start and add the new key at the end of the ALTER TABLE.

Not tested on PostgreSQL -- someone please check whether the alter table 'DROP CONSTRAINT PRIMARY KEY' bit works or if it needs to pull a special name for the key.
On MySQL, dropping uses alter table's 'DROP PRIMARY KEY' special case.
 2011-09-08 13:03:22 -07:00
Antonin Kral
ab4f4dbab4 add Connection: close when sending redirect 2011-09-08 11:45:34 +02:00
Jean Baptiste Favre
65bf58be80 Fix a UI typo which appear when using $config['site']['indent'] = null 
Add whitespace after _('Repeated by') as it's done in showNoticeSource function

Typo only appear when minifying HTML and not in normal mode because of TAB inserted.
 2011-09-04 21:44:18 +02:00
Zach Copley
c585a43d6f Remove activity:actor and deprecation warning from Atom Activity Streams serialization 2011-08-31 13:09:52 -07:00
Evan Prodromou
9f75131082 check for 'post' verb in microapps by default 2011-08-31 13:08:25 -07:00
Siebrand Mazeland
c421a43b71 Update translator documentation. 2011-08-30 11:23:05 +02:00
Siebrand Mazeland
1b69be23c4 Remove superfluous whitespace. 2011-08-30 11:22:04 +02:00
Siebrand Mazeland
7e5b4b6e9f Remove superfluous whitespace. 2011-08-30 11:20:29 +02:00
Siebrand Mazeland
537125e7c6 Update translator documentation. 2011-08-30 11:19:29 +02:00
Siebrand Mazeland
82e1716656 Remove superfluous whitespace. 2011-08-30 11:06:28 +02:00
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
Evan Prodromou
632ed129eb Merge remote-tracking branch 'gitorious/1.0.x' into 1.0.x 2011-08-08 12:01:48 -04:00
Evan Prodromou
e09310ffb7 Cache the repeat_of query for noticelists 2011-08-08 10:51:13 -04:00
Evan Prodromou
0c762dde42 pre-fill all notices in conversations on the page 2011-08-08 10:39:45 -04:00
Evan Prodromou
8b32ac85d8 Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x 2011-08-05 10:42:42 -04:00
Evan Prodromou
0502e1d737 Properly structure X-XSS-Protection header 2011-08-05 10:42:18 -04:00
Evan Prodromou
7ce2b3c756 change 140-char limit to unlimited by default 2011-08-03 12:50:12 -04:00
Evan Prodromou
16042387a0 pre-fill the addressees of notices in a list 2011-08-03 00:59:09 -04:00
Evan Prodromou
ba6235a446 Get faves in Notice and pre-fill 2011-08-03 00:04:18 -04:00
Evan Prodromou
dfbdd481fa Pre-fill Notice attachments 2011-08-02 23:12:21 -04:00
Evan Prodromou
9cab0958f5 use Notice::attachments() to get attachments for a notice 2011-08-02 18:22:06 -04:00
Evan Prodromou
d918ee95f4 pre-fetch groups for notices 2011-08-02 18:13:56 -04:00
Evan Prodromou
dc690459f5 1.0.0beta2 2011-08-02 15:12:27 -04:00
Evan Prodromou
513c54fa89 Merge branch 'master' into 1.0.x 
Conflicts:
	lib/common.php
 2011-08-02 15:04:14 -04:00
Evan Prodromou
6ce8134471 New release because I'm stupid 2011-08-02 14:40:23 -04:00
Evan Prodromou
edb3f704b9 correctly include UTF-8 alphanum chars in tags 2011-08-02 14:03:12 -04:00
Evan Prodromou
10ce44c297 cleanse tags of non-tag characters when canonicalizing 2011-08-02 13:49:00 -04:00
Evan Prodromou
f6a7335ccd Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x 2011-08-02 13:13:10 -04:00
Evan Prodromou
58d798b607 Change NoticeList::prefill() to a static function 2011-08-02 12:01:41 -04:00
Evan Prodromou
06e2422517 pre-fill avatars for Profiles in a notice list 2011-08-02 11:54:27 -04:00
Evan Prodromou
5a132dbef0 correct pagination for noticelist 2011-08-02 11:22:37 -04:00
Zach Copley
b925eeecde Fix errors thrown by code trying to broadcast profiles via OMB when the OMB plugin isn't installed 2011-08-02 01:15:30 -07:00
Evan Prodromou
b9cabd45de Move prefill call to noticelist class 2011-08-01 16:43:44 -04:00
Evan Prodromou
874f1db389 Pre-fill profiles in notice streams 2011-08-01 14:51:59 -04:00
Evan Prodromou
e0238e7c17 Update version number 2011-08-01 11:15:49 -04:00
Brion Vibber
fcc4bbde19 Fix a glitch on AtomPub posting for micro-apps -- hook wasn't returning the new notice back to the calling code. 2011-07-26 12:19:33 -07:00
Evan Prodromou
0ec3047e0c Move AtomPubClient to its own module 2011-07-25 23:15:32 -04:00
Evan Prodromou
f726df9748 check explicitly for ActivityObject in microappplugin 2011-07-20 11:39:51 -04:00
Evan Prodromou
0ad7411343 Make process*() functions return existing or new notice 2011-07-20 11:33:28 -04:00
Evan Prodromou
383f14c781 Try to get only immediate children (again) 2011-07-19 16:38:58 -04:00
Evan Prodromou
c86f0ffa2f Avoid slurping objects recursively in activity parsing 2011-07-19 16:18:29 -04:00
Evan Prodromou
22b565a937 special case for parsing embedded activities in SHARE verb 2011-07-19 16:02:28 -04:00
Evan Prodromou
4a6f576478 'type' => 'objectType' for embedded activities 2011-07-18 17:42:28 -04:00
Evan Prodromou
d277f343ca Encode repeats as share activities 2011-07-18 17:06:03 -04:00
Evan Prodromou
e274ec4900 Merge branch 'testing' into 1.0.x 2011-07-18 10:45:32 -04:00
Evan Prodromou
98064e6336 Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x 2011-07-15 17:46:19 -04:00
Zach Copley
6f0bd73e6c Squashed commit of the following: 
Move OMB to a plugin

commit 75d21f00246bcc56d7f854936be1e28395e079a2
Merge: cea0199 d594d07
Author: Zach Copley <zach@status.net>
Date:   Fri Jul 15 11:16:54 2011 -0700

    Merge branch 'kill-omb2' of gitorious.org:~zcopley/statusnet/zcopleys-clone into kill-omb2

    * 'kill-omb2' of gitorious.org:~zcopley/statusnet/zcopleys-clone:
      Fix paths
      Oops, I left out the ability to authorize a token in ApiStatusNetOAuthDataStore
      Some odds and ends
      Remove omb stuff from queuemanager defaults
      Add check to make sure we're not untagging an OMB profile to OMB plugin
      Move some more subscription stuff and peopletag checks to OMB plugin
      Move some OMB-specific unsubscribe stuff to OMB plugin
      Finish removing libomb from core extlibs
      Fix more conflicts
      Fix queuing/queuehandling
      Move some stuff around; fix references
      Fix conflicts
      Move OMB-specific files to OMB plugin
      Move some stuff around; fix references
      Add OMB plugin README and rm references to OMB in mail StatusNet README
      Update paths
      Fix define
      Basic plugin finished
      Move OMB-specific files to OMB plugin
      Remove OMB stuff from router

commit cea019967f343042ebaea14b7bbb0d54289bcc1a
Author: Zach Copley <zach@status.net>
Date:   Wed Jul 13 14:38:40 2011 -0700

    Fix paths

commit d412aa3c0ea0e21e65a72a16c7b9edd64ff373e1
Author: Zach Copley <zach@status.net>
Date:   Tue Jul 12 18:17:06 2011 -0700

    Oops, I left out the ability to authorize a token in ApiStatusNetOAuthDataStore

commit b459c9f10ac283d6e774ef13f3293fc8a6948143
Author: Zach Copley <zach@status.net>
Date:   Wed Jul 6 19:02:08 2011 -0700

    Some odds and ends

commit 895cfbfce58ffb3a05beebf48a90c549e00f1cce
Author: Zach Copley <zach@status.net>
Date:   Wed Jul 6 19:01:23 2011 -0700

    Remove omb stuff from queuemanager defaults

commit b41b9e994f291ff83afb2460d9b37aee8ec1ec2b
Author: Zach Copley <zach@status.net>
Date:   Wed Jul 6 18:46:44 2011 -0700

    Add check to make sure we're not untagging an OMB profile to OMB plugin

commit 94374d26ddd428dac8e4cd4541fd56db748c248b
Author: Zach Copley <zach@status.net>
Date:   Wed Jul 6 18:34:20 2011 -0700

    Move some more subscription stuff and peopletag checks to OMB plugin

commit b91043b7820d5cd8b0ba4e9ee2a9d03c99248f11
Author: Zach Copley <zach@status.net>
Date:   Wed Jul 6 16:37:25 2011 -0700

    Move some OMB-specific unsubscribe stuff to OMB plugin

commit d9430fe52975d9497b4a0d3d54da35b222e207ad
Author: Zach Copley <zach@status.net>
Date:   Wed Jul 6 15:26:30 2011 -0700

    Finish removing libomb from core extlibs

commit bb6257eb85cc7ba392e91468c01503f51faeb989
Author: Zach Copley <zach@status.net>
Date:   Wed Jul 13 12:47:32 2011 -0700

    Fix more conflicts

commit 3c760d0a4b4a083ae5fca2530d22aad5f4a9fdae
Author: Zach Copley <zach@status.net>
Date:   Tue Jul 5 15:49:22 2011 -0700

    Fix queuing/queuehandling

commit ed635fa0c20e150673709c04ecc7f285d12e0ce2
Author: Zach Copley <zach@status.net>
Date:   Tue Jul 5 15:29:35 2011 -0700

    Move some stuff around; fix references

commit cbc553a147941cad16e205a6b66ab4b32a5e3d3d
Author: Zach Copley <zach@status.net>
Date:   Wed Jul 13 12:46:05 2011 -0700

    Fix conflicts

commit 5d77c81f75b57f5d5357d6b46d503650a4b3225d
Author: Zach Copley <zach@status.net>
Date:   Thu Jun 30 19:10:38 2011 -0700

    Move OMB-specific files to OMB plugin

commit 2ed051dbce0ce9b44723b14922026849c39ed603
Author: Zach Copley <zach@status.net>
Date:   Tue Jul 5 15:29:35 2011 -0700

    Move some stuff around; fix references

commit 8809b5e35b1aacb67d70ae3e55a43003b6f591b7
Author: Zach Copley <zach@status.net>
Date:   Tue Jul 5 15:28:59 2011 -0700

    Add OMB plugin README and rm references to OMB in mail StatusNet README

commit 35ced4067c1915baca0b3e184f9533a91a951d2d
Author: Zach Copley <zach@status.net>
Date:   Thu Jun 30 23:50:09 2011 -0700

    Update paths

commit 0ee5bafbce95fc9b8db98c1e828d33d26d08bc73
Author: Zach Copley <zach@status.net>
Date:   Thu Jun 30 23:38:03 2011 -0700

    Fix define

commit e309dd22ffb9087d7fcf9180ede4f531dbd88c3c
Author: Zach Copley <zach@status.net>
Date:   Thu Jun 30 23:30:43 2011 -0700

    Basic plugin finished

commit 00f1e930f27e080b04d1e82952f7886c84e01d97
Author: Zach Copley <zach@status.net>
Date:   Thu Jun 30 19:10:38 2011 -0700

    Move OMB-specific files to OMB plugin

commit 39dcd031a79b49da0b4fe25f1594d2e406b5eb65
Author: Zach Copley <zach@status.net>
Date:   Thu Jun 30 19:10:01 2011 -0700

    Remove OMB stuff from router

commit d594d071be1ec42518dd5465db61e01e7e8ec036
Author: Zach Copley <zach@status.net>
Date:   Wed Jul 13 14:38:40 2011 -0700

    Fix paths

commit 48c1064b4b50e89cf51d2cab388f708f60601247
Author: Zach Copley <zach@status.net>
Date:   Tue Jul 12 18:17:06 2011 -0700

    Oops, I left out the ability to authorize a token in ApiStatusNetOAuthDataStore

commit 1e1168978f38c31dbf0206b3493b2b6dcbe61589
Author: Zach Copley <zach@status.net>
Date:   Wed Jul 6 19:02:08 2011 -0700

    Some odds and ends

commit ac43af2b497d8b9286c49a9469a1dff950e41650
Author: Zach Copley <zach@status.net>
Date:   Wed Jul 6 19:01:23 2011 -0700

    Remove omb stuff from queuemanager defaults

commit 2471af2f8800515a3db544b3a186a18f3e8a43af
Author: Zach Copley <zach@status.net>
Date:   Wed Jul 6 18:46:44 2011 -0700

    Add check to make sure we're not untagging an OMB profile to OMB plugin

commit df974646459ac6d5d97a40d008f1aab66f998226
Author: Zach Copley <zach@status.net>
Date:   Wed Jul 6 18:34:20 2011 -0700

    Move some more subscription stuff and peopletag checks to OMB plugin

commit 8a1427b759e791c14a7a7a22128ba05f0b4b6d12
Author: Zach Copley <zach@status.net>
Date:   Wed Jul 6 16:37:25 2011 -0700

    Move some OMB-specific unsubscribe stuff to OMB plugin

commit bd24220dbb5170af22ea0dea8a3062e6d1aeb6a2
Author: Zach Copley <zach@status.net>
Date:   Wed Jul 6 15:26:30 2011 -0700

    Finish removing libomb from core extlibs

commit 4c3c6f1fabb0f2c92635ccc5e8f38db2293f5456
Author: Zach Copley <zach@status.net>
Date:   Wed Jul 13 12:47:32 2011 -0700

    Fix more conflicts

commit db44deefd731a412685c5669c4c6fa69833de922
Author: Zach Copley <zach@status.net>
Date:   Tue Jul 5 15:49:22 2011 -0700

    Fix queuing/queuehandling

commit ea2d84d2f3d518950d3aa1956ddc8f3a25ca55f3
Author: Zach Copley <zach@status.net>
Date:   Tue Jul 5 15:29:35 2011 -0700

    Move some stuff around; fix references

commit 8ac3e010444b41bd9a78766f5e37e49dff023b45
Author: Zach Copley <zach@status.net>
Date:   Wed Jul 13 12:46:05 2011 -0700

    Fix conflicts

commit 0aad6e10e3637b3189a87b42c24c1d6de1b346bc
Author: Zach Copley <zach@status.net>
Date:   Thu Jun 30 19:10:38 2011 -0700

    Move OMB-specific files to OMB plugin

commit d982d7076c5cb28c7b8e4b1dde8d07d7e58e278f
Author: Zach Copley <zach@status.net>
Date:   Tue Jul 5 15:29:35 2011 -0700

    Move some stuff around; fix references

commit 4b9d39c93562ff4c45c37c940013e8b78197dec1
Author: Zach Copley <zach@status.net>
Date:   Tue Jul 5 15:28:59 2011 -0700

    Add OMB plugin README and rm references to OMB in mail StatusNet README

commit dab0fb6647a85e6835298496d7127a398b6b9293
Author: Zach Copley <zach@status.net>
Date:   Thu Jun 30 23:50:09 2011 -0700

    Update paths

commit 2cb73dac8ad971f1545dcf6ba57746c777e232ef
Author: Zach Copley <zach@status.net>
Date:   Thu Jun 30 23:38:03 2011 -0700

    Fix define

commit 6f226b18a059f175b1bdd3abcb8cb95eedc22ee7
Author: Zach Copley <zach@status.net>
Date:   Thu Jun 30 23:30:43 2011 -0700

    Basic plugin finished

commit 7be304beaa0f39755c3978e0b852fde768950da4
Author: Zach Copley <zach@status.net>
Date:   Thu Jun 30 19:10:38 2011 -0700

    Move OMB-specific files to OMB plugin

commit 5b30da01cfa2802d6e7a4a4a4f39b8043c54f472
Author: Zach Copley <zach@status.net>
Date:   Thu Jun 30 19:10:01 2011 -0700

    Remove OMB stuff from router
 2011-07-15 12:13:57 -07:00
Evan Prodromou
c579bcae7b conversation API 2011-07-15 12:49:52 -04:00
Evan Prodromou
dc7099aa5a ArrayWrapper::fetchAll() shortcut 2011-07-14 14:40:57 -04:00
Evan Prodromou
18fe1ac524 Revert "Revert "use Notice::multiGet() for NoticeStream::getStreamByIds()"" 
This reverts commit b1c12648f0.
 2011-07-14 13:15:28 -04:00
Evan Prodromou
b1c12648f0 Revert "use Notice::multiGet() for NoticeStream::getStreamByIds()" 
This reverts commit 9ab0a6f760.
 2011-07-14 13:07:34 -04:00
Evan Prodromou
1280a9345f use Notice::fetchAll() in ConversationNoticeStream 2011-07-14 12:54:07 -04:00
Evan Prodromou
9ab0a6f760 use Notice::multiGet() for NoticeStream::getStreamByIds() 2011-07-14 12:03:33 -04:00
Shashi Gowda
efb7d28d83 Fix problems in joinAdd with xampp 
Xampp ships with a different version of DB_DataObject PEAR package that
cannot do joins using objects correctly. This patch fixes the problem
 2011-07-09 06:26:46 +05:30
Evan Prodromou
41c2102d0b Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x 2011-07-08 10:18:16 -04:00
Zach Copley
969a558339 Change a few things around for CORS header output 2011-07-07 17:19:59 -07:00
Zach Copley
cb183359e2 Merge commit 'refs/merge-requests/157' of git://gitorious.org/statusnet/mainline into merge-requests/157 2011-07-07 15:58:28 -07:00
Evan Prodromou
f6e929d61c beta1 2011-07-07 13:12:34 -04:00
Evan Prodromou
12e0f89155 don't show see-all if less than hard max 2011-07-07 10:58:44 -04:00
Evan Prodromou
749804f8cb ListsNav is a MoreMenu 2011-07-07 10:42:31 -04:00
Evan Prodromou
feb53619cf Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x 
Conflicts:
	js/util.min.js
 2011-07-07 10:27:54 -04:00
Evan Prodromou
1598050f54 Show more menu items when you click More 
I added the necessary JavaScript to show more menu items when you click More.
 2011-07-07 10:26:07 -04:00
Evan Prodromou
1c917ac28f start making more menu work 2011-07-06 18:40:02 -04:00
Evan Prodromou
74f8c51358 correctly output richer nav IDs 2011-07-06 11:19:47 -04:00
Evan Prodromou
eb430f9cb3 don't add empty classes to menu items 2011-07-06 11:18:53 -04:00
Evan Prodromou
663bc35390 GroupsNav uses new Menu class functionality 2011-07-06 11:10:26 -04:00
Evan Prodromou
0e07124a1e make Menu class more functional 2011-07-06 11:10:08 -04:00
Evan Prodromou
97d77a7c75 Revert "add a 'more' button for groups menu" 
This reverts commit 3226f2bef6.
 2011-07-06 10:17:22 -04:00
Zach Copley
038ee13e79 Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x 2011-07-05 17:30:01 -07:00
Zach Copley
7150c54a3f Fix invite button for public sites 2011-07-05 17:27:11 -07:00
Evan Prodromou
3226f2bef6 add a 'more' button for groups menu 2011-07-05 19:20:44 -04:00
Evan Prodromou
7e9c17bd15 make the default scope depend on site/private 2011-07-01 21:50:04 -04:00
flyingmana
3c47d158f4 make cors header deactivatable 2011-06-29 22:39:33 +02:00
Evan Prodromou
13d479bc18 stop sending OMB by default 2011-06-27 13:02:32 -04:00
Evan Prodromou
b25e957be5 correct const for ActivityStreamJSONDocument::CONTENT_TYPE 2011-06-23 11:39:08 -04:00
Evan Prodromou
fadc4df039 use application/stream+json for Activity Streams 2011-06-23 11:24:37 -04:00
Evan Prodromou
83a8cac961 Merge branch '1.0.x' into testing 2011-06-22 17:21:20 -04:00
Evan Prodromou
e5d8fd6857 Add Activity Streams feeds to export data 2011-06-22 17:09:04 -04:00
Evan Prodromou
0f53c07f56 Merge branch '1.0.x' into testing 2011-06-21 11:33:18 -04:00
Evan Prodromou
9f785f6734 Fix addressees when drop-down for a single user is used 2011-06-21 11:32:26 -04:00
Evan Prodromou
f078c19f09 Merge branch '1.0.x' into testing 2011-06-20 12:23:16 -04:00
Evan Prodromou
01996b1a46 Merge remote-tracking branch 'evan/blogplugin' into newblogplugin 2011-06-20 09:34:32 -04:00
Evan Prodromou
8104b1f766 Merge branch '1.0.x' into testing 2011-06-20 09:13:42 -04:00
Evan Prodromou
ab98458399 push regex pattern for UUID to that class 2011-06-20 01:11:08 -04:00
Siebrand Mazeland
26a92b2801 Hopefully fix TRANS message not getting picked up by xgettext. 2011-06-19 11:45:37 +02:00
Siebrand Mazeland
c2ab4af804 Fix incorrect tag (missing colon). 2011-06-19 11:30:35 +02:00
Siebrand Mazeland
173d20e1f9 L10n updates. 2011-06-17 22:36:24 +02:00
Evan Prodromou
e43a6241cb pass nickname into mail_send_sms_notice_address() 2011-06-14 11:33:52 -04:00
Zach Copley
e1ac64f2cb Add current class to selected menu items 2011-06-09 19:29:19 -04:00
Zach Copley
36d619480a Rip out user, group and site design customization code 
Squashed commit of the following:

commit 0bcfb6535115ec0a11669420f8689aeedc417bc8
Author: Zach Copley <zach@status.net>
Date:   Thu Jun 9 15:51:47 2011 -0400

    Remove design-related stuff from the API

commit 88da010256fbcaee1ff01d9507ea47d3225f2825
Author: Zach Copley <zach@status.net>
Date:   Thu Jun 9 15:40:16 2011 -0400

    Mop up misc design related code

commit 11958b064745b797b4c9f9f4b7e8f65e4c82ce83
Author: Zach Copley <zach@status.net>
Date:   Thu Jun 9 15:21:00 2011 -0400

    Remove Design DB_DataObject class and references to it in schema

commit f8540594728ce6ba4697eb21657ccb897a9fc127
Author: Zach Copley <zach@status.net>
Date:   Thu Jun 9 13:15:54 2011 -0400

    Remove design-related actions and widgets

commit ddf7b4d425b88b58956b8be06047d2a3e0560bd2
Author: Zach Copley <zach@status.net>
Date:   Thu Jun 9 13:10:57 2011 -0400

    Remove navigation / routing to design settings actions

commit e3f280f8780d99168edf37ef766956f281e9c5da
Author: Zach Copley <zach@status.net>
Date:   Thu Jun 9 13:03:09 2011 -0400

    CurrentUserDesignAction -> Action

commit 6780b1a07e1375a7fa0fd48c8bf3109d9a12e33e
Author: Zach Copley <zach@status.net>
Date:   Thu Jun 9 12:54:22 2011 -0400

    * GroupDesignAction -> GroupAction (new base class for group actions)

commit 2136377e895db274709a1d486f377f13946ccfd6
Author: Zach Copley <zach@status.net>
Date:   Thu Jun 9 12:36:40 2011 -0400

    OwnerDesignAction -> Action
 2011-06-09 16:20:19 -04:00
Evan Prodromou
a10edb3183 Merge branch 'testing' into 1.0.x 
Conflicts:
	plugins/Directory/locale/mk/LC_MESSAGES/Directory.po
	plugins/Directory/locale/tl/LC_MESSAGES/Directory.po
 2011-06-07 16:04:49 -04:00
Zach Copley
895447f3dc Upgrade anti-framing, anti-clickjacking code 2011-06-06 06:08:17 +00:00
Siebrand Mazeland
3dcdf2ef03 Update translator documentation. 2011-06-05 11:12:34 +02:00
Evan Prodromou
f4e17c1bdf Merge branch '1.0.x' into testing 2011-05-31 17:16:45 -04:00
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
Evan Prodromou
ac55efeecf Don't show empty addressees in noticelistitem 2011-05-30 16:20:52 -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
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
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
b34e267e53 Merge branch '1.0.x' into testing 
Conflicts:
	plugins/EmailRegistration/scripts/cancelemailregistration.php
 2011-05-23 18:20:18 -04:00