Brion Vibber
3c9561b3f0
Merge branch 'atomic-json' into 1.0.x
2011-03-11 12:47:11 -08:00
Brion Vibber
d5f5f76947
durrrr s/textValue/textContent/
2011-03-11 12:45:55 -08:00
Brion Vibber
e1136bacae
Update PollPlugin Atom input
2011-03-11 12:41:11 -08:00
Brion Vibber
a9d589dbdc
Poll plugin: switching Atom & JSON output to use new hooks & methods, much nicer output. Also switched types, which may break old entries. Beware!
...
Input not yet updated.
2011-03-11 12:28:15 -08:00
Brion Vibber
3146c9fae8
Add event hooks for customizing ActivityObject output to Atom and JSON, and helpers for MicroAppPlugin.
...
New hooks:
* StartActivityObjectOutputAtom
* EndActivityObjectOutputAtom
$obj ActivityObject
$out XMLOutputter
* StartActivityObjectOutputJson
* EndActivityObjectOutputJson
$obj ActivityObject
&$out array
2011-03-11 11:58:53 -08:00
Evan Prodromou
487b3be198
Merge remote branch 'origin/1.0.x' into 1.0.x
2011-03-11 13:27:11 -06:00
Siebrand Mazeland
69e11bb45e
Localisation updates from http://translatewiki.net .
2011-03-11 19:33:52 +01:00
Siebrand Mazeland
eff26421ab
Move translator documentation one line lower. Otherwise it will not be added to the POT file.
2011-03-11 19:32:35 +01:00
Siebrand Mazeland
843ace580d
i18n/L10n updates
...
Translator documentation added
2011-03-11 19:05:28 +01:00
Siebrand Mazeland
a70914cd57
i18n fixes: plugins should use _m(), not _().
2011-03-11 18:33:19 +01:00
Siebrand Mazeland
76bffe1a64
* Superfluous whitespace removed
...
* Small L10n updates
2011-03-11 18:31:22 +01:00
Luke Fitzgerald
43db20ca98
Merge in upstream protocol change
...
"passport response message changed, it might return Compact2 instead of PPToken2 since 2011/2/14."
2011-03-11 17:23:14 +00:00
Siebrand Mazeland
e2defc1f7c
* update/add translator documentation.
...
* remove superfluous whitespace.
* minor updates to L10n/i18n.
2011-03-11 17:07:27 +01:00
Evan Prodromou
5976a8542b
Merge remote branch 'origin/1.0.x' into 1.0.x
2011-03-11 08:37:05 -06:00
Samantha Doherty
dccd0ae6e1
Couple of tiny theme changes for inline replies.
2011-03-11 00:00:54 -05:00
Samantha Doherty
3c66275186
Removing currently unused webfonts from theme.ini.
2011-03-10 23:59:45 -05:00
Samantha Doherty
11a183fe33
New interim default avatar images.
2011-03-10 23:58:34 -05:00
Samantha Doherty
589aeed7d6
Updating favicon.
2011-03-10 23:57:29 -05:00
Brion Vibber
0f3af3e3b7
Keep 'Status' tab current while showing the placeholder -- pretend like it's a mini version of the status notice form :D
2011-03-10 18:01:40 -08:00
Brion Vibber
17dc1c8703
Merge branch 'magic' into 1.0.x
2011-03-10 17:55:08 -08:00
Brion Vibber
0ee5d79739
Return to placeholder entry after successful post
2011-03-10 17:54:07 -08:00
Brion Vibber
6066bce02c
Clicking outside the active top posting form now returns to the placeholder if all textarea/input fields are empty
2011-03-10 17:52:03 -08:00
Brion Vibber
b89b89ce89
Focus in textarea when popping up the status tab
2011-03-10 17:44:17 -08:00
Brion Vibber
f88689cc87
Trigger status notice form when top placeholder form gets used. Delay initialization of notice ajax forms until they get shown.
2011-03-10 17:40:39 -08:00
Brion Vibber
771682b6eb
Add placeholder status form for the top (needs to hook up to JS)
2011-03-10 17:40:25 -08:00
Zach Copley
08018a1f7b
Merge branch '1.0.x' into profile-fixups
2011-03-10 17:16:54 -08:00
Zach Copley
3730b650ab
Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x
2011-03-10 17:16:28 -08:00
Zach Copley
78ecb17ba1
User directory - fix nav
2011-03-10 17:15:56 -08:00
Zach Copley
302f0236bd
Make correct nav menus show
2011-03-10 17:13:34 -08:00
Zach Copley
8efd2cf04d
Make phone number save and display from DB
2011-03-10 16:57:41 -08:00
Brion Vibber
874804a0c4
use a data attribute instead of 'title' for geo lookup api; fixes failure of cloned forms to work
2011-03-10 16:49:24 -08:00
Brion Vibber
e43ee373ae
Fix disappearing reply forms when closing geo section
...
Missing default-cancel in the click handler allowed the event to bubble up to the body handler, where we think the click is outside of the form because the target is no longer in the form by the time we check
Now the event no longer bubbles up, as we cancel it when we're done.
2011-03-10 16:29:13 -08:00
Brion Vibber
eef9786e36
click -> focus for reply placeholder trigger; lets keyboarders use it though not super ideal :D
2011-03-10 16:23:18 -08:00
Brion Vibber
2858f495fa
Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x
2011-03-10 16:16:06 -08:00
Brion Vibber
d107164aec
Tweaks for closing
2011-03-10 16:15:44 -08:00
Brion Vibber
4e1ce4e5bb
Remove inline reply forms on click-away if they have initial text as well as if empty (plus whitespace stripping)
2011-03-10 16:10:58 -08:00
Brion Vibber
acca8a24b4
Fix for inline reply placeholders: only remove the one we're clicking in, not all of them!
2011-03-10 16:08:28 -08:00
Brion Vibber
6b5b6d072b
Make inline reply forms close when clicking outside them if there's no text again.
...
(That went away when we switched to reusing the main notice form)
2011-03-10 16:06:01 -08:00
Zach Copley
3592397d77
Merge branch '1.0.x' into profile-fixups
2011-03-10 15:18:41 -08:00
Zach Copley
a984aae564
Show a reasonable error message when an image is bad, instead of
...
letting the exception continue bubbling up.
2011-03-10 15:18:14 -08:00
Samantha Doherty
ac880bd6ea
Stupid tiny typo in neo.
2011-03-10 18:12:14 -05:00
Zach Copley
6aa7935397
Merge branch '1.0.x' into profile-fixups
2011-03-10 15:07:09 -08:00
Samantha Doherty
b07227b9d2
Big update for neo theme (and a couple wee fixes for rebase).
2011-03-10 18:05:04 -05:00
Zach Copley
78dc4f3a3d
Merge branch '1.0.x' into profile-fixups
2011-03-10 14:22:41 -08:00
Zach Copley
24d0094192
User Directory - set class current on "All" if there is no selected filter
2011-03-10 14:20:35 -08:00
Zach Copley
c456e998c7
Make phone numbers save
2011-03-10 14:14:21 -08:00
Brion Vibber
eccadb4a7b
cleanup... Poll main & response events seem to sorta work over ostatus now
2011-03-10 13:56:54 -08:00
Brion Vibber
6416f5ea41
fix
2011-03-10 13:47:44 -08:00
Brion Vibber
97df2f394f
typo.... maybe that coffee's wearing off?
2011-03-10 13:46:20 -08:00
Brion Vibber
e54eb9117f
backwards
2011-03-10 13:45:31 -08:00
