Commit Graph

2937 Commits

Author SHA1 Message Date
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
Zach Copley
e109b2592f Merge branch '0.9.x' into 1.0.x 2011-02-28 16:41:24 -08:00
Zach Copley
f3ffc8bc46 Missed a couple of conflicts 2011-02-28 15:51:46 -08:00
Zach Copley
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
macno
dc41e3dc2d API group actions join/leave now handle same events of web UI action 2011-02-28 11:56:02 +01:00
macno
c246c17d3e If there's a DB error, script returns after catching the exception 2011-02-28 11:53:11 +01:00
Brion Vibber
880b1b666e Merge branch 'master' into 0.9.x 2011-02-25 12:24:18 -08:00
Brion Vibber
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
Brion Vibber
59a413cf5e Merge branch 'master' into 0.9.x 2011-02-25 10:16:00 -08:00
Brion Vibber
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
Brion Vibber
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
Zach Copley
68017392ff Make other timeline API endpoints output Activity Streams JSON 2011-02-18 15:43:40 -08:00
Zach Copley
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
Siebrand Mazeland
6a1b0e2375 * update translator documentation.
* remove superfluous whitespace.
* tab to spaces.
* add FIXME for undocumented class.
2011-02-17 21:10:48 +01:00
Siebrand Mazeland
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
Siebrand Mazeland
db4213a9e0 Double quotes to single quotes. 2011-02-17 09:58:07 +01:00
Zach Copley
e4d5c47ebf Add image to JSON ActivityObject and title + links to the JSON document 2011-02-16 16:21:46 -08:00
Siebrand Mazeland
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
Zach Copley
a1b436a8c6 First cut at some JSON Activity Streams output 2011-02-15 20:25:39 -08:00
Evan Prodromou
2b869fa23f Merge remote branch 'origin/master' 2011-02-14 12:41:52 -05:00
Evan Prodromou
40533ee851 backup action is read-only 2011-02-14 12:41:20 -05:00
Brion Vibber
30eddaf168 Update translator comment for the url shortener "free service" marker: free as in open 2011-02-11 14:11:37 -08:00
Evan Prodromou
e903ff0525 Make ShowmessageAction not be a subclass of MailboxAction
The ShowmessageAction was using the MailboxAction to do its display of
a single direct message. Since we redid the nickname management, this
was breaking (MailboxAction requires a nickname argument,
ShowmessageAction does not, and nickname validation that used to
quietly fail now throws an exception).

I've moved the message list processing to its own widget class, so the
need to subclass MailboxAction has disappeared. I've rewritten this
action to use the MessageListItem widget, and it works fine now.
2011-02-08 11:33:36 -05:00
Evan Prodromou
f500d4ea5b Create and use MessageList widget
Our mailbox actions (inbox and outbox) were doing their own display of
messages. This was causing issues with especially showmessage, which
since the more rigourous nickname checks were added, no longer works as
a mailbox subclass.

I've taken the time to rip out the message listing code from MailboxAction
and moved it to a MessageList widget. The different mailboxes now have their
own subclasses that show the correct profile in the list.
2011-02-08 11:11:21 -05:00
Evan Prodromou
b41816fdc1 add hooks for Group profile information 2011-02-07 14:04:58 -05:00
Evan Prodromou
8b20399932 Add a hook for group action list 2011-02-07 10:23:56 -05:00
Evan Prodromou
2cdba23df4 hook for new group through a form, same as editing 2011-02-03 16:19:41 -05:00
Evan Prodromou
99db745f9d Merge branch 'testing' into privategroup
Conflicts:
	lib/groupeditform.php
2011-02-03 12:56:55 -05:00
Brion Vibber
b46ce3b67d Fix "$s"s that slipped into double-quoted translatable strings' '%1$s' pattern. Switch to single-quote to fix. 2011-01-31 14:00:22 -08:00
Brion Vibber
9573f725c1 Merge branch '0.9.x' into testing 2011-01-31 11:08:15 -08:00
Siebrand Mazeland
f41dcb644c Update translator documentation, remove FIXME and add comment. 2011-01-31 18:43:39 +01:00
Siebrand Mazeland
13991f7eb9 * add/update translator documentation.
* remove superfluous whitespace.
* update punctuation on form validation messages.
* L10n tweaks.
* add fixme for missing class documentation.
2011-01-31 18:16:55 +01:00
Siebrand Mazeland
dd5721848f * tag i18n issue.
* add translator documentation.
* remove superfluous whitespace.
2011-01-31 17:12:39 +01:00
Siebrand Mazeland
8f776ec12d * update/add translator documentation.
* fix L10n issues.
* update comments and tag missing documentation on some classes.
* remove superfluous whitespace
*
2011-01-31 16:39:54 +01:00