Evan Prodromou
74a03cbe1f
always set up database_rw, regardless, so cached sessions work
2010-01-28 14:27:35 -05:00
Evan Prodromou
d5f86f7a8a
Merge branch 'master' of git@gitorious.org:statusnet/mainline
2010-01-28 13:54:19 -05:00
Evan Prodromou
84b5480007
update mysqltimestamps on insert and update
2010-01-28 13:54:01 -05:00
Evan Prodromou
c81318d3ca
additional debugging data for Sessions
2010-01-28 13:53:28 -05:00
Zach Copley
e5ff610e75
'Sign in with Twitter' button img
2010-01-28 18:47:12 +00:00
Sarven Capadisli
86fed21c14
Merge branch 'master' of git@gitorious.org:statusnet/mainline
2010-01-28 19:37:31 +01:00
Sarven Capadisli
171c97f17e
Update to aside styles in biz theme
2010-01-28 19:36:58 +01:00
Sarven Capadisli
1e8b14d24b
Update to notice item in biz theme
2010-01-28 19:36:58 +01:00
Sarven Capadisli
8eec008b0c
Update to biz theme button close and minimize styles
2010-01-28 19:36:57 +01:00
Sarven Capadisli
72fc0f6b8a
Update to biz theme's input styles
2010-01-28 19:36:57 +01:00
Sarven Capadisli
f66e0ed139
Updated biz theme entity_actions styles
2010-01-28 19:36:57 +01:00
Sarven Capadisli
9af751c03a
Updated biz theme to use dialogbox styles
2010-01-28 19:36:57 +01:00
Sarven Capadisli
852a8b8295
Updated biz theme notice options
2010-01-28 19:36:57 +01:00
Sarven Capadisli
8a18fd9591
Updated biz theme to hide form_repeat legend
2010-01-28 19:36:57 +01:00
Sarven Capadisli
f4c037f956
Updated biz theme to use the single icons file
2010-01-28 19:36:57 +01:00
Sarven Capadisli
108aa050af
Updated geo sharing styles for biz
2010-01-28 19:36:57 +01:00
Sarven Capadisli
df2390a90f
Fixed layout when ad plugin is on for biz
2010-01-28 19:36:57 +01:00
Sarven Capadisli
612dce4fe1
Fixed layout for powered by statusnet in biz
2010-01-28 19:36:57 +01:00
Brion Vibber
a868a523a5
Can now set $config['queue']['stomp_persistent'] = false; to explicitly disable persistence when we queue items
2010-01-28 09:52:35 -08:00
Brion Vibber
ffaaf9de4a
Don't preemptively close existing DB connections for web views (needed to keep # of conns from going insane on multi-site queue daemons, so just doing for CLI)
...
May, or may not, help with mystery session problems
2010-01-27 23:51:22 -08:00
Brion Vibber
78fe76b058
dropping the setcookie() call from common_ensure_session() since we're pretty sure it's unnecessary
2010-01-27 23:16:06 -08:00
Brion Vibber
65c4cff01c
append '/' on cookie path for now (may still need some refactoring)
2010-01-27 23:14:49 -08:00
Evan Prodromou
5bf4928db8
Merge branch 'master' of git@gitorious.org:statusnet/mainline
2010-01-28 01:25:08 -05:00
Evan Prodromou
1ba8045a9b
set session cookie correctly
2010-01-28 01:24:00 -05:00
Brion Vibber
427ac3a3a6
debug log line for control channel sub
2010-01-27 20:51:04 -08:00
Brion Vibber
944a89dfeb
Merge branch 'master' of gitorious.org:statusnet/mainline
2010-01-27 20:49:40 -08:00
Brion Vibber
644c319f5a
fix notice -- drop unused return value of variable that isn't initialized :) thx @ g0 for the catch
2010-01-27 19:59:25 -08:00
Brion Vibber
f026ecec32
fix for fix for bad realtime JS load
2010-01-27 19:50:52 -08:00
Evan Prodromou
a85a3ddc72
Merge branch 'master' of git@gitorious.org:statusnet/mainline
2010-01-27 22:05:58 -05:00
Evan Prodromou
5e1a9ad04d
Merge branch 'testing'
...
Conflicts:
theme/base/css/display.css
2010-01-27 22:05:32 -05:00
Evan Prodromou
ee4ea3f3e1
increment software beta version
2010-01-27 21:59:38 -05:00
Brion Vibber
c805a5e518
Update queue, translation notes in readme
2010-01-27 18:55:22 -08:00
Brion Vibber
3abfb454a3
Adds an emergency switch so we can run inbox distribution at save time (bypassing 'distrib' queue)
...
Set $config['queue']['inboxes'] = false to do so
2010-01-27 18:39:17 -08:00
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