Commit Graph

14362 Commits

Author SHA1 Message Date
Evan Prodromou
435c08a753 add listGet() method 2011-08-02 17:20:51 -04:00
Evan Prodromou
575ecd9f4c Merge branch '1.0.x' into testing 2011-08-02 15:20:00 -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
897e3c87e5 encode values when inserting into MeteorUpdater JS 2011-08-02 13:49:27 -04:00
Evan Prodromou
10ce44c297 cleanse tags of non-tag characters when canonicalizing 2011-08-02 13:49:00 -04:00
Evan Prodromou
5081c56ea4 remove some debugging stuff in Profile::fillAvatars() 2011-08-02 13:14:11 -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
af49545e95 reduce the number of calls to get profile groups 2011-08-02 12:14:55 -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
e05f423bea properly cache nulls for pivotGet() 2011-08-02 11:54:10 -04:00
Evan Prodromou
5a132dbef0 correct pagination for noticelist 2011-08-02 11:22:37 -04:00
Evan Prodromou
14fe22e430 define Reply::pkeyGet() 2011-08-02 11:15:20 -04:00
Evan Prodromou
02880f5a8c use pkeyGet() instead of getReplies() checking addressee scope 2011-08-02 11:09:30 -04:00
Evan Prodromou
9a78d70441 remove debugging statement in Memcached_DataObject::multiGet() 2011-08-02 10:58:25 -04:00
Evan Prodromou
72ed297214 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.
2011-08-02 10:46:29 -04:00
Zach Copley
60a574ef28 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
2011-08-02 01:17:56 -07: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
200e18cd71 reduce the number of queries required to get a notice's groups 2011-08-01 16:59:43 -04:00
Evan Prodromou
b9cabd45de Move prefill call to noticelist class 2011-08-01 16:43:44 -04:00
Evan Prodromou
a3ef80941e use multiGet() for a profile's groups 2011-08-01 15:18:29 -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
Evan Prodromou
d8b9ed07e6 update README 2011-08-01 11:14:20 -04:00
Evan Prodromou
65ca0f911e Merge branch '1.0.x' into testing 2011-07-30 08:18:22 -04:00
Evan Prodromou
e530a0868d Fix Bug#3260 for 1.0.x 2011-07-30 08:17:57 -04:00
Evan Prodromou
44af31deca Merge branch '1.0.x' into testing 2011-07-30 08:10:40 -04:00
Evan Prodromou
87d46e1ae5 Merge branch 'master' into 1.0.x
Conflicts:
	plugins/Realtime/RealtimePlugin.php
2011-07-30 08:10:24 -04:00
Evan Prodromou
25198a8d4c Merge branch 'master' into testing
Conflicts:
	plugins/Realtime/RealtimePlugin.php
2011-07-30 08:08:14 -04:00
Evan Prodromou
afd42611a3 Merge branch '0.9.x' 2011-07-30 07:49:05 -04:00
Evan Prodromou
be376b3b60 Merge remote-tracking branch 'gitorious/0.9.x' 2011-07-30 07:48:27 -04:00
Evan Prodromou
5517741909 json_encode() realtime arguments (closes Bug#3260) 2011-07-30 07:45:07 -04:00
Brion Vibber
11f45e57d9 Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x 2011-07-26 15:57:29 -07:00
Brion Vibber
2967c5c0fa 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.
2011-07-26 15:56:04 -07:00
Samantha Doherty
baf4102da7 Quick fix for hidden threaded-replies issue in Chrome. 2011-07-26 15:36:20 -04:00
Samantha Doherty
4fa286801e Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x 2011-07-26 15:21:40 -04:00
Samantha Doherty
4f50274249 Just a few wee themefixes. 2011-07-26 15:20:51 -04:00
Samantha Doherty
c4163b6bad Fix install page layout. 2011-07-26 15:19:50 -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
8844b373b4 Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x 2011-07-26 11:52:05 -07:00
Evan Prodromou
0ec3047e0c Move AtomPubClient to its own module 2011-07-25 23:15:32 -04:00
Siebrand Mazeland
7fcdc1a9ed Localisation updates from http://translatewiki.net. 2011-07-21 14:49:16 +02:00
Evan Prodromou
d17a30ada4 reverse order of defaults and options in Notice::saveNew() 2011-07-20 11:53:47 -04:00
Evan Prodromou
ebc5d6f676 fix call to Notice::saveNew() in Ostatus_profile::processShare() 2011-07-20 11:47:55 -04:00
Evan Prodromou
e07620a0aa change array add to array merge 2011-07-20 11:42:17 -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