Zach Copley
b96f30168c
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
2010-01-28 18:15:50 +00:00
Zach Copley
558bf0f489
'Sign in with Twitter' button img
2010-01-28 18:15:45 +00: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
Sarven Capadisli
22d9c32e7e
Update to aside styles in biz theme
2010-01-28 18:39:30 +01:00
Sarven Capadisli
b4babedd29
Update to notice item in biz theme
2010-01-28 17:36:33 +01:00
Sarven Capadisli
1662aa1113
Update to biz theme button close and minimize styles
2010-01-28 17:32:24 +01:00
Sarven Capadisli
d29af38a0b
Update to biz theme's input styles
2010-01-28 17:28:11 +01:00
Sarven Capadisli
d955fb5e37
Updated biz theme entity_actions styles
2010-01-28 17:22:01 +01:00
Sarven Capadisli
156efda37a
Updated biz theme to use dialogbox styles
2010-01-28 17:16:11 +01:00
Sarven Capadisli
83087e9d9b
Updated biz theme notice options
2010-01-28 17:12:48 +01:00
Sarven Capadisli
6e556e502a
Updated biz theme to hide form_repeat legend
2010-01-28 17:09:35 +01:00
Sarven Capadisli
e881888789
Updated biz theme to use the single icons file
2010-01-28 17:08:24 +01:00
Sarven Capadisli
b969fba2f5
Updated geo sharing styles for biz
2010-01-28 16:49:33 +01:00
Sarven Capadisli
d4289cb34e
Fixed layout when ad plugin is on for biz
2010-01-28 16:41:28 +01:00
Sarven Capadisli
61114ceff7
Fixed layout for powered by statusnet in biz
2010-01-28 16:39:20 +01:00
Sarven Capadisli
c6f8b94fa9
Showing processing indicator for form_repeat on submit instead of form
2010-01-28 16:02:39 +01:00
Sarven Capadisli
5b1245a32a
Removed avatar from repeat of username (matches noticelist)
2010-01-28 15:06:03 +01:00
Sarven Capadisli
dcce323d18
Removed unused variable assignment for avatar URL and added missing fn
2010-01-28 15:05:23 +01: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
7347381183
Fix for Mapstraction plugin's zoomed map links
...
Move definition of NICKNAME_FMT above plugin initialization but below loading of Validate package.
A merge error when refactoring setup lead to this not being defined yet when plugins were initialized, causing the router setup in MapstractionPlugin which tried to use this constant to fail.
Result was bogus links and if you hit the URL directly the action would be "unrecognized".
2010-01-27 21:42:13 -08: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
Zach Copley
794fe16d69
Merge branch 'facebook-js-fix' into testing
2010-01-28 04:47:21 +00:00
Zach Copley
c2c262e4b4
Move faceboookapp.js to the Facebook plugin
2010-01-28 04:46:10 +00: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
fbd52111e1
fix notice -- drop unused return value of variable that isn't initialized :) thx @ g0 for the catch
2010-01-27 19:58:33 -08:00
Brion Vibber
f026ecec32
fix for fix for bad realtime JS load
2010-01-27 19:50:52 -08:00
Brion Vibber
5c0560a7fc
fix for fix for bad realtime JS load
2010-01-27 19:50:08 -08:00
Brion Vibber
84e7c7783c
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
2010-01-27 19:49:26 -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
