Evan Prodromou
7cf12f093e
Merge branch '1.0.x' into testing
...
Conflicts:
lib/common.php
2011-03-17 09:20:32 -04:00
Siebrand Mazeland
b74a7d7a75
Change email to SMS. Spotted by Nikerabbit.
2011-03-17 13:59:22 +01:00
Siebrand Mazeland
9785140da5
Update translator documentation.
...
L10n/i18n updates.
Superfluous whitespace removed.
2011-03-17 11:46:49 +01:00
Brion Vibber
0bf40bd748
Output avatar/author along with ProfileNoticeListItem items on ShowProfileAction -- they get hidden in CSS anyway, and we need the author data for the inline reply form if you end up replying to yourself/someone else from a profile stream view.
...
Note that the other modification -- of the repeat line -- is still going to be inconsistent between things originally on the page and anything that comes over Realtime.
2011-03-16 14:54:14 -07:00
Brion Vibber
5ec018ca19
Fix tag nesting bug on group page
2011-03-16 10:58:18 -07:00
Evan Prodromou
9b4533058c
no profileblock on login actions
2011-03-16 10:05:07 -04:00
Evan Prodromou
bbba1f6e16
Show group actions in profile block
2011-03-16 09:57:10 -04:00
Evan Prodromou
2d4554ea03
Remove UserProfile class
2011-03-16 09:57:10 -04:00
Evan Prodromou
561458650f
profile group uses account profile block
2011-03-16 09:57:09 -04:00
Brion Vibber
08b430a247
Event hook for notice search pages
2011-03-15 15:33:37 -07:00
Brion Vibber
9e9cbdf505
Suppress PHP warnings/notices during AtomPub XML parsing to avoid HTTP header problems when given bad input.
...
If display_errors is on, typical settings would cause PHP error messages to spew to output before the HTTP headers for setting a 400 error go through.
Also switched from deprecated static DOMDocument::loadXML() to non-static call.
2011-03-15 10:09:20 -07:00
Brion Vibber
34e7d8ddf2
For good measure; trip short error mode in earlier on ajax shownotice
2011-03-14 13:44:39 -07:00
Brion Vibber
c7e7cc79da
'ajax' param on shownotice action so we can pull items in full html version for realtime
2011-03-14 13:05:30 -07:00
Siebrand Mazeland
eaef01233a
Fix incorrect parameter documentation. Spotted by Nikerabbit.
2011-03-14 18:01:22 +01:00
Siebrand Mazeland
e2defc1f7c
* update/add translator documentation.
...
* remove superfluous whitespace.
* minor updates to L10n/i18n.
2011-03-11 17:07:27 +01: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
Brion Vibber
e74590d414
Ticket #3076 : fix regression in password recovery when email address given that doesn't match
...
Was triggering errors due to use of common_canonical_nickname() on arbitrary input without checking for exceptions about invalid nicknames (which didn't exist long ago in the before time)
2011-03-09 15:46:24 -08:00
Evan Prodromou
a4b3edaf40
Login actions don't show the notice form
2011-03-09 10:11:59 -05:00
Brion Vibber
5b0ca315b4
'note' -> 'notice' in an error message -- thx to AVRS on IRC for the catch on translatewiki.net :D
2011-03-08 10:58:14 -08:00
Evan Prodromou
55b4303ea4
Merge branch '3cl' into 1.0.x
2011-03-07 14:30:30 -05:00
Siebrand Mazeland
e9933871e5
* fix i18n and L10n issues.
...
* update translator documentation.
* remove superfluous whitespace.
2011-03-05 17:03:12 +01:00
Siebrand Mazeland
a127ba78a8
* translator documentation updated.
...
* superfluous whitespace removed.
* small refactoring in noticeform.php to allow proper translator hints.
2011-03-05 00:24:19 +01:00
Siebrand Mazeland
b37e12ed34
* translator documntation updated
...
* superfluous whitespace remove
* minor L10n and i18n updates
2011-03-05 00:13:04 +01:00
Brion Vibber
9689bda21c
Loading the original form instead of faking up our own. Sorta works but not pretty :D
2011-03-04 14:11:11 -08:00
Siebrand Mazeland
d55a831d97
Update translator documentation.
2011-03-03 01:42:54 +01:00
Siebrand Mazeland
399c83db87
Fix typo in documentation. Spotted by Nikerabbit.
2011-03-02 23:06:45 +01:00
Brion Vibber
8cacecb6dc
Use threaded replies in group inbox view
2011-03-01 16:29:11 -08:00
Zach Copley
5bf0c9f610
Fix mising require_once (now required here because of rearranging)
2011-03-01 15:31:06 -08:00
Zach Copley
243b396660
Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x
2011-03-01 15:26:02 -08:00
Zach Copley
2fb8148788
Fix missing variable initialization
2011-03-01 15:25:06 -08:00
Brion Vibber
a7005f3975
Alternate Inbox streaming function optimized for threaded paging (for /all stream, while things using the existing API inbox methods won't be affected)
2011-03-01 15:16:39 -08:00
Evan Prodromou
64a1c9e376
object menu for user profile
2011-03-01 16:23:19 -05:00
Evan Prodromou
a1a0382d26
object menu on showgroup
2011-03-01 16:22:19 -05:00
Evan Prodromou
374253f0f7
defaultlocalnav for favorites
2011-03-01 16:21:22 -05:00
Evan Prodromou
55fa14baec
object menu in inviteaction
2011-03-01 16:20:14 -05:00
Evan Prodromou
6ee77f1302
defaultlocalnav in groups
2011-03-01 16:18:33 -05:00
Evan Prodromou
f29274cd0d
show defaultlocalnav in groupmembers
2011-03-01 16:17:42 -05:00
Evan Prodromou
0c877860b5
show defaultlocalnav in grouplogo
2011-03-01 16:17:01 -05:00
Evan Prodromou
4903c92dce
show defaultlocalnav in groupdesignsettings
2011-03-01 16:15:03 -05:00
Evan Prodromou
0850c66a21
default local nav in featured user list
2011-03-01 16:11:59 -05:00
Evan Prodromou
3c683ad7b5
default local nav in popular notices
2011-03-01 16:11:19 -05:00
Evan Prodromou
4561caec10
show default local nav in group edit
2011-03-01 16:10:40 -05:00
Evan Prodromou
737eb371f8
show full local nav in public tag cloud
2011-03-01 16:09:35 -05:00
Evan Prodromou
85320a7561
show object nav for blocked users in a group
2011-03-01 16:08:49 -05:00
Evan Prodromou
efdc85224a
user groups show subgroupnav in object menu area
2011-03-01 16:07:27 -05:00
Evan Prodromou
3377bc2ccf
RepliesAction uses default local nav
2011-03-01 16:06:29 -05:00
Evan Prodromou
64ab7b7d07
use default local nav for public action
2011-03-01 16:00:07 -05:00
Evan Prodromou
8c03e8b0b3
use default local nav for allaction
2011-03-01 15:59:01 -05:00
Brion Vibber
b351fad43a
Merge branch '1.0.x' into inline-comments
2011-02-28 16:48:05 -08:00
Zach Copley
e109b2592f
Merge branch '0.9.x' into 1.0.x
2011-02-28 16:41:24 -08:00