Evan Prodromou
59043dca7f
Merge commit 'refs/merge-requests/164' of git://gitorious.org/statusnet/mainline into merge-requests/164
...
Conflicts:
classes/Avatar.php
I ignored the code in Avatar; it's a different patch.
2011-09-21 15:39:44 -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
0d2cf719c7
Merge commit 'refs/merge-requests/170' of git://gitorious.org/statusnet/mainline into merge-requests/170
2011-09-21 15:05:41 -04:00
Evan Prodromou
1014e295ee
bad sprintf format for new follow activity notices
2011-09-21 10:18:16 -04:00
Evan Prodromou
838c3988ee
Change defaults for ActivityPlugin to only log joins and follows
2011-09-21 10:15:34 -04:00
Evan Prodromou
1817b25dfc
Update the version info for 1.1.x
2011-09-21 10:11:23 -04:00
Evan Prodromou
5df47bc659
Merge branch 'testing'
2011-09-21 10:07:20 -04:00
Ciaran Gultnieks
084bb851aa
Make im confirmation codes work instead of sending an invalid URL
2011-09-21 12:25:12 +01:00
Zach Copley
58b9f83a02
Allow repeats to flow through the Twitter bridge
2011-09-21 05:23:47 +00:00
Zach Copley
c9cbc31481
Don't send notices from the ActivityPlugin to Twitter
2011-09-21 02:31:51 +00:00
Zach Copley
b6b13a6bc7
Don't access current user without session
2011-09-21 00:40:27 +00: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
31d0560294
Merge branch 'testing'
2011-09-20 11:08:27 -04:00
Evan Prodromou
4f01bcaf52
Merge remote-tracking branch 'origin/1.0.x' into 1.0.x
2011-09-20 11:07:43 -04:00
Evan Prodromou
ac1ea3e8cf
Remove template plugin
...
I don't think this still works; it's probably a bad idea to leave it in 1.0.x.
2011-09-20 11:06:18 -04:00
Evan Prodromou
bd33036fae
use a dummy notice stream for retweets_of_me under high load
2011-09-19 22:17:40 -04:00
Evan Prodromou
32f7d3edc2
inverted switch for performance on public page
2011-09-19 22:01:47 -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
b44bb472eb
disable public tag cloud on public sites
2011-09-19 19:37:58 -04:00
Evan Prodromou
a5518ce35e
move more routes around from most specific to least
2011-09-19 19:21:59 -04:00
Evan Prodromou
319639a232
hide popular notice section on non-private sites
2011-09-19 16:19:12 -04:00
Evan Prodromou
a28a6d2f72
fixup bad class constant in Notice
2011-09-19 16:11:43 -04:00
Samantha Doherty
771c9ebc20
Stupid typo in my last commit to base display.css.
2011-09-18 22:26:10 -04:00
Evan Prodromou
7f2f333528
Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x
2011-09-18 19:43:55 -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
2c1911bfae
Short-circuit bugs by defining Profile::getProfile()
2011-09-18 19:29:23 -04:00
Evan Prodromou
e79cd6eac0
show remote groups correctly in groupsnav
2011-09-18 19:28:56 -04:00
Evan Prodromou
e8785927a3
log the problem when there's an exception leaving a group
2011-09-18 19:28:44 -04:00
Evan Prodromou
0ee660af23
fix problem with using wrong arg to EndLeaveGroup event
2011-09-18 19:28:17 -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
822cb1482a
right URLs for search subs
2011-09-18 19:20:28 -04:00
Evan Prodromou
0cbb7411a6
Merge branch 'testing' of gitorious.org:statusnet/mainline into testing
2011-09-18 18:34:50 -04:00
Evan Prodromou
0503bcb0e2
Merge branch 'master' into testing
2011-09-18 18:34:33 -04:00
Evan Prodromou
48625da04b
Automatically add or drop fulltext indexes
2011-09-18 18:28:44 -04:00
Evan Prodromou
5b0192a8ac
default search engine is actually LIKE
2011-09-18 18:28:14 -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
e2914189f3
Merge branch 'master' of gitorious.org:statusnet/mainline
2011-09-18 17:33:38 -04:00
Evan Prodromou
cf2457f03f
correct link for apitimelinegroup
2011-09-18 17:33:25 -04:00
Evan Prodromou
bba39c4aaf
reorder routes for ostatus for better matches
2011-09-18 17:32:59 -04:00
Evan Prodromou
52ed4678f3
correct link for searchsubs
2011-09-18 17:32:13 -04:00
Zach Copley
1acb0c227d
Remove fulltext indexes from notice and profile tables. The default
...
for fulltext search is 'like' (MySQLLikeSearch) which doesn't require
them.
2011-09-18 14:28:31 -07:00
