98b3f5ea91
no extra nulls on home page
2011-04-18 16:28:41 -04:00
7a333e3175
recover password uses login menu
2011-04-18 16:19:00 -04:00
9346d50102
inviter URL corrected
2011-04-18 13:40:27 -04:00
122b38f354
check for valid email on invite
2011-04-18 13:26:46 -04:00
d3215adfa1
Merge remote-tracking branch 'gitorious/1.0.x' into 1.0.x
2011-04-18 12:54:23 -04:00
17adc94df7
DocFile::fromTitle() -> DocFile::forTitle()
2011-04-18 10:10:38 -04:00
c30dcbebbc
no notice form on invites
2011-04-18 10:04:57 -04:00
4a8a424bdf
Use mail templates for invite text
2011-04-18 09:04:11 -04:00
ef67262a3f
Externalize document-finding code so plugins can use it
2011-04-18 06:16:32 -04:00
cb28496054
Update people tag related UI messages.
...
Update translator documentation accordingly.
2011-04-17 23:28:11 +02:00
4ab995dd1e
Complete "people tag" to "list" in UI messages.
...
Update translator documentation accordingly.
Probably a few cases left where "tag[ged[" has to be replaced by "list[ed]".
2011-04-17 20:08:03 +02:00
d68a86f019
people tag -> list
2011-04-17 02:15:17 +02:00
049f23cdb3
people tag -> list
2011-04-17 02:11:46 +02:00
271881d4dc
Fix translator documentation.
2011-04-17 02:09:47 +02:00
f1316677d8
Add forgotten comment tag.
2011-04-17 02:06:17 +02:00
c74adb5401
Fix typo in comment.
2011-04-17 00:53:29 +02:00
d9f27fcb14
move Invite button to top
2011-04-16 16:12:04 -04:00
3ba4258f9e
use notice list instead of threaded for list view
2011-04-15 18:56:24 -04:00
9eafc8d0ba
use threadingnoticestream for groups
2011-04-15 18:54:35 -04:00
ee81f98828
use threadingnoticestream for inbox
2011-04-15 18:51:18 -04:00
52fce18e0a
use threading notice stream wrapper for public
2011-04-15 18:47:56 -04:00
da6822c1f0
Merge branch 'lists_fixes' into 1.0.x
2011-04-15 20:50:04 +00:00
b78e5de474
Profile::getOwnedTags -> Profile::getLists, first argument is the current user, or the user accessing the lists.
2011-04-16 00:52:58 +05:30
55b58f0f1f
Update translator documentation.
2011-04-15 10:20:34 +02:00
44bdc2ddaf
Remove obsolete code.
...
Update translator documentation.
2011-04-15 10:12:49 +02:00
335390f2ca
Merge branch 'onboarding-remix' into 1.0.x
...
* onboarding-remix:
* Show the right menus in the aside after successful registration * Events surrounding successful registration output
2011-04-14 15:46:40 -07:00
951ee1faff
* Show the right menus in the aside after successful registration
...
* Events surrounding successful registration output
2011-04-14 15:45:05 -07:00
3df69fe5ba
show invite button in public
2011-04-14 18:19:59 -04:00
0cc73b3b2a
show invite button section on home page
2011-04-14 18:19:18 -04:00
93bfacad3b
no object nav for invite
2011-04-14 18:15:47 -04:00
9ef13976fc
Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x
2011-04-14 16:09:18 -04:00
4bda1b2a36
groups show same aside as profile
2011-04-14 15:53:18 -04:00
b8a057bc2d
hide subscription tag sections
2011-04-14 15:51:07 -04:00
f1da1a24d1
hide subscriber tag sections
2011-04-14 15:51:00 -04:00
53af608ef8
People tags -> Lists (only UI changes, for experimentation)
2011-04-14 19:49:42 +00:00
8def44bc57
no object nav for showstream
2011-04-14 15:47:01 -04:00
22f6151a10
Annihilate profile_tag_inbox.
2011-04-14 19:45:31 +00:00
4b5cbea16a
no popular notice section for tags
2011-04-14 15:33:59 -04:00
c7a4aaddfc
show correct preview URL and hide delete button if avatar is not local
2011-04-14 11:47:55 -04:00
03de85ed46
Make it so input forms that don't have navigation don't accidentally get hidden. Add a "nonav" class to them.
2011-04-12 14:20:19 -07:00
5454d22b79
Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x
...
* '1.0.x' of gitorious.org:statusnet/mainline:
Show both empty and full notice search results inside event wrapper
More interesting test notices in createsim.php
2011-04-12 11:55:01 -07:00
fcd863bba9
Theming - add some new markup to DM and new notice pages
2011-04-12 11:54:12 -07:00
606884385c
Show both empty and full notice search results inside event wrapper
2011-04-12 14:29:12 -04:00
4331b8b4f1
make search results privacy-aware
2011-04-11 18:59:58 -04:00
9c424cb7e6
events for validating outgoing invites
2011-04-11 16:49:28 -04:00
25c5a1f0ef
hooks for adding email addresses
2011-04-11 16:38:57 -04:00
d197c86a61
show full threaded notice list in conversation view
2011-04-11 12:39:06 -04:00
1b00eb2599
Fix undefined variable in showgroup
2011-04-11 11:54:42 -04:00
820e19e197
Merge remote-tracking branch 'gitorious/1.0.x' into 1.0.x
2011-04-11 11:20:27 -04:00
19bd6fded4
pass user profile to ThreadedNoticeList in PublicAction
2011-04-11 11:18:12 -04:00
abbe0cf4ab
Add space between two sentences.
2011-04-11 15:25:43 +02:00
70faf76001
threadednoticelist takes a profile param
2011-04-10 20:16:51 -04:00
5304373b0b
Merge branch '1.0.x' into testing
2011-04-10 14:20:46 -04:00
f0d762f196
Update/add translator documentation.
...
L10n/i18n updates.
Superfluous whitespace removed.
Add FIXME for a few i18n issues I couldn't solve this quickly.
Takes care of documentation for all core code added in merge of "people tags" feature (Commit:e75c9988ebe33822e493ac225859bc593ff9b855).
2011-04-10 19:59:55 +02:00
e75c9988eb
Merge branch 'people_tags_rebase' into 1.0.x
...
Conflicts:
EVENTS.txt
2011-04-10 08:10:01 +00:00
cfff80a730
If you search for a tag, redirect to tag page
2011-04-09 17:30:59 -04:00
5a377a24c9
Fix incorrect translator documentation. Spotted by OsamaK.
2011-04-09 21:08:41 +02:00
f47027abbe
Merge remote-tracking branch 'mainline/1.0.x' into people_tags_rebase
...
Conflicts:
lib/profileblock.php
theme/default/css/display.css
2011-04-09 21:57:45 +05:30
9a86e64b46
use conversationnoticestream in conversationrepliesaction
2011-04-08 18:03:42 -04:00
79f3c0939b
use conversationnoticestream in conversationaction
2011-04-08 18:03:34 -04:00
4d61760154
Merge remote-tracking branch 'mainline/1.0.x' into people_tags_rebase
2011-04-08 17:16:20 +05:30
4bf5158d43
Modified actions/login.php to redirect logged in users who hit login/ to
...
the site index.
Removed the throwing of a clientError in favour of a common_redirect to
index to fix Issue 2990: "If logged in, just redirect to home page on
/login"
2011-04-08 12:06:55 +01:00
c44a94e8f5
Port autocomplete from tagInput to jQuery UI, send Last-Modified header and look for it in JS.
2011-04-08 14:51:05 +05:30
fbc18a3c67
change apitimelinehome to use InboxNoticeStream
2011-04-07 15:35:00 -04:00
831eaa039b
use inboxnoticestream in RSS 1.0
2011-04-07 15:28:25 -04:00
328373e29c
use inboxnoticestream in API
2011-04-07 15:28:09 -04:00
5dfb8e2bc4
Use InboxNoticeStream class for inbox
...
Move the code for inbox fetching to the InboxNoticeStream class.
2011-04-07 14:54:42 -04:00
ad86eb78d3
Merge remote-tracking branch 'mainline/1.0.x' into people_tags_rebase
...
Conflicts:
js/util.min.js
lib/default.php
2011-04-07 23:13:45 +05:30
36b331d469
Merge branch '1.0.x' into testing
...
Conflicts:
plugins/Event/RSVP.php
2011-04-05 13:16:28 -04:00
7533c7cfe1
Revert "Paging fix for public timeline: drop replies from the stuff we pull in for the threaded web view."
...
This reverts commit 880661de4e
2011-04-05 12:53:49 -04:00
ced00cf0bd
Merge remote-tracking branch 'mainline/1.0.x' into people_tags_rebase
2011-04-05 10:28:05 +05:30
b41c62a27c
single flag for private groups
2011-04-04 16:58:52 -04:00
57198a7464
Merge remote-tracking branch 'mainline/1.0.x' into people_tags_rebase
...
Conflicts:
actions/tagother.php
lib/subscriberspeopleselftagcloudsection.php
lib/subscriptionspeopleselftagcloudsection.php
2011-04-04 13:26:27 +05:30
2dbdb0f185
Translator documentation updated/added.
...
i18n tweaks.
Superfluous whitespace removed.
YAY! All StatusNet core messages in the 1.0.x branch have been documented at this point in time!!!
2011-04-04 00:41:48 +02:00
84a2fb44b9
Add/update translator documentation.
2011-04-04 00:12:52 +02:00
9a6ee5e859
Update translator documentation.
2011-04-03 23:47:46 +02:00
436a02959c
Tabs to spaces.
2011-04-03 22:44:41 +02:00
c17d8e0f5f
Update translator documentation.
...
i18n tweaks.
Add FIXME for missing class documentation.
Remove superfluous whitespace.
2011-04-01 19:47:22 +02:00
f64c312942
Update translator documentation.
2011-03-31 22:48:03 +02:00
4292fa1fc4
Tweak page titles. Thanks @evan for thinking with me.
2011-03-31 22:43:57 +02:00
f70bcbdb6b
save private stream values
2011-03-30 16:23:13 -04:00
5a2bab07b2
Merge remote-tracking branch 'mainline/1.0.x' into people_tags_rebase
...
Conflicts:
actions/tagother.php
classes/Profile.php
classes/Profile_tag.php
js/util.min.js
2011-03-30 15:47:42 +05:30
20ca5027cc
Consolidate common code in micro-apps custom notice type display actions.
...
The ShowNoticeAction subclasses were cut-n-pasting a lot of prepare() code from ShowNoticeAction, though the only part that's different is how we look up the notice. Broke that out to a getNotice() method, so only that needs to be copied. Avoids extra copies of permission checks and other common code in this spot.
2011-03-29 16:58:15 -07:00
674e3c2a0e
Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x
...
Conflicts:
actions/apistatusesretweet.php
actions/repeat.php
classes/Notice.php
lib/command.php
2011-03-29 16:26:20 -07:00
9adbb49fc9
Consolidate some precondition checks for repeats, fix a couple bits in the repeat command.
...
Notice::saveNew() now does these checks directly when making a repeat:
* make sure the original is valid and existing
* stop you from repeating your own message
* stop you from repeating something you've previously repeated
* prevent repeats of any non-public messages
* explicit inScope() check to make sure you can read the original too (just in case there's a funky extension at play that changes scoping rules)
These error conditions throw exceptions, which the caller either uses as an error message or passes on up the stack, without having to duplicate the checks in each i/o channel.
2011-03-29 16:20:12 -07:00
0a19674c9f
@evan Fixed message domain for messages in plugins for recent commits.
...
Numbered parameters when more than one used in a message.
L10n updates for consistency.
i18n for non-translatable exception.
Updated translator documentation.
Removed superfluous whitespace.
2011-03-30 00:48:41 +02:00
880661de4e
Paging fix for public timeline: drop replies from the stuff we pull in for the threaded web view.
2011-03-29 15:40:07 -07:00
9f1603462d
Merge branch 'limitdist2' into 1.0.x
2011-03-29 17:32:17 -04:00
ede8fabb55
Fix incorrect translator documentation. Spotted by AVRS.
2011-03-29 23:14:40 +02:00
700018fd09
L10n/i18n updated.
...
Translator documentation updated.
FIXME added for missing class documentation.
Various documentation tweaks.
2011-03-29 23:00:29 +02:00
a8af04feea
Update translator documentation.
...
Superfluous whitespace removed.
L10n consistency updates.
2011-03-29 21:30:36 +02:00
f2d7c33ad3
Update translator documentation.
...
Remove superfluous whitespace.
Various L10n/i18n updates.
2011-03-29 21:30:35 +02:00
32145484c2
Disallow repeats (retweets) of private notices
...
We disallow repeating a notice (or whatever) if the scope of the
notice is too private. So, only notices that are public scope
(available to everyone in the world) or site scope (available to
everyone on the site) can be repeated.
Enforce this rule at a low level in Notice.php, and in the API,
commands, and Web UI. Repeat button doesn't appear on tightly-scoped
notices in the Web UI.
2011-03-29 11:53:26 -04:00
7b8fc701e0
don't show notices to out-of-scope viewers
2011-03-28 22:21:41 -04:00
e862dcdb8a
Merge branch '1.0.x' into limitdist2
2011-03-28 21:56:34 -04:00
e5b5c256a3
Working subscription approval!
2011-03-28 17:08:04 -07:00
df5def8ce4
Work in progress: subscription approval policy field in place on user, hooked up to settings. Queue not 100% tidied up, no UI for queue or management yet.
2011-03-28 15:13:59 -07:00
11b40ddb1b
work in progress...
2011-03-28 13:59:48 -07:00
798b03fb5f
set default address for showstream
2011-03-28 16:24:28 -04:00
a7380d5933
set default address for showgroup
2011-03-28 16:24:17 -04:00
5147404ea2
ToSelector widget to send private notices
...
A new widget, ToSelector (Sorry, couldn't think of anything better)
that lets you select an addressee for a notice and whether it's
private.
2011-03-28 11:02:20 -04:00
52d29a17a0
Fix incorrect translator documentation. Spotted by AVRS.
2011-03-28 01:43:01 +02:00
889b35be9c
Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x
2011-03-27 11:26:57 -04:00
c7defb32f9
NoticeForm constructor takes array of optional parameters
...
NoticeForm::__construct() had 9 parameters, and I was about to add a
few more, so I figured it'd be better to use an $options array instead.
2011-03-27 11:25:24 -04:00
1adaa6a2ab
Update grammar for feed title. Not sure why this was not "%s's". I chose the safe, more verbose way.
2011-03-27 13:05:24 +02:00
074be0d51e
i18n fixes.
...
Translator documentation updates.
2011-03-25 17:12:53 +01:00
e0cccfc40d
Translator documentation updated.
...
i18n/L10n updates.
Superfluous whitespace removed.
Add FIXME for missing class documentation.
2011-03-24 12:09:50 +01:00
78edb4bf56
Update translator documentation.
...
Remove superfluous whitespace.
L10n/I18n updates.
FIXMEs added for missing documentation or headers.
2011-03-24 11:48:53 +01:00
3be26565fb
Update translator documentation.
...
i18n/L10n updates.
Superfluous whitespace removed.
Add FIXME in files with missing documentation.
2011-03-24 11:48:51 +01:00
265f9af6f7
Retool group join queue list ajax forms to use two buttons in one form, making it more ajax-submit-friendly. Needs util.js fixes for AJAX submission input buttons...
2011-03-23 15:21:12 -07:00
83fb5e6023
Mass replacement of #-comments with //-comments
...
like leprous boils in our code. So, I've replaced all of them with //
comments instead. It's a massive, meaningless, and potentially buggy
change -- great one for the middle of a release cycle, eh?
2011-03-22 11:54:23 -04:00
13e9e41d2f
Blend in with some new code. New menus, etc.
2011-03-22 08:30:16 +05:30
bf121a695a
Merge remote-tracking branch 'mainline/1.0.x' into people_tags_rebase
...
Conflicts:
classes/Profile.php
2011-03-22 07:59:06 +05:30
31c1177970
Merge branch '1.0.x' into people_tags_rebase
...
Conflicts:
EVENTS.txt
actions/peopletag.php
actions/tagother.php
classes/Notice.php
js/util.js
js/util.min.js
lib/accountprofileblock.php
lib/action.php
lib/activityobject.php
lib/command.php
lib/personalgroupnav.php
plugins/OStatus/OStatusPlugin.php
2011-03-22 07:56:25 +05:30
942887ca8c
Split up some list/form classes, and get the 'approve' and 'cancel' links on group member queue working.
2011-03-21 17:17:18 -07:00
6bdb1053ad
Pending members queue list -- doesn't yet allow approval.
2011-03-21 16:40:10 -07:00
471a480587
Logic to have group joins turn into pending joins automatically when group is set to mod; allow users to cancel their pending group requests.
2011-03-21 16:26:41 -07:00
541dfa04fe
Switch things from calling Group_member::join & leave & calling events manually to running through Profile::joinGroup() && Profile::leaveGroup(), with the events encapsulated.
2011-03-21 14:35:29 -07:00
0bec9cfdbc
Add request_queue table and user_group.join_policy column, for upcoming join & subscription moderation.
...
UI for setting the join policy is in, but not yet used.
2011-03-21 13:51:13 -07:00
84e5ca6158
Translator documentation added/updated.
...
Superfluous whitespace removed.
L10n update.
2011-03-18 20:37:04 +01:00
902990bb72
Add myself to contributors array.
2011-03-18 20:15:57 +01:00
7ef8bd9275
i18n updates.
...
Translator documentation added.
Superfluous whitespace removed.
2011-03-18 20:12:59 +01:00
8a2002afe7
Translator documentation added/updates.
...
L10n/i18n updates.
Superfluous whitespace removed.
2011-03-18 17:04:38 +01:00
b7178d2197
Merge branch '1.0.x' of git://gitorious.org/statusnet/mainline into 1.0.x
2011-03-18 16:09:27 +01:00
0de0ae2f48
Update/add translator documentation.
...
L10n/i18n updates.
Superfluous whitespace removed.
2011-03-18 13:48:47 +01:00
6f9c277494
* Add FIXME: $profile appears to be undefined.
...
* Update translator documentation.
2011-03-18 13:10:55 +01:00
4afa3caae3
ajax load for additional inline replies; /replies variant of conversationview
2011-03-17 16:27:42 -07:00
7cf12f093e
Merge branch '1.0.x' into testing
...
Conflicts:
lib/common.php
2011-03-17 09:20:32 -04:00
b74a7d7a75
Change email to SMS. Spotted by Nikerabbit.
2011-03-17 13:59:22 +01:00
9785140da5
Update translator documentation.
...
L10n/i18n updates.
Superfluous whitespace removed.
2011-03-17 11:46:49 +01:00
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
5ec018ca19
Fix tag nesting bug on group page
2011-03-16 10:58:18 -07:00
9b4533058c
no profileblock on login actions
2011-03-16 10:05:07 -04:00
bbba1f6e16
Show group actions in profile block
2011-03-16 09:57:10 -04:00
2d4554ea03
Remove UserProfile class
2011-03-16 09:57:10 -04:00
561458650f
profile group uses account profile block
2011-03-16 09:57:09 -04:00
08b430a247
Event hook for notice search pages
2011-03-15 15:33:37 -07:00
e985a41a7e
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:11:13 -07:00
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
34e7d8ddf2
For good measure; trip short error mode in earlier on ajax shownotice
2011-03-14 13:44:39 -07:00
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
eaef01233a
Fix incorrect parameter documentation. Spotted by Nikerabbit.
2011-03-14 18:01:22 +01:00
e2defc1f7c
* update/add translator documentation.
...
* remove superfluous whitespace.
* minor updates to L10n/i18n.
2011-03-11 17:07:27 +01:00
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
b7548fb9e2
Show a reasonable error message when an image is bad, instead of
...
letting the exception continue bubbling up.
2011-03-10 18:14:22 +00:00
4d5f8e7876
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:48:46 -08:00
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
a4b3edaf40
Login actions don't show the notice form
2011-03-09 10:11:59 -05:00
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
55b4303ea4
Merge branch '3cl' into 1.0.x
2011-03-07 14:30:30 -05:00
382e4d2cdb
people tag actions
2011-03-07 00:43:31 +05:30
371e923c37
Twitter lists compatible people tags api
2011-03-07 00:36:06 +05:30
e9933871e5
* fix i18n and L10n issues.
...
* update translator documentation.
* remove superfluous whitespace.
2011-03-05 17:03:12 +01:00
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
b37e12ed34
* translator documntation updated
...
* superfluous whitespace remove
* minor L10n and i18n updates
2011-03-05 00:13:04 +01:00
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
d55a831d97
Update translator documentation.
2011-03-03 01:42:54 +01:00
399c83db87
Fix typo in documentation. Spotted by Nikerabbit.
2011-03-02 23:06:45 +01:00
8cacecb6dc
Use threaded replies in group inbox view
2011-03-01 16:29:11 -08:00
5bf0c9f610
Fix mising require_once (now required here because of rearranging)
2011-03-01 15:31:06 -08:00
243b396660
Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x
2011-03-01 15:26:02 -08:00
2fb8148788
Fix missing variable initialization
2011-03-01 15:25:06 -08:00
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
64a1c9e376
object menu for user profile
2011-03-01 16:23:19 -05:00
a1a0382d26
object menu on showgroup
2011-03-01 16:22:19 -05:00
374253f0f7
defaultlocalnav for favorites
2011-03-01 16:21:22 -05:00
55fa14baec
object menu in inviteaction
2011-03-01 16:20:14 -05:00
6ee77f1302
defaultlocalnav in groups
2011-03-01 16:18:33 -05:00
f29274cd0d
show defaultlocalnav in groupmembers
2011-03-01 16:17:42 -05:00
0c877860b5
show defaultlocalnav in grouplogo
2011-03-01 16:17:01 -05:00
4903c92dce
show defaultlocalnav in groupdesignsettings
2011-03-01 16:15:03 -05:00
0850c66a21
default local nav in featured user list
2011-03-01 16:11:59 -05:00
3c683ad7b5
default local nav in popular notices
2011-03-01 16:11:19 -05:00
4561caec10
show default local nav in group edit
2011-03-01 16:10:40 -05:00
737eb371f8
show full local nav in public tag cloud
2011-03-01 16:09:35 -05:00
85320a7561
show object nav for blocked users in a group
2011-03-01 16:08:49 -05:00
efdc85224a
user groups show subgroupnav in object menu area
2011-03-01 16:07:27 -05:00
3377bc2ccf
RepliesAction uses default local nav
2011-03-01 16:06:29 -05:00
64ab7b7d07
use default local nav for public action
2011-03-01 16:00:07 -05:00
8c03e8b0b3
use default local nav for allaction
2011-03-01 15:59:01 -05:00
b351fad43a
Merge branch '1.0.x' into inline-comments
2011-02-28 16:48:05 -08:00
e109b2592f
Merge branch '0.9.x' into 1.0.x
2011-02-28 16:41:24 -08:00
59a0b2a82d
Merge branch '1.0.x' of gitorious.org:statusnet/mainline into inline-comments
...
Conflicts:
js/util.min.js
2011-02-28 16:18:38 -08:00
f3ffc8bc46
Missed a couple of conflicts
2011-02-28 15:51:46 -08:00
b7d0746694
Merge branch '0.9.x' into 1.0.x
...
Conflicts:
actions/confirmaddress.php
actions/emailsettings.php
actions/hostmeta.php
actions/imsettings.php
actions/login.php
actions/profilesettings.php
actions/showgroup.php
actions/smssettings.php
actions/urlsettings.php
actions/userauthorization.php
actions/userdesignsettings.php
classes/Memcached_DataObject.php
index.php
lib/accountsettingsaction.php
lib/action.php
lib/common.php
lib/connectsettingsaction.php
lib/designsettings.php
lib/personalgroupnav.php
lib/profileaction.php
lib/userprofile.php
plugins/ClientSideShorten/ClientSideShortenPlugin.php
plugins/Facebook/FBConnectSettings.php
plugins/Facebook/FacebookPlugin.php
plugins/NewMenu/NewMenuPlugin.php
plugins/NewMenu/newmenu.css
2011-02-28 15:39:43 -08:00
d806907b81
Initial test threaded convo view inline on public, all timelines
2011-02-28 11:53:48 -08:00
dc41e3dc2d
API group actions join/leave now handle same events of web UI action
2011-02-28 11:56:02 +01:00
c246c17d3e
If there's a DB error, script returns after catching the exception
2011-02-28 11:53:11 +01:00
880b1b666e
Merge branch 'master' into 0.9.x
2011-02-25 12:24:18 -08:00
55b1f3d84c
Scalability work on user backup stream generation.
...
UserActivityStream -- used to create a full activity stream including subscriptions, favorites, notices, etc -- normally buffers everything into memory at once. This is infeasible for accounts with long histories of serious usage; it can take tens of seconds just to pull all records from the database, and working with them all in memory is very likely to hit resource limits.
This commit adds an alternate mode for this class which avoids pulling notices until during the actual output. Instead of pre-sorting and buffering all the notices, empty spaces between the other activities are filled in with notices as we're making output. This means more smaller queries spread out during operations, and less stuff kept in memory.
Callers (backupaccount action, and backupuser.php) which can stream their output pass an $outputMode param of UserActivityStream::OUTPUT_RAW, and during getString() it'll send straight to output as well as slurping the notices in this extra funky fashion.
Other callers will let it default to the OUTPUT_STRING mode, which keeps the previous behavior.
There should be a better way to do this, swapping out the stringer output for raw output more consitently.
2011-02-25 12:15:38 -08:00
59a413cf5e
Merge branch 'master' into 0.9.x
2011-02-25 10:16:00 -08:00
f3c822cc15
Ticket #3011 : Add attachments/uploads and attachments/file_quota to api/statusnet/config.(xml|json)
...
file_quota is adjusted from the defined value to take into account the maximum upload size limits in PHP, or cropped to 0 if uploads are disabled.
This can be used by client apps to determine maximum size for an attachment.
2011-02-21 15:52:12 -08:00
8e7c279c9e
Fix issue #3035 : search highlighting broke URLs in some imported messages (Twitter)
...
Search highlighting was being done with a regex on raw HTML text, followed by a second regex undoing replacements within double-quoted attribute values.
This broke on imported Twitter messages, as the way we generate the markup uses single quotes on the attributes, which didn't get matched by the second regex.
I've replaced this do-then-undo cycle by dividing up the import HTML into freetext spans and tags; the freetext gets replaced, while the tags are left untouched.
2011-02-21 14:14:32 -08:00
68017392ff
Make other timeline API endpoints output Activity Streams JSON
2011-02-18 15:43:40 -08:00
e98e443605
Merge branch '0.9.x' into json-activities
...
* 0.9.x:
* update translator documentation. * remove superfluous whitespace. * tab to spaces. * add FIXME for undocumented class.
* update translator documentation. * remove superfluous whitespace. * L10n updates. * small refactoring in publicrss.php. * remove PHP4-isms
Localisation updates from http://translatewiki.net .
Double quotes to single quotes.
* improve L10n consistency for English. For example proper punctuation for all button and label titles. * fix some i18n bugs (in-message variables). * update/add translator documentation. * remove superfluous whitespace.
add path separators for Plugin::path()
argument to send email summary to all users on all sites
fix indentation in siteemailsummaryhandler
fix indentation in sendemailsummary.php
fix indentation in Email_summary_status.php
fix indentation in EmailSummaryPlugin.php
fix indentation in usermailsummaryhandler.php
2011-02-17 19:11:29 -08:00
6a1b0e2375
* update translator documentation.
...
* remove superfluous whitespace.
* tab to spaces.
* add FIXME for undocumented class.
2011-02-17 21:10:48 +01:00
65045a26f3
* update translator documentation.
...
* remove superfluous whitespace.
* L10n updates.
* small refactoring in publicrss.php.
* remove PHP4-isms
2011-02-17 20:58:22 +01:00
db4213a9e0
Double quotes to single quotes.
2011-02-17 09:58:07 +01:00
e4d5c47ebf
Add image to JSON ActivityObject and title + links to the JSON document
2011-02-16 16:21:46 -08:00
a159352b65
* improve L10n consistency for English. For example proper punctuation for all button and label titles.
...
* fix some i18n bugs (in-message variables).
* update/add translator documentation.
* remove superfluous whitespace.
2011-02-17 00:40:47 +01:00
Evan Prodromou
Siebrand Mazeland
Zach Copley
Shashi Gowda
Sam Nicholls
Brion Vibber
macno