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
|
e04ce18a93
|
Merge branch '1.0.x' into testing
|
2011-07-14 12:55:02 -04:00 |
|
Evan Prodromou
|
9145ce4259
|
Merge remote-tracking branch 'gitorious/1.0.x' into 1.0.x
|
2011-07-14 12:54:45 -04:00 |
|
Evan Prodromou
|
1280a9345f
|
use Notice::fetchAll() in ConversationNoticeStream
|
2011-07-14 12:54:07 -04:00 |
|
Evan Prodromou
|
e48ca92914
|
Don't get crud for Notice::repeatStream()
|
2011-07-14 12:53:18 -04:00 |
|
Evan Prodromou
|
9ab0a6f760
|
use Notice::multiGet() for NoticeStream::getStreamByIds()
|
2011-07-14 12:03:33 -04:00 |
|
Evan Prodromou
|
42b11f862a
|
add Notice::multiGet() method
|
2011-07-14 12:02:58 -04:00 |
|
Evan Prodromou
|
75b280b4bb
|
add Memcached_DataObject::multiGet() method
|
2011-07-14 12:02:44 -04:00 |
|
Zach Copley
|
8ba6c8ea87
|
Update admin panel instructions in the TwitterBridge README
|
2011-07-13 23:06:29 +00:00 |
|
Zach Copley
|
37dbaf6c01
|
Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x
|
2011-07-13 23:03:56 +00:00 |
|
Zach Copley
|
9a51caa485
|
Automatically allow admins to use the Twitter admin panel if the TwitterBridge plugin is installed
|
2011-07-13 23:02:52 +00:00 |
|
Samantha Doherty
|
e7bbe6c1b6
|
Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x
|
2011-07-13 18:10:24 -04:00 |
|
Samantha Doherty
|
bf2710e721
|
Couple of quick variations on neo theme.
|
2011-07-13 18:06:54 -04:00 |
|
Samantha Doherty
|
c4590ed8b4
|
Just a couple quick neo theme fixes.
|
2011-07-13 18:06:12 -04:00 |
|
Evan Prodromou
|
362e8b6603
|
make meteor protocol (http or https) configurable
|
2011-07-13 16:55:28 -04:00 |
|
Evan Prodromou
|
58ea000485
|
JavaScript and other changes to make realtime_channel management work
|
2011-07-13 16:10:08 -04:00 |
|
Evan Prodromou
|
3c3ab128b3
|
Actions to keep state for Realtime_channel
|
2011-07-13 14:47:40 -04:00 |
|
Evan Prodromou
|
07796250fd
|
add method Realtime_channel::touch()
|
2011-07-13 13:55:03 -04:00 |
|
Evan Prodromou
|
85ea41ea46
|
better description for Meteor plugin
|
2011-07-13 13:54:39 -04:00 |
|
Evan Prodromou
|
d283aa006e
|
script to garbage-collect old realtime channels
|
2011-07-13 13:23:09 -04:00 |
|
Evan Prodromou
|
7f7cfa5558
|
return value for always-rw in RealtimePlugin
|
2011-07-11 16:08:51 -04:00 |
|
Evan Prodromou
|
15f8beef5f
|
realtime_channel must always be writeable
|
2011-07-11 15:54:10 -04:00 |
|
Evan Prodromou
|
b3f8ab0beb
|
hand-coded fetch for Realtime_channel class
|
2011-07-11 15:52:05 -04:00 |
|
Evan Prodromou
|
235bc84e4d
|
correct SQL function in Realtime_channel::getAllChannels()
|
2011-07-11 14:14:53 -04:00 |
|
Evan Prodromou
|
8187ff6681
|
invert key -> (user, page) mapping in Realtime_channel table
|
2011-07-11 13:53:55 -04:00 |
|
Evan Prodromou
|
5c963cb3b7
|
Memcached_DataObject::pkeyGet() accepts null values
|
2011-07-11 12:40:28 -04:00 |
|
Evan Prodromou
|
641749453d
|
XXX comments to remember to fan-out in realtime distribution
|
2011-07-11 11:33:39 -04:00 |
|
Evan Prodromou
|
a602477a1d
|
Index for (action, arg1, arg2) on Realtime_channel
|
2011-07-11 11:31:59 -04:00 |
|
Evan Prodromou
|
60e0e2b723
|
Fix the syntax for unique keys on Realtime_channel
|
2011-07-11 11:29:05 -04:00 |
|
Evan Prodromou
|
3b039ed2e7
|
Merge branch '1.0.x' into realprivate
|
2011-07-11 11:03:31 -04:00 |
|
Evan Prodromou
|
3b246d643d
|
use Realtime_channel to target channels to users
|
2011-07-11 09:16:16 -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
|
8b957c6581
|
data structure for realtime channels
|
2011-07-08 17:52:07 -04:00 |
|
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 |
|
Evan Prodromou
|
e416f9d28e
|
forgot to cat a bunch of useless separate files when minifying
|
2011-07-08 10:04:31 -04:00 |
|
Zach Copley
|
cd05fc6aee
|
Remove debugging statement
|
2011-07-07 17:23:41 -07: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
|
069d976fab
|
SearchSubMenu is a MoreMenu
|
2011-07-07 12:06:56 -04:00 |
|
Evan Prodromou
|
baaad0dc8b
|
TagSubMenu is a MoreMenu
|
2011-07-07 10:59:00 -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 |
|
Samantha Doherty
|
f0af9f45dd
|
Big round of fixups for base and neo themes.
|
2011-07-06 12:50:42 -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 |
|