Evan Prodromou
4b7a91bb81
Squashed commit of the following:
...
commit cd43ac412c90722e3b83ec750d9232a2ac2f12c9
Merge: dad72cc
adaf175
Author: Evan Prodromou <evan@status.net>
Date: Mon Jul 9 09:41:05 2012 -0400
Merge commit 'refs/merge-requests/196' of git://gitorious.org/statusnet/mainline into merge-requests/196
commit adaf17552d3ab35d451c00cdb32d87a107e0e56a
Author: Jeremy Pope <jpope@jpope.org>
Date: Thu Jul 5 12:33:06 2012 -0500
fix for XMPP high CPU usage - issue no 3232
commit e573e8ee6690af94259ff8793a84652a139d0662
Author: Jeremy Pope <jpope@jpope.org>
Date: Thu Jul 5 12:30:34 2012 -0500
fix for queuedaemon and imdaemon not being stopped by stopdaemons.sh
2012-07-09 09:43:40 -04:00
Evan Prodromou
78a8eb5b6e
Squashed commit of the following:
...
commit cd43ac412c90722e3b83ec750d9232a2ac2f12c9
Merge: dad72cc
adaf175
Author: Evan Prodromou <evan@status.net>
Date: Mon Jul 9 09:41:05 2012 -0400
Merge commit 'refs/merge-requests/196' of git://gitorious.org/statusnet/mainline into merge-requests/196
commit adaf17552d3ab35d451c00cdb32d87a107e0e56a
Author: Jeremy Pope <jpope@jpope.org>
Date: Thu Jul 5 12:33:06 2012 -0500
fix for XMPP high CPU usage - issue no 3232
commit e573e8ee6690af94259ff8793a84652a139d0662
Author: Jeremy Pope <jpope@jpope.org>
Date: Thu Jul 5 12:30:34 2012 -0500
fix for queuedaemon and imdaemon not being stopped by stopdaemons.sh
2012-07-09 09:43:05 -04:00
Evan Prodromou
dad72cce28
Merge remote-tracking branch 'origin'
2012-07-09 09:33:42 -04:00
Evan Prodromou
c7ad7bce9f
newer sitestream host
2012-07-06 11:11:53 -04:00
Evan Prodromou
0c6ca3ec41
Merge branch '1.1.x'
2012-07-06 10:47:00 -04:00
Evan Prodromou
8cd1bdc686
Remove Jabber stuff from Twitter daemon
2012-07-06 10:46:48 -04:00
Evan Prodromou
d5564fb8d8
Add a trace, too
2012-07-04 15:14:35 -04:00
Evan Prodromou
7e60bb04e5
Add an exception on remote group join
2012-07-04 15:12:08 -04:00
Evan Prodromou
3ffe2e3f03
Correct sprintf() information
2012-07-03 17:33:27 -04:00
Evan Prodromou
88ce08ca82
Merge branch '1.1.x'
2012-07-03 15:38:11 -04:00
Siebrand Mazeland
51b28eda19
Localisation updates from http://translatewiki.net .
2012-06-30 11:10:38 +00:00
Siebrand Mazeland
f2d66082b4
Localisation updates from http://translatewiki.net .
2012-06-24 18:26:18 +00:00
Siebrand Mazeland
707076fca9
Localisation updates from http://translatewiki.net .
2012-06-17 23:26:20 +00:00
Evan Prodromou
dc4a42e600
Log channel info
2012-06-17 10:15:42 -04:00
Evan Prodromou
ec264fcd90
Add some delivery logging
2012-06-17 10:10:52 -04:00
Evan Prodromou
8b98c93e90
Fix end-of-line error
2012-06-17 10:05:57 -04:00
Evan Prodromou
97099e08c5
Merge branch '1.1.x' of gitorious.org:statusnet/mainline into 1.1.x
2012-06-17 09:53:45 -04:00
Evan Prodromou
f5af67ce68
Skip on already-exists error
2012-06-17 09:52:35 -04:00
Siebrand Mazeland
c658ede37c
Localisation updates from http://translatewiki.net .
2012-06-10 23:42:52 +00:00
Siebrand Mazeland
bc733a200f
Localisation updates from http://translatewiki.net .
2012-06-04 15:02:34 +00:00
Siebrand Mazeland
f059977c57
Localisation updates from http://translatewiki.net .
2012-05-26 21:15:30 +00:00
Mikael Nordfeldth
fcb1b115fc
MIME type for jpeg is with an e
2012-05-24 23:24:53 +02:00
Mikael Nordfeldth
bd8178592c
adding the odd but reported Twitter avatar .jpeg file extension
2012-05-24 23:09:56 +02:00
Mikael Nordfeldth
b2a91944bb
retaining compatibility with previous TwitterBridge getMediatype
2012-05-24 23:08:40 +02:00
Mikael Nordfeldth
4c853f8117
Fixes issue #3612 with Twitter avatars that lack extension
2012-05-24 14:31:42 +02:00
Siebrand Mazeland
cd77348852
Localisation updates from http://translatewiki.net .
2012-05-20 11:10:38 +00:00
Evan Prodromou
2c70680b24
Chance to train unknown
2012-05-16 12:26:29 -04:00
Siebrand Mazeland
2e4e2f693d
Localisation updates from http://translatewiki.net .
2012-05-12 18:47:41 +00:00
Siebrand Mazeland
6f557d3654
Localisation updates from http://translatewiki.net .
2012-05-06 17:08:47 +00:00
Evan Prodromou
0fec1872cd
Whoops! Append didn't work
2012-05-04 22:20:47 -04:00
Evan Prodromou
a504d2aee2
Let DB_DataObject find Spam_score
2012-05-04 22:16:46 -04:00
Evan Prodromou
961607bc5d
Ignore non-atom updates links in Webfinger
2012-05-04 12:01:13 -04:00
Evan Prodromou
c5ae53166c
Merge branch '1.1.x' of gitorious.org:statusnet/mainline into 1.1.x
2012-05-04 11:39:55 -04:00
Siebrand Mazeland
eafe507068
Localisation updates from http://translatewiki.net .
2012-05-03 22:13:22 +00:00
Siebrand Mazeland
c7013ceb1a
Localisation updates from http://translatewiki.net .
2012-04-29 23:12:10 +00:00
Evan Prodromou
ab053fe2ca
Don't always make spam_score writeable
2012-04-26 11:59:54 -04:00
Evan Prodromou
ffc2c72bc1
fix a problem with the facebookbridge translation in eu
2012-04-23 21:05:03 -04:00
Siebrand Mazeland
3898500ff9
Localisation updates from http://translatewiki.net .
2012-04-21 10:21:38 +00:00
Evan Prodromou
558e33436c
change script path for new position in plugins/ActivitySpam
2012-04-17 11:57:45 -04:00
Evan Prodromou
7a9777df05
Merge ActivitySpam plugin
2012-04-17 09:02:48 -04:00
Evan Prodromou
20dc5addb7
Fix FacebookBridge es translation
2012-04-16 16:04:31 -04:00
Evan Prodromou
36d724cf03
Merge branch '1.0.x'
2012-04-16 15:49:09 -04:00
Siebrand Mazeland
b2c5b9de52
Localisation updates from http://translatewiki.net .
2012-04-15 12:11:05 +00:00
Siebrand Mazeland
71a9644b35
Localisation updates from http://translatewiki.net .
2012-04-09 01:38:31 +02:00
Evan Prodromou
b2639b723f
add created timestamp
2012-04-02 22:32:47 -04:00
Evan Prodromou
e06bb8ead5
correctly update sites
2012-04-02 22:08:14 -04:00
Evan Prodromou
04ad0838be
Add spam-training, spam-reviewing rights
...
Replaced the check for a moderator role in certain spam-training and
-reviewing points. Make sure modhelpers can check, too.
2012-03-25 13:18:16 -04:00
Siebrand Mazeland
c0b5c16ded
Localisation updates from http://translatewiki.net .
2012-03-11 22:12:34 +01:00
Siebrand Mazeland
3b3671b228
Localisation updates from http://translatewiki.net .
2012-03-11 22:12:10 +01:00
Siebrand Mazeland
855fbfa782
Fix accidental revert by Evan in b4da5f3785
.
2012-03-11 21:46:29 +01:00
Evan Prodromou
b4da5f3785
Merge branch 'master' into 1.0.x
...
Conflicts:
plugins/Blacklist/BlacklistPlugin.php
2012-03-08 06:08:11 -06:00
Siebrand Mazeland
f34a196e83
Localisation updates from http://translatewiki.net .
2012-03-01 17:22:45 +01:00
Siebrand Mazeland
be71f1e4e7
Fix grammar.
2012-02-27 15:56:35 +01:00
Evan Prodromou
aa14a14f86
using wrong rules for facebook replies
2012-02-20 11:29:49 -05:00
Evan Prodromou
183ffce78f
check reply_to flag before sending replies to Facebook
2012-02-20 10:58:56 -05:00
Evan Prodromou
5b6ecef24b
script to gc all feeds
2012-01-27 16:12:54 -05:00
Evan Prodromou
e4085087f1
non-existent poco
2012-01-27 15:32:13 -05:00
Evan Prodromou
d28f726c5c
weird error with SubMirror
2012-01-27 15:27:46 -05:00
Evan Prodromou
d625364354
LOG_ERROR -> LOG_ERR for SubMirror
2012-01-27 15:01:51 -05:00
Evan Prodromou
108d5d8d17
Merge branch 'master' of gitorious.org:statusnet/mainline
2012-01-26 11:04:54 -05:00
Evan Prodromou
f21f09f8b8
Merge commit 'refs/merge-requests/2227' of git://gitorious.org/statusnet/mainline into merge-requests/2227
2012-01-26 11:03:04 -05:00
Evan Prodromou
259a262df4
Merge branch 'master' of gitorious.org:statusnet/mainline
2012-01-21 21:12:53 -05:00
Evan Prodromou
b475c871a4
add displayName and targetUrl to activity JSON
2012-01-21 21:12:20 -05:00
Siebrand Mazeland
cebb565f18
Localisation updates from http://translatewiki.net .
2012-01-20 20:07:45 +01:00
Evan Prodromou
e3f06ee220
Use X-Client header for IP for load-balancers
2012-01-10 10:51:36 -05:00
Evan Prodromou
9092eb5535
throw exception on sphinx search error
2011-12-30 23:09:17 -08:00
Siebrand Mazeland
31305cb743
Localisation updates from http://translatewiki.net .
2011-12-28 14:00:49 +01:00
Siebrand Mazeland
7f257ddb95
Localisation updates from http://translatewiki.net .
2011-12-19 02:02:49 +01:00
Jean Baptiste Favre
a7507e3685
Fix for #3463 . Make InfiniteScroll plugin use config['plugins']['server'] if defined to build ajax-loader.gif URL
2011-12-18 16:19:32 +01:00
Jean Baptiste Favre
8658d9618a
Makes ClientSideShorten loading shorten.js from config['plugins']['server'] if setted. Fix #3528
2011-12-18 15:09:53 +01:00
Jean Baptiste Favre
184290b5cf
Add my name to TwitterBridgePlugin onPluginVersion function
2011-12-18 12:17:28 +01:00
Jean Baptiste Favre
3e0a02f52d
Enhance is_twitter_bound function from file plugins/TwitterBridge/twitter.php to deal with new-style replies from Web UI not using at-mention replies anymore, which caused all replies to be sent to Twitter. Definitely fix #3386
2011-12-18 12:13:42 +01:00
Jean Baptiste Favre
f57a35a916
Fix missing variable in InfiniteScrollPlugin class. Fix issue #3525
2011-12-13 22:09:08 +01:00
Jean Baptiste Favre
ac5e29de5a
Fix precedence issue causing all replies to be sent to Twitter. Fix #3386
2011-12-13 20:30:03 +01:00
Siebrand Mazeland
03657a90e1
Localisation updates from http://translatewiki.net .
2011-12-03 13:09:10 +01:00
Siebrand Mazeland
b4ecb24907
Localisation updates from http://translatewiki.net .
2011-11-12 23:35:01 +01:00
Evan Prodromou
b5e1cf13e6
Merge branch '1.0.x'
2011-11-07 12:36:52 -05:00
Siebrand Mazeland
151ff6beb7
Localisation updates from http://translatewiki.net .
2011-10-29 14:30:42 +02:00
Evan Prodromou
a4ec8bb047
More free email domains
2011-10-25 10:00:19 -04:00
Evan Prodromou
ec20544baf
More free or consumer email domains
2011-10-25 09:42:02 -04:00
Evan Prodromou
053e99733f
add rel=nofollow to bookmark links if needed
2011-10-20 11:47:44 -04:00
Evan Prodromou
e64ae1f03d
Don't start <p> element until we've checked for attachments
2011-10-20 10:57:58 -04:00
Evan Prodromou
d27b7627a5
more robust handling of bad data in offline backup queue handler
2011-10-12 17:03:56 -04:00
Siebrand Mazeland
6120af3901
Localisation updates from http://translatewiki.net .
2011-10-10 15:58:00 +02:00
Evan Prodromou
70827f3379
write all activity files to the feed file
2011-10-07 14:37:09 -04:00
Evan Prodromou
7075214589
dump out activities to directory
2011-10-07 13:56:47 -04:00
Evan Prodromou
7f4b23b8ed
Use string output
2011-10-07 10:30:22 -04:00
Evan Prodromou
0d35673d5a
add version for OfflineBackup
2011-10-07 10:01:44 -04:00
Evan Prodromou
737e23544a
send backup files
2011-10-07 09:36:52 -04:00
Evan Prodromou
d92acda02a
start doing some writing
2011-10-06 17:31:50 -04:00
Evan Prodromou
d37bc805c6
first pass, some files ready
2011-10-05 12:05:05 -04:00
Zach Copley
7dcb27672f
Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x
2011-09-30 19:52:16 +00:00
Zach Copley
c137d69aee
Switch from oohembed to noembed for default oembed provider
2011-09-30 19:51:23 +00:00
Evan Prodromou
1094e7c2c6
Update openid docs
2011-09-30 14:52:51 -04:00
Evan Prodromou
4af466f1a6
Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x
2011-09-30 14:25:06 -04:00
Evan Prodromou
82badb19c7
Move docs menu to site primary menu
2011-09-30 14:24:27 -04:00
Zach Copley
e7ef9e2117
Remove gettext wrapper from log msg
2011-09-30 18:20:22 +00:00
Zach Copley
1d2a3be88e
Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x
2011-09-30 18:15:38 +00:00
Zach Copley
fd62f6b934
Don't throw exception if bookmark has no attachments; log error and render as normal notice instead.
2011-09-30 18:13:25 +00:00
Evan Prodromou
e3c010a870
try to check whether file exists over and over and over
2011-09-30 13:03:42 -04:00
Evan Prodromou
4e5af7513c
50px more for bookmarklet popup
2011-09-30 10:15:40 -04:00
Evan Prodromou
2e8d92dbe9
use the 'top' action for bookmarklet popup
2011-09-30 10:10:15 -04:00
Evan Prodromou
3aad58c37f
Only show some profiles in events
2011-09-30 09:40:15 -04:00
Zach Copley
d438a55434
Fix navigation for SubMirrorPlugin
2011-09-29 20:11:51 +00:00
Samantha Doherty
d51a93ddb9
Quick style for event attendee avatar lists.
2011-09-29 16:00:10 -04:00
Evan Prodromou
699a90f11c
Show Event attendees in mini-list
2011-09-29 15:12:30 -04:00
Evan Prodromou
797e187acb
Merge commit 'refs/merge-requests/174' of git://gitorious.org/statusnet/mainline into merge-requests/174
2011-09-28 16:14:42 -04:00
Scott Sweeny
94b524d6dc
plugins/MobileProfile/MobileProfilePlugin.php: add 'maemo' to recognized devices
2011-09-27 23:54:42 -04:00
Zach Copley
8ca9f33f45
Merge branch 'testing' of gitorious.org:statusnet/mainline into testing
2011-09-27 16:59:43 +00:00
Zach Copley
cd30c94096
Move check for valid access token to the right place
2011-09-27 16:59:10 +00:00
Evan Prodromou
23e02ea76a
Merge branch '1.0.x' into testing
2011-09-27 11:45:24 -04:00
Evan Prodromou
9f954eddc5
remove unsupported hcard action
2011-09-27 11:43:41 -04:00
Zach Copley
ec53e68cf2
Merge branch 'testing' of gitorious.org:statusnet/mainline into testing
2011-09-27 04:33:00 +00:00
Zach Copley
000e5c0c01
Do a better job of saving the original avatar from Facebook
2011-09-27 04:31:41 +00:00
Zach Copley
3b28f226c7
Facebook bridge back in business with new JS-SDK and OAuth 2.0 flow.
...
Might be better to rewrite the login mechanism to use server side flow
now that Facebook provides it.
2011-09-27 04:09:47 +00:00
Evan Prodromou
eb711321c3
Merge branch '1.0.x' into testing
2011-09-26 14:10:43 -04:00
Samantha Doherty
b0ee583270
Tiny layout fix for QnA.
2011-09-26 08:26:38 -04:00
Zach Copley
634fb64c11
Facebook bridge mostly working again with new OAuth 2.0 flow
2011-09-26 05:32:19 +00:00
Siebrand Mazeland
e7dac240ef
Localisation updates from http://translatewiki.net .
2011-09-26 00:01:00 +02:00
Zach Copley
118e84be19
Update to latest Facebook PHP sdk
2011-09-22 15:47:55 -07:00
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
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
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
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
0ee660af23
fix problem with using wrong arg to EndLeaveGroup event
2011-09-18 19:28:17 -04:00
Evan Prodromou
822cb1482a
right URLs for search subs
2011-09-18 19:20:28 -04:00
Evan Prodromou
e2914189f3
Merge branch 'master' of gitorious.org:statusnet/mainline
2011-09-18 17:33:38 -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
116840a80e
Reorder directory router connections / fix regex
2011-09-18 13:35:09 -07:00
Evan Prodromou
dbb7324b25
test for missing profile in ostatus queue handler
2011-09-18 14:36:49 -04:00
Evan Prodromou
2f1953ca25
Correct args for join event
2011-09-18 14:06:35 -04:00
Evan Prodromou
75bdc37b61
Correct args for join event
2011-09-18 14:06:27 -04:00
Evan Prodromou
e43ea4c9f5
fix RealtimePlugin root hack hack
2011-09-18 13:03:12 -04:00
Evan Prodromou
06f19d523a
inverted if() in RealtimePlugin check for tag
2011-09-18 12:52:00 -04:00
Evan Prodromou
915dd9c9b5
Copy-and-paste error in OStatus button output
2011-09-18 12:44:16 -04:00
Evan Prodromou
01ea6a18f9
make activity plugin use its own notice source
2011-09-18 12:40:17 -04:00
Evan Prodromou
3d4ea0a71f
Correct the routes for notice and user sitemaps
2011-09-18 12:14:43 -04:00
Evan Prodromou
7c1d73ed3d
Sitemap plugin no longer forces an index on user.created
2011-09-18 12:07:59 -04:00
Zach Copley
670288e68f
Merge branch 'twitter-bridge-fixes'
...
* twitter-bridge-fixes:
Make sure the session token gets output no matter what (whoops)
Move submit (connect) button to the very bottom
Move license checkbox to the end of the form
Don't allow Twitter registration if site is invite only
2011-09-17 16:33:28 -07:00
Zach Copley
d4ed6db1d8
Make sure the session token gets output no matter what (whoops)
2011-09-17 15:50:13 -07:00
Zach Copley
2df2d4fd1d
Move submit (connect) button to the very bottom
2011-09-17 15:45:55 -07:00
Zach Copley
be95dcf008
Move license checkbox to the end of the form
2011-09-17 15:43:21 -07:00
Evan Prodromou
1040f1346c
Merge branch 'master' of gitorious.org:statusnet/mainline
2011-09-17 18:27:37 -04:00
Evan Prodromou
5c0e8d2a2f
fix link for mobile profile when in singleuser mode
2011-09-17 18:20:08 -04:00
Zach Copley
6c43967e8c
Don't allow Twitter registration if site is invite only
2011-09-17 14:47:35 -07:00
Zach Copley
985f52ce60
Merge branch 'master' of gitorious.org:statusnet/mainline
...
* 'master' of gitorious.org:statusnet/mainline:
problem with remote subscription on groups in OStatus
show correct favorites link
2011-09-17 14:39:26 -07:00
Zach Copley
4467615021
Fix reference to constant
2011-09-17 14:38:47 -07:00
Evan Prodromou
f52d33753e
problem with remote subscription on groups in OStatus
2011-09-17 17:28:01 -04:00
Zach Copley
b34812152d
Don't try to verify URL if the user has left it out when making a new event
2011-09-17 13:36:05 -07:00
Zach Copley
baa17381c0
Change time format to work with older PHP (before 5.3)
2011-09-17 13:29:45 -07:00
Evan Prodromou
467b840c44
move OMB-specific remote login button to OMB Plugin
2011-09-17 15:08:38 -04:00
Evan Prodromou
9f6adb3f52
Merge branch '1.0.x' into testing
2011-09-15 17:06:27 -04:00
Evan Prodromou
6e480d2458
Upgrade 0.9.x bookmarks to 1.0.x
2011-09-15 17:06:05 -04:00
Evan Prodromou
0b1d8762c6
include q as param, not arg for search sub menu
2011-09-15 11:00:27 -04:00
Evan Prodromou
fa18e6365e
add default groupdirectory route
2011-09-14 12:18:22 -04:00
Siebrand Mazeland
16c24b66bb
Remove two incorrect strings for now.
2011-09-11 16:56:33 +02:00
Siebrand Mazeland
83dc51ee79
Localisation updates from http://translatewiki.net .
2011-09-11 16:54:08 +02:00
Evan Prodromou
5eba1030ae
Merge remote-tracking branch 'origin/1.0.x' into 1.0.x
2011-09-08 08:59:16 -04:00
Zach Copley
449451b8e7
* Validate event URL
...
* Remove more debugging statements
2011-09-08 01:14:24 -07:00
Zach Copley
a910d28132
Remove debugging statement
2011-09-08 00:49:58 -07:00
Zach Copley
b991ded816
Re-do the logic for the event micro-app's dropdowns (way trickier than it seems at first blush).
2011-09-08 00:45:56 -07:00
Evan Prodromou
c5d332f40a
move yet-another-rediscover-script to OStatus plugin
2011-09-07 16:56:38 -04:00
Jean Baptiste Favre
e25400b4f2
Fix BitlyUrl plugin.
...
Since Bit.ly changed its API from v2 to v3, BitlyURL plugin doesn't work anymore.
This fix API version issue and also imporve a little plugin performance in removing useless code.
2011-09-03 22:41:46 +02:00
Zach Copley
5f441842be
Fix warning / send current user in to Notice::asActivity
2011-08-31 13:10:12 -07:00
Siebrand Mazeland
7cfbe7c2d4
Localisation updates from http://translatewiki.net .
2011-08-30 11:50:01 +02:00
Siebrand Mazeland
c9139cc6e0
Add translator documentation.
...
Update punctuation for a few messages.
Leading tabs to spaces.
2011-08-30 11:37:20 +02:00
Siebrand Mazeland
6ae673fd3f
Add i18n file.
2011-08-30 11:23:42 +02:00
Siebrand Mazeland
3e60d4cb3f
Number parameters in messages that have multiple parameters
...
Trim trailing whitespace
Leading tabs to spaces
Remove superfluous whitespace
2011-08-30 10:56:00 +02:00
Evan Prodromou
2522f888c7
Static -> static
2011-08-27 17:42:31 -04:00
Jordan Conway
9bf815be0d
fixed typo http://status.net/open-source/issues/3289
2011-08-27 12:11:00 -07:00
Evan Prodromou
ebaf5a972e
add a return to the error path for new events
2011-08-27 14:56:02 -04:00
Evan Prodromou
6132bddabc
don't use fetchAll() when you've done a query()
2011-08-27 13:14:31 -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
01fd24ce6a
Make joinAdd() explicit in OStatusPlugin::onStartProfileCompletionSearch()
2011-08-27 12:06:34 -04:00
Evan Prodromou
817e1507ed
Catch missing profile in realtime server
2011-08-27 10:58:11 -04:00
Samantha Doherty
41f06d96d4
Quick fix to make custom site logos work better.
2011-08-26 15:35:00 -04:00
Samantha Doherty
37bb0e6d20
Style cleanup for ostatus forms.
2011-08-26 12:51:55 -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
Samantha Doherty
2dd13b071c
Update DirectionDetector style for 1.0 and move to base stylesheet.
2011-08-25 17:14:13 -04:00
Samantha Doherty
f0443aff1a
Style for Activity notices.
2011-08-25 16:24:54 -04:00
Evan Prodromou
654fdf2fa4
Don't try to read the URLs in system notices
2011-08-25 12:59:40 -04:00
Evan Prodromou
1593c97bc1
Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x
2011-08-25 12:34:32 -04:00
Samantha Doherty
c54b3311fd
Style cleanup for QnA.
2011-08-25 12:25:10 -04:00
Samantha Doherty
85aba15830
Style cleanup for Mobile Profile.
2011-08-25 12:24:09 -04:00
Evan Prodromou
3b4d3c6ac3
actions are directed to affected group or person
2011-08-25 12:18:51 -04:00
Samantha Doherty
ab785f612a
Make MobileProfile load its own AND theme CSS files if available.
2011-08-25 12:16:40 -04:00
Evan Prodromou
19af3e8ae9
use 'system' for activity notice source
2011-08-25 11:54:26 -04:00
Evan Prodromou
3ff0299531
more accurate activity output for system activities
2011-08-25 11:51:50 -04:00
Evan Prodromou
420e7ddf83
no class for notice content div in systemlistitem
2011-08-24 18:12:26 -04:00
Evan Prodromou
352e66d25a
show system list items for fave/unfave
2011-08-24 18:12:02 -04:00
Evan Prodromou
904101b973
Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x
2011-08-24 17:17:32 -04:00
Evan Prodromou
3d831ebcfb
hide buttons for repeat, delete system activities
2011-08-24 17:17:03 -04:00
Zach Copley
3b1c5e5ac1
Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x
...
* '1.0.x' of gitorious.org:statusnet/mainline:
Fix blog plugin error to allow deleting a blog post
correctly show the blog content for blog entries
2011-08-24 13:57:48 -07:00
Evan Prodromou
eef89c6712
Fix blog plugin error to allow deleting a blog post
2011-08-24 15:57:45 -04:00
Evan Prodromou
b5c5d8d393
correctly show the blog content for blog entries
2011-08-24 14:57:05 -04:00
Zach Copley
f955cf6ace
Add timezone indicator to event start time label
2011-08-23 15:43:14 -07:00
Zach Copley
8e2a9bfa5b
Initialize DataTime with 'now' instead of 'today' (today doesn't give accurate results)
2011-08-23 22:25:46 +00:00
Evan Prodromou
65df78d5c8
remove Activity plugin separate ignore and copying files
2011-08-23 12:23:18 -04:00
Evan Prodromou
4cbd5b4c9f
Add custom list items for follow, unfollow, leave activities
2011-08-23 12:18:10 -04:00
Evan Prodromou
7c4dfb8480
remove debug statement from JoinListItem
2011-08-23 11:52:45 -04:00
Evan Prodromou
eed5192405
Custom list item for join events
2011-08-23 11:49:27 -04:00
Evan Prodromou
1bfbf92868
Incorrect arguments for ActivityPlugin::onEndJoin/LeaveGroup()
2011-08-23 10:23:08 -04:00
Evan Prodromou
505c64854c
correct typo in ActivityPlugin::onEndSubscribe()
2011-08-23 00:27:42 -04:00
Evan Prodromou
af12037a6f
fix errors with fave activities
2011-08-23 00:23:02 -04:00
Evan Prodromou
eb6cece8e4
update Activity plugin for 1.0.x
2011-08-22 23:48:38 -04:00
Evan Prodromou
01c2c31c1e
Merge branch '1.0.x' into activity
...
Conflicts:
db/core.php
2011-08-22 18:13:02 -04:00
Evan Prodromou
9ca3c3d1c3
move core schema to class files
2011-08-22 17:52:02 -04:00
Evan Prodromou
8884a5255f
Merge activity plugin into mainline
2011-08-22 15:44:10 -04:00
Evan Prodromou
8eac5d2638
Merge branch 'testing' into 1.0.x
2011-08-22 13:20:40 -04:00
Siebrand Mazeland
ed13c9a098
Localisation updates from http://translatewiki.net .
2011-08-20 21:30:04 +02:00
Siebrand Mazeland
1fa689e913
tag -> list
2011-08-20 20:30:37 +02:00
Siebrand Mazeland
083e9773f2
Add translator documentation.
...
doxygen fixes.
2011-08-19 17:13:15 +02:00
Siebrand Mazeland
d5cba33366
Add translator documentation.
2011-08-19 17:11:29 +02:00
Siebrand Mazeland
91cb7b8775
Remove i18n fix from previous commit: this is a debug log entry.
2011-08-19 17:09:44 +02:00
Siebrand Mazeland
4b0dd8384f
Whitespace updates (including leading tabs to spaces).
...
Fixed i18n.
2011-08-19 17:06:03 +02:00
Siebrand Mazeland
700b46317a
Fix broken translator documentation because "// TRANS: " is not exactly in the line above the _m() method call.
...
Whitespace updates.
2011-08-19 16:50:31 +02:00
Siebrand Mazeland
d85bfd426d
Update/add translator documentation.
...
Fix i18n domain where needed.
Whitespace updates.
2011-08-19 16:46:28 +02:00
Siebrand Mazeland
c718a603f5
Fix and add translator documentation
...
Fix i18n domain where needed.
Whitespace updates.
2011-08-19 16:40:45 +02:00
Siebrand Mazeland
fd4c72bf85
Fix awkward attempt at i18n.
2011-08-16 18:04:56 +02:00
Siebrand Mazeland
31556e3c00
Localisation updates from http://translatewiki.net .
2011-08-15 16:32:26 +02:00
Siebrand Mazeland
bd32b69355
Fix punctuation.
2011-08-15 16:18:21 +02:00
Siebrand Mazeland
4239e2bb9e
Fix incorrect documentation.
2011-08-15 16:04:06 +02:00
Evan Prodromou
11f2078893
better exception handling in delicious importer
2011-08-09 13:07:36 -07: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
897e3c87e5
encode values when inserting into MeteorUpdater JS
2011-08-02 13:49:27 -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
e530a0868d
Fix Bug#3260 for 1.0.x
2011-07-30 08:17:57 -04:00
Evan Prodromou
afd42611a3
Merge branch '0.9.x'
2011-07-30 07:49:05 -04:00
Evan Prodromou
5517741909
json_encode() realtime arguments (closes Bug#3260)
2011-07-30 07:45:07 -04:00
Siebrand Mazeland
7fcdc1a9ed
Localisation updates from http://translatewiki.net .
2011-07-21 14:49:16 +02:00
Evan Prodromou
ebc5d6f676
fix call to Notice::saveNew() in Ostatus_profile::processShare()
2011-07-20 11:47:55 -04:00
Evan Prodromou
0ad7411343
Make process*() functions return existing or new notice
2011-07-20 11:33:28 -04:00
Evan Prodromou
0eeb175904
ID is a string
2011-07-20 11:13:25 -04:00
Evan Prodromou
17b1492690
better ID from shared activities
2011-07-20 11:11:05 -04:00
Evan Prodromou
e7ad9bf17a
ensure a shared item's author element
2011-07-19 16:47:37 -04:00
Evan Prodromou
982426a790
handle incoming SHARE verbs
2011-07-19 15:20:06 -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
22f75cc352
Update checking notices for bookmarkness
2011-07-14 15:05:15 -04:00
Evan Prodromou
e04ce18a93
Merge branch '1.0.x' into testing
2011-07-14 12:55:02 -04:00
Zach Copley
8ba6c8ea87
Update admin panel instructions in the TwitterBridge README
2011-07-13 23:06:29 +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
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