]>
git.mxchange.org Git - quix0rs-gnu-social.git/log
Samantha Doherty [Fri, 19 Aug 2011 19:43:56 +0000 (15:43 -0400)]
Reinstate labels for oauth application info.
Samantha Doherty [Fri, 19 Aug 2011 17:02:32 +0000 (13:02 -0400)]
Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x
Samantha Doherty [Fri, 19 Aug 2011 17:00:22 +0000 (13:00 -0400)]
Couple quick improvements for neo-blue theme.
Siebrand Mazeland [Fri, 19 Aug 2011 16:13:25 +0000 (18:13 +0200)]
Add translator documentation.
Whitespace updates.
Siebrand Mazeland [Fri, 19 Aug 2011 16:11:31 +0000 (18:11 +0200)]
Add translator documentation.
L10n updates.
Whitespace updates.
Siebrand Mazeland [Fri, 19 Aug 2011 15:39:39 +0000 (17:39 +0200)]
Add translator documentation.
L10n/i18n fixes.
Whitespace updates.
Siebrand Mazeland [Fri, 19 Aug 2011 15:38:43 +0000 (17:38 +0200)]
Add translator documentation.
Fix incorrect i18n.
Whitespace updates.
Siebrand Mazeland [Fri, 19 Aug 2011 15:13:15 +0000 (17:13 +0200)]
Add translator documentation.
doxygen fixes.
Siebrand Mazeland [Fri, 19 Aug 2011 15:11:29 +0000 (17:11 +0200)]
Add translator documentation.
Siebrand Mazeland [Fri, 19 Aug 2011 15:09:44 +0000 (17:09 +0200)]
Remove i18n fix from previous commit: this is a debug log entry.
Siebrand Mazeland [Fri, 19 Aug 2011 15:06:03 +0000 (17:06 +0200)]
Whitespace updates (including leading tabs to spaces).
Fixed i18n.
Siebrand Mazeland [Fri, 19 Aug 2011 14:50:31 +0000 (16:50 +0200)]
Fix broken translator documentation because "// TRANS: " is not exactly in the line above the _m() method call.
Whitespace updates.
Siebrand Mazeland [Fri, 19 Aug 2011 14:46:28 +0000 (16:46 +0200)]
Update/add translator documentation.
Fix i18n domain where needed.
Whitespace updates.
Siebrand Mazeland [Fri, 19 Aug 2011 14:40:45 +0000 (16:40 +0200)]
Fix and add translator documentation
Fix i18n domain where needed.
Whitespace updates.
Zach Copley [Fri, 19 Aug 2011 01:17:38 +0000 (18:17 -0700)]
Fix syntax err
Siebrand Mazeland [Thu, 18 Aug 2011 13:11:10 +0000 (15:11 +0200)]
Message tweaks and elaborations as well as translator documentation tweaks. Based on comments by OsamaK.
Siebrand Mazeland [Thu, 18 Aug 2011 12:21:43 +0000 (14:21 +0200)]
Simplify message.
Siebrand Mazeland [Tue, 16 Aug 2011 16:04:56 +0000 (18:04 +0200)]
Fix awkward attempt at i18n.
Siebrand Mazeland [Mon, 15 Aug 2011 14:32:26 +0000 (16:32 +0200)]
Localisation updates from http://translatewiki.net.
Siebrand Mazeland [Mon, 15 Aug 2011 14:18:21 +0000 (16:18 +0200)]
Fix punctuation.
Siebrand Mazeland [Mon, 15 Aug 2011 14:06:35 +0000 (16:06 +0200)]
More list...
Siebrand Mazeland [Mon, 15 Aug 2011 14:04:06 +0000 (16:04 +0200)]
Fix incorrect documentation.
Siebrand Mazeland [Mon, 15 Aug 2011 14:03:24 +0000 (16:03 +0200)]
tag -> list
Siebrand Mazeland [Mon, 15 Aug 2011 13:57:36 +0000 (15:57 +0200)]
Change "stream" to "timeline" for consistency.
Siebrand Mazeland [Mon, 15 Aug 2011 13:50:36 +0000 (15:50 +0200)]
Update translator documentation.
Evan Prodromou [Fri, 5 Aug 2011 14:42:42 +0000 (10:42 -0400)]
Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x
Evan Prodromou [Fri, 5 Aug 2011 14:42:18 +0000 (10:42 -0400)]
Properly structure X-XSS-Protection header
Zach Copley [Thu, 4 Aug 2011 19:06:57 +0000 (12:06 -0700)]
Fix syntax err
Evan Prodromou [Wed, 3 Aug 2011 16:50:12 +0000 (12:50 -0400)]
change 140-char limit to unlimited by default
Evan Prodromou [Wed, 3 Aug 2011 14:42:50 +0000 (10:42 -0400)]
Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x
Zach Copley [Wed, 3 Aug 2011 09:46:29 +0000 (09:46 +0000)]
Adjustment to the simulation script so I can use my own word list for test notices
Evan Prodromou [Wed, 3 Aug 2011 04:59:09 +0000 (00:59 -0400)]
pre-fill the addressees of notices in a list
Evan Prodromou [Wed, 3 Aug 2011 04:04:18 +0000 (00:04 -0400)]
Get faves in Notice and pre-fill
Evan Prodromou [Wed, 3 Aug 2011 03:12:21 +0000 (23:12 -0400)]
Pre-fill Notice attachments
Evan Prodromou [Wed, 3 Aug 2011 03:11:41 +0000 (23:11 -0400)]
Remove unused File::getAttachments()
Evan Prodromou [Tue, 2 Aug 2011 22:22:06 +0000 (18:22 -0400)]
use Notice::attachments() to get attachments for a notice
Evan Prodromou [Tue, 2 Aug 2011 22:13:56 +0000 (18:13 -0400)]
pre-fetch groups for notices
Evan Prodromou [Tue, 2 Aug 2011 22:12:46 +0000 (18:12 -0400)]
only do a db call if need to fetch some in listGet()
Evan Prodromou [Tue, 2 Aug 2011 21:20:51 +0000 (17:20 -0400)]
add listGet() method
Evan Prodromou [Tue, 2 Aug 2011 19:12:27 +0000 (15:12 -0400)]
1.0.0beta2
Evan Prodromou [Tue, 2 Aug 2011 19:04:14 +0000 (15:04 -0400)]
Merge branch 'master' into 1.0.x
Conflicts:
lib/common.php
Evan Prodromou [Tue, 2 Aug 2011 18:40:23 +0000 (14:40 -0400)]
New release because I'm stupid
Evan Prodromou [Tue, 2 Aug 2011 18:03:12 +0000 (14:03 -0400)]
correctly include UTF-8 alphanum chars in tags
Evan Prodromou [Tue, 2 Aug 2011 17:49:27 +0000 (13:49 -0400)]
encode values when inserting into MeteorUpdater JS
Evan Prodromou [Tue, 2 Aug 2011 17:49:00 +0000 (13:49 -0400)]
cleanse tags of non-tag characters when canonicalizing
Evan Prodromou [Tue, 2 Aug 2011 17:14:11 +0000 (13:14 -0400)]
remove some debugging stuff in Profile::fillAvatars()
Evan Prodromou [Tue, 2 Aug 2011 17:13:10 +0000 (13:13 -0400)]
Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x
Evan Prodromou [Tue, 2 Aug 2011 16:14:55 +0000 (12:14 -0400)]
reduce the number of calls to get profile groups
Evan Prodromou [Tue, 2 Aug 2011 16:01:41 +0000 (12:01 -0400)]
Change NoticeList::prefill() to a static function
Evan Prodromou [Tue, 2 Aug 2011 15:54:27 +0000 (11:54 -0400)]
pre-fill avatars for Profiles in a notice list
Evan Prodromou [Tue, 2 Aug 2011 15:54:10 +0000 (11:54 -0400)]
properly cache nulls for pivotGet()
Evan Prodromou [Tue, 2 Aug 2011 15:22:37 +0000 (11:22 -0400)]
correct pagination for noticelist
Evan Prodromou [Tue, 2 Aug 2011 15:15:20 +0000 (11:15 -0400)]
define Reply::pkeyGet()
Evan Prodromou [Tue, 2 Aug 2011 15:09:30 +0000 (11:09 -0400)]
use pkeyGet() instead of getReplies() checking addressee scope
Evan Prodromou [Tue, 2 Aug 2011 14:58:25 +0000 (10:58 -0400)]
remove debugging statement in Memcached_DataObject::multiGet()
Evan Prodromou [Tue, 2 Aug 2011 14:46:29 +0000 (10:46 -0400)]
New method Memcached_DataObject::pivotGet()
This method lets you get all the objects with a given variable key and
another set of "fixed" keys. A good example is getting all the avatars
for a notice list; the avatar size stays the same, but the IDs change.
Since it's very similar to multiGet(), I refactored that function to
use pivotGet().
And, yes, I realize these are kind of hard to follow.
Zach Copley [Tue, 2 Aug 2011 08:17:56 +0000 (01:17 -0700)]
Work improving the interface of the Event micro-app
Squashed commit of the following:
commit
da50b6b0223fcbc42cf45d01a138f08930917e71
Author: Zach Copley <zach@status.net>
Date: Tue Aug 2 00:35:36 2011 -0700
If end time < start time reset the end time selection
commit
6dfc35579e8e4bd0af9d85fc46799bcc462c68b1
Author: Zach Copley <zach@status.net>
Date: Mon Aug 1 23:55:10 2011 -0700
Populate event dates with sensible defaults
commit
0bc8d726706cfdc0830687e7f40e941e61691191
Author: Zach Copley <zach@status.net>
Date: Mon Aug 1 23:29:46 2011 -0700
Recalculate times if user changes start or end date
commit
6a92a31429b4eb6f442eaf850d59dcc5b121e57f
Author: Zach Copley <zach@status.net>
Date: Mon Aug 1 23:03:46 2011 -0700
* Better date/time display
* Localize date and time display for user
commit
2bf344068a0eb6e3ed90efacbf33c85e7ee5edf7
Author: Zach Copley <zach@status.net>
Date: Mon Aug 1 15:56:21 2011 -0700
Reselect the end time after timelist update
commit
62fd0620eb5fcc94c240c0fc0b304aa17509de8d
Author: Zach Copley <zach@status.net>
Date: Mon Aug 1 14:40:14 2011 -0700
Fix bug in which end time was not properly in sync with start time + 30mins
commit
3c6bcfb2d962f3677082c468a29480d2a1813d73
Author: Zach Copley <zach@status.net>
Date: Mon Aug 1 12:37:00 2011 -0700
Pass exact URL of the timelist action to event.js
commit
efc74841c5b588cdae686630a1b4c1448e5d742b
Author: Zach Copley <zach@status.net>
Date: Mon Aug 1 11:20:45 2011 -0700
Add Ajax error handling to new event action
commit
3085f4b3ed93bb930bff1bc475309b4d473ffc83
Author: Zach Copley <zach@status.net>
Date: Fri Jul 22 01:18:13 2011 -0700
Ajaxify event end-time selector
commit
8025c1d368d8f862b666702bfab08daf633a34ea
Author: Zach Copley <zach@status.net>
Date: Thu Jul 21 21:58:43 2011 -0700
Remove dead code
commit
5fbfff47297dea609a07d67a81d430f97f6698ef
Merge:
bcd845d 3c926af
Author: Zach Copley <zach@status.net>
Date: Thu Jul 21 15:21:58 2011 -0700
Merge branch 'eventjs' of gitorious.org:~zcopley/statusnet/zcopleys-clone into eventjs
* 'eventjs' of gitorious.org:~zcopley/statusnet/zcopleys-clone:
Populate timei selection dropdowns and better CSS (thanks Sammy!)
Event start/end as dropdowns
Nothing to see here move along
Don't allow user to set crazy start and end dates
New event dates shouldn't ever be in the past, eh?
Move event microapp JavaScript into included .js file
Conflicts:
plugins/Event/event.js
plugins/Event/eventform.php
commit
bcd845dc56c147c4ba10eedd43cc7aa799bc6a9a
Author: Zach Copley <zach@status.net>
Date: Thu Jul 21 15:11:19 2011 -0700
Move the helper functions for filling the start/end times to their own class
commit
d246d39c4afbffb1e76cd561ab61f15dafd8a988
Author: Zach Copley <zach@status.net>
Date: Wed Jul 20 18:50:38 2011 -0700
Populate time selection dropdowns and better CSS (thanks Sammy!)
commit
0778533fef5500db79e40664c5b56aa7d9cc8357
Author: Zach Copley <zach@status.net>
Date: Wed Jul 20 15:54:27 2011 -0700
Event start/end as dropdowns
commit
e800053fdf2cb12fc1f2eac72762d07571647aa8
Author: Zach Copley <zach@status.net>
Date: Tue Jul 19 14:12:01 2011 -0700
Nothing to see here move along
commit
a85949b9cc4f3b5bb387785d4b7a717e9d952752
Author: Zach Copley <zach@status.net>
Date: Mon Jul 18 17:48:30 2011 -0700
Don't allow user to set crazy start and end dates
commit
87d1301ce8aa8877e753440dd52166bf857b29f3
Author: Zach Copley <zach@status.net>
Date: Sun Jul 17 22:31:24 2011 -0700
New event dates shouldn't ever be in the past, eh?
commit
7e05aa5fdc02bfec6107bcf8c748627216d51405
Author: Zach Copley <zach@status.net>
Date: Fri Jul 15 15:36:17 2011 -0700
Move event microapp JavaScript into included .js file
commit
3c926af287f80ee389b5bc8a4c1dcc5e0904a14c
Author: Zach Copley <zach@status.net>
Date: Wed Jul 20 18:50:38 2011 -0700
Populate time selection dropdowns and better CSS (thanks Sammy!)
commit
af09c57d5132dba2a6a3e76974e38fdde6422c45
Author: Zach Copley <zach@status.net>
Date: Wed Jul 20 15:54:27 2011 -0700
Event start/end as dropdowns
commit
b585215ed7deb4dc9d4bbc065d36b6e3f819d710
Author: Zach Copley <zach@status.net>
Date: Tue Jul 19 14:12:01 2011 -0700
Nothing to see here move along
commit
e1d30ae9b80eded4ed7ef6bdd7515da64ae344de
Author: Zach Copley <zach@status.net>
Date: Mon Jul 18 17:48:30 2011 -0700
Don't allow user to set crazy start and end dates
commit
ad7c99f021980b867f369066b4413bdb1e882986
Author: Zach Copley <zach@status.net>
Date: Sun Jul 17 22:31:24 2011 -0700
New event dates shouldn't ever be in the past, eh?
commit
4741f0a327e10e67fc04e2b816ed56351e38b4fa
Author: Zach Copley <zach@status.net>
Date: Fri Jul 15 15:36:17 2011 -0700
Move event microapp JavaScript into included .js file
Zach Copley [Tue, 2 Aug 2011 08:15:30 +0000 (01:15 -0700)]
Fix errors thrown by code trying to broadcast profiles via OMB when the OMB plugin isn't installed
Evan Prodromou [Mon, 1 Aug 2011 20:59:43 +0000 (16:59 -0400)]
reduce the number of queries required to get a notice's groups
Evan Prodromou [Mon, 1 Aug 2011 20:43:44 +0000 (16:43 -0400)]
Move prefill call to noticelist class
Evan Prodromou [Mon, 1 Aug 2011 19:18:29 +0000 (15:18 -0400)]
use multiGet() for a profile's groups
Evan Prodromou [Mon, 1 Aug 2011 18:51:59 +0000 (14:51 -0400)]
Pre-fill profiles in notice streams
Evan Prodromou [Mon, 1 Aug 2011 15:15:49 +0000 (11:15 -0400)]
Update version number
Evan Prodromou [Mon, 1 Aug 2011 15:14:20 +0000 (11:14 -0400)]
update README
Evan Prodromou [Sat, 30 Jul 2011 12:17:57 +0000 (08:17 -0400)]
Fix Bug#3260 for 1.0.x
Evan Prodromou [Sat, 30 Jul 2011 12:10:24 +0000 (08:10 -0400)]
Merge branch 'master' into 1.0.x
Conflicts:
plugins/Realtime/RealtimePlugin.php
Evan Prodromou [Sat, 30 Jul 2011 11:49:05 +0000 (07:49 -0400)]
Merge branch '0.9.x'
Evan Prodromou [Sat, 30 Jul 2011 11:48:27 +0000 (07:48 -0400)]
Merge remote-tracking branch 'gitorious/0.9.x'
Evan Prodromou [Sat, 30 Jul 2011 11:45:07 +0000 (07:45 -0400)]
json_encode() realtime arguments (closes Bug#3260)
Brion Vibber [Tue, 26 Jul 2011 22:57:29 +0000 (15:57 -0700)]
Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x
Brion Vibber [Tue, 26 Jul 2011 22:56:04 +0000 (15:56 -0700)]
issue #3261 -- fix generic exception handler to pass through generic exception info, as already done for exceptions happening within an action. This fixes things like addPlugin() failures being hidden with a generic message.
If any email issues remain, they should be treated specifically if special treatment is needed.
Samantha Doherty [Tue, 26 Jul 2011 19:36:20 +0000 (15:36 -0400)]
Quick fix for hidden threaded-replies issue in Chrome.
Samantha Doherty [Tue, 26 Jul 2011 19:21:40 +0000 (15:21 -0400)]
Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x
Samantha Doherty [Tue, 26 Jul 2011 19:20:51 +0000 (15:20 -0400)]
Just a few wee themefixes.
Samantha Doherty [Tue, 26 Jul 2011 19:19:50 +0000 (15:19 -0400)]
Fix install page layout.
Brion Vibber [Tue, 26 Jul 2011 19:19:33 +0000 (12:19 -0700)]
Fix a glitch on AtomPub posting for micro-apps -- hook wasn't returning the new notice back to the calling code.
Evan Prodromou [Tue, 26 Jul 2011 18:52:05 +0000 (11:52 -0700)]
Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x
Evan Prodromou [Tue, 26 Jul 2011 03:15:32 +0000 (23:15 -0400)]
Move AtomPubClient to its own module
Siebrand Mazeland [Thu, 21 Jul 2011 12:49:16 +0000 (14:49 +0200)]
Localisation updates from http://translatewiki.net.
Evan Prodromou [Wed, 20 Jul 2011 15:53:47 +0000 (11:53 -0400)]
reverse order of defaults and options in Notice::saveNew()
Evan Prodromou [Wed, 20 Jul 2011 15:47:55 +0000 (11:47 -0400)]
fix call to Notice::saveNew() in Ostatus_profile::processShare()
Evan Prodromou [Wed, 20 Jul 2011 15:42:17 +0000 (11:42 -0400)]
change array add to array merge
Evan Prodromou [Wed, 20 Jul 2011 15:39:51 +0000 (11:39 -0400)]
check explicitly for ActivityObject in microappplugin
Evan Prodromou [Wed, 20 Jul 2011 15:33:28 +0000 (11:33 -0400)]
Make process*() functions return existing or new notice
Evan Prodromou [Wed, 20 Jul 2011 15:13:25 +0000 (11:13 -0400)]
ID is a string
Evan Prodromou [Wed, 20 Jul 2011 15:11:05 +0000 (11:11 -0400)]
better ID from shared activities
Evan Prodromou [Tue, 19 Jul 2011 20:47:37 +0000 (16:47 -0400)]
ensure a shared item's author element
Evan Prodromou [Tue, 19 Jul 2011 20:38:58 +0000 (16:38 -0400)]
Try to get only immediate children (again)
Evan Prodromou [Tue, 19 Jul 2011 20:18:29 +0000 (16:18 -0400)]
Avoid slurping objects recursively in activity parsing
Evan Prodromou [Tue, 19 Jul 2011 20:02:28 +0000 (16:02 -0400)]
special case for parsing embedded activities in SHARE verb
Evan Prodromou [Tue, 19 Jul 2011 19:20:06 +0000 (15:20 -0400)]
handle incoming SHARE verbs
Evan Prodromou [Mon, 18 Jul 2011 21:42:28 +0000 (17:42 -0400)]
'type' => 'objectType' for embedded activities
Evan Prodromou [Mon, 18 Jul 2011 21:06:03 +0000 (17:06 -0400)]
Encode repeats as share activities
Evan Prodromou [Mon, 18 Jul 2011 19:50:08 +0000 (15:50 -0400)]
Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x
Evan Prodromou [Mon, 18 Jul 2011 14:45:32 +0000 (10:45 -0400)]
Merge branch 'testing' into 1.0.x
Evan Prodromou [Mon, 18 Jul 2011 14:45:15 +0000 (10:45 -0400)]
Merge remote-tracking branch 'origin/1.0.x' into 1.0.x
Evan Prodromou [Mon, 18 Jul 2011 14:44:35 +0000 (10:44 -0400)]
Merge branch 'testing' into 1.0.x
Evan Prodromou [Fri, 15 Jul 2011 21:46:19 +0000 (17:46 -0400)]
Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x
Zach Copley [Fri, 15 Jul 2011 19:13:57 +0000 (12:13 -0700)]
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
Evan Prodromou [Fri, 15 Jul 2011 16:55:43 +0000 (12:55 -0400)]
add conversation feed data