Zach Copley
c67cdd7fcf
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
2010-01-28 02:20:28 +00:00
Zach Copley
5182cc686d
Numbered format specifiers
2010-01-28 01:39:18 +00:00
Brion Vibber
0794ecf372
Merge branch 'testing' of gitorious.org:statusnet/mainline
2010-01-27 17:39:03 -08:00
Brion Vibber
07d50a012a
fix update script -- read the diff wrong and put a couple fields on wrong table (whoops)
2010-01-27 17:34:13 -08:00
Zach Copley
f296f04abd
Remove debugging statement
2010-01-28 01:24:40 +00:00
Zach Copley
324590c46e
Some adjustments to the way API auth works after merging testing and 0.9.x
2010-01-28 00:45:06 +00:00
Zach Copley
420ae06faf
These API methods should return true for ->isReadOnly($args)!
2010-01-28 00:44:55 +00:00
Brion Vibber
fe531dfc6c
Shuffle params on setup_status_network; adding fullname and pushing tags up
2010-01-27 16:03:51 -08:00
Evan Prodromou
3f4496353b
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
2010-01-27 18:53:31 -05:00
Evan Prodromou
dd413ff4fa
move script into OpenXPlugin::showAd() so it works
2010-01-27 18:44:46 -05:00
Evan Prodromou
97a1ef14d2
using an action for output in OpenX plugin
2010-01-27 18:39:55 -05:00
Brion Vibber
e7a5471287
add additional post-install shell script option for setup_status_network.sh to do any other site-specific setup
2010-01-27 15:37:18 -08:00
Evan Prodromou
0373ab6fa4
Plugin to enable OpenX ads
2010-01-27 18:35:02 -05:00
Brion Vibber
06cd335897
Add scripts/sendemail.php to send email to a user's address. Updated setup_status_network.sh to create a user with the site's nick, accept site tags, and send a mail to the user (if a template is set)
...
Email and tag params added to the end:
setup_status_net.sh mysite 'My Site' 'owner@example.com' '1user'
(If multiple tags are needed, separate them with a pipe "|". Be sure to quote properly!)
New parameters for setup.cfg need to be set:
export PHPBASE=/var/www/statusnet
export WILDCARD=example.net
export MAILTEMPLATE=/etc/statusnet/newsite-mail.txt
export MAILSUBJECT="Your new StatusNet site"
$PHPBASE is the base dir for a callable StatusNet install, used to run command-line scripts for user setup.
$WILDCARD is the wildcard domain, needed to build a full server name to pass into command-line scripts.
$MAILTEMPLATE points to a file containing an e-mail message template. '$nickname', '$sitename', and '$userpass' can be used in the template for substitution.
$MAILSUBJECT is the subject line for said email.
To skip sending an email on creation, leave $MAILTEMPLATE blank or point to a non-existing file.
2010-01-27 15:12:19 -08:00
Evan Prodromou
0b41fa3ec3
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
2010-01-27 18:09:43 -05:00
Evan Prodromou
2aba2eeeaf
width and height should be integers in AdsensePlugin
2010-01-27 17:55:33 -05:00
Evan Prodromou
00d9b215f4
Plugin to support Google Adsense
...
A plugin to easily add Google Adsense blocks to a StatusNet site.
2010-01-27 17:29:36 -05:00
Zach Copley
2494d3fa25
Merge branch 'testing' of gitorious.org:statusnet/mainline into testing
...
* 'testing' of gitorious.org:statusnet/mainline:
Rename rc3to09.sql to rc3torc4.sql to avoid confusion if we add a last-minute change after this!
Add new oauth tables and modifications to 'consumer' table for rc4
2010-01-27 14:14:18 -08:00
Michele
b0a325f7d0
HTTP auth provided is evaluated even if it's not required
2010-01-27 14:06:27 -08:00
Brion Vibber
9a54745fcd
Rename rc3to09.sql to rc3torc4.sql to avoid confusion if we add a last-minute change after this!
2010-01-27 13:59:58 -08:00
Brion Vibber
47645228da
Add new oauth tables and modifications to 'consumer' table for rc4
2010-01-27 13:58:55 -08:00
Evan Prodromou
f650b40706
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
2010-01-27 16:37:43 -05:00
Sarven Capadisli
5e31ecd82a
Centred leaderboard ad
2010-01-27 16:36:57 -05:00
Evan Prodromou
760be76fc0
camelcase the uap param names
2010-01-27 16:34:18 -05:00
Evan Prodromou
ea123800e9
move leaderboard to after the header
2010-01-27 16:34:18 -05:00
Sarven Capadisli
1c875a5395
Moved rectangle ad into aside and leaderboard to the right in header.
...
Intention for this layout was to reduce whitespace in header area
2010-01-27 16:34:18 -05:00
Sarven Capadisli
e3bd97bfe4
Aligning wide skyscraper to the right instead of left
2010-01-27 16:34:17 -05:00
Evan Prodromou
e9feafc3ca
CSS ids and classes fixed in UAPPlugin
2010-01-27 16:34:17 -05:00
Evan Prodromou
4ad931ad38
wrong height for rectangle in BlankAd
2010-01-27 16:34:17 -05:00
Evan Prodromou
e4393ee6db
Add the moved BlankAdPlugin
2010-01-27 16:34:17 -05:00
Evan Prodromou
b2b95bd21f
make BlankAd dir and change to use a 1x1 image
2010-01-27 16:34:17 -05:00
Evan Prodromou
b412ebab11
move BlankAdPlugin to its own dir
2010-01-27 16:34:17 -05:00
Evan Prodromou
9decd9806c
Add BlankAdPlugin to test ad layout in different themes
2010-01-27 16:34:17 -05:00
Evan Prodromou
7c54591472
make uapplugin an abstract class
2010-01-27 16:34:17 -05:00
Evan Prodromou
1758ed453b
move UAP plugin to core
2010-01-27 16:34:17 -05:00
Sarven Capadisli
58fde0dcb5
Lowercased switch cases in UAP Plugin
2010-01-27 16:34:17 -05:00
Sarven Capadisli
61a7a7b36b
Plugin for Universal Ad Package. Outputs four most widely used ad types.
2010-01-27 16:34:17 -05:00
Brion Vibber
c51539804a
Add persistent:true property to Stomp messages so ActiveMQ doesn't decide to discard them even though persistence is enabled on the broker. :) (Thanks Aric!)
2010-01-27 09:24:59 -08:00
Brion Vibber
b1402896e7
Set default 24-hour expiry on Memcached objects where not specified.
2010-01-27 09:13:21 -08:00
Brion Vibber
7aeb03f727
quick fix: use common_path() on realtime update JS so it works with the new JS path code (will pull from main server for now)
2010-01-27 08:53:55 -08:00
Evan Prodromou
c52951cef5
Optionally set a separate Javascript server and path
...
We have about 10-12 JavaScript pages per Web page. They usually
are based on the same server as the Web pages, but since they're
static files, it makes sense to offload them to a lite server that
handles static files well.
This commit lets you set a separate Javascript server and path for the
default Javascript code in StatusNet.
Squashed commit of the following:
commit 139d1622fdafe5ad00c820224416d9021efc3234
Author: Evan Prodromou <evan@status.net>
Date: Wed Jan 27 11:30:24 2010 -0500
modules that call htmloutputter::script() don't prescribe js/ path
commit c6ca3174af73efed55eaed5ff1e2a3bdc77d2d87
Author: Evan Prodromou <evan@status.net>
Date: Wed Jan 27 11:28:07 2010 -0500
configurable server and path for javascript files
2010-01-27 11:37:22 -05:00
Sarven Capadisli
2e0297bb6f
Better alignment for notice in shownotice page
2010-01-27 15:09:48 +00:00
Sarven Capadisli
04a37fa1c7
Better alignment for notice in shownotice page
2010-01-27 15:09:29 +00:00
Zach Copley
54d04a0c91
Test script to update your status via OAuth
2010-01-27 09:59:40 +00:00
Zach Copley
756da7bc51
s/LOG_WARN/LOG_WARNING/
2010-01-27 08:45:56 +00:00
Zach Copley
923b7de3c6
- Check for read-only vs. read-write access to protected API resources (OAuth)
...
- Some cleanup
2010-01-27 08:41:26 +00:00
Siebrand Mazeland
4202ffff91
Make more complete sentence.
2010-01-27 00:57:47 +00:00
Siebrand Mazeland
97e1acdc32
Fix casing for HMAC-SHA1.
2010-01-27 00:56:45 +00:00
Siebrand Mazeland
492950b784
Fix inconsistent title case in page title
2010-01-27 00:56:31 +00:00
Zach Copley
aad42427cc
New access admin panel for site registration settings
2010-01-26 15:56:19 -08:00