Commit Graph

3109 Commits

Author SHA1 Message Date
Siebrand Mazeland
f2d7c33ad3 Update translator documentation.
Remove superfluous whitespace.
Various L10n/i18n updates.
2011-03-29 21:30:35 +02:00
Evan Prodromou
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
Evan Prodromou
7b8fc701e0 don't show notices to out-of-scope viewers 2011-03-28 22:21:41 -04:00
Evan Prodromou
e862dcdb8a Merge branch '1.0.x' into limitdist2 2011-03-28 21:56:34 -04:00
Brion Vibber
e5b5c256a3 Working subscription approval! 2011-03-28 17:08:04 -07:00
Brion Vibber
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
Brion Vibber
11b40ddb1b work in progress... 2011-03-28 13:59:48 -07:00
Evan Prodromou
798b03fb5f set default address for showstream 2011-03-28 16:24:28 -04:00
Evan Prodromou
a7380d5933 set default address for showgroup 2011-03-28 16:24:17 -04:00
Evan Prodromou
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
Siebrand Mazeland
52d29a17a0 Fix incorrect translator documentation. Spotted by AVRS. 2011-03-28 01:43:01 +02:00
Evan Prodromou
889b35be9c Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x 2011-03-27 11:26:57 -04:00
Evan Prodromou
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
Siebrand Mazeland
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
Siebrand Mazeland
074be0d51e i18n fixes.
Translator documentation updates.
2011-03-25 17:12:53 +01:00
Siebrand Mazeland
e0cccfc40d Translator documentation updated.
i18n/L10n updates.
Superfluous whitespace removed.
Add FIXME for missing class documentation.
2011-03-24 12:09:50 +01:00
Siebrand Mazeland
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
Siebrand Mazeland
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
Brion Vibber
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
Evan Prodromou
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
Shashi Gowda
13e9e41d2f Blend in with some new code. New menus, etc. 2011-03-22 08:30:16 +05:30
Shashi Gowda
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
Shashi Gowda
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
Brion Vibber
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
Brion Vibber
6bdb1053ad Pending members queue list -- doesn't yet allow approval. 2011-03-21 16:40:10 -07:00
Brion Vibber
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
Brion Vibber
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
Brion Vibber
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
Siebrand Mazeland
84e5ca6158 Translator documentation added/updated.
Superfluous whitespace removed.
L10n update.
2011-03-18 20:37:04 +01:00
Siebrand Mazeland
902990bb72 Add myself to contributors array. 2011-03-18 20:15:57 +01:00
Siebrand Mazeland
7ef8bd9275 i18n updates.
Translator documentation added.
Superfluous whitespace removed.
2011-03-18 20:12:59 +01:00
Siebrand Mazeland
8a2002afe7 Translator documentation added/updates.
L10n/i18n updates.
Superfluous whitespace removed.
2011-03-18 17:04:38 +01:00
Siebrand Mazeland
b7178d2197 Merge branch '1.0.x' of git://gitorious.org/statusnet/mainline into 1.0.x 2011-03-18 16:09:27 +01:00
Siebrand Mazeland
0de0ae2f48 Update/add translator documentation.
L10n/i18n updates.
Superfluous whitespace removed.
2011-03-18 13:48:47 +01:00
Siebrand Mazeland
6f9c277494 * Add FIXME: $profile appears to be undefined.
* Update translator documentation.
2011-03-18 13:10:55 +01:00
Brion Vibber
4afa3caae3 ajax load for additional inline replies; /replies variant of conversationview 2011-03-17 16:27:42 -07:00
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
Shashi Gowda
382e4d2cdb people tag actions 2011-03-07 00:43:31 +05:30
Shashi Gowda
371e923c37 Twitter lists compatible people tags api 2011-03-07 00:36:06 +05:30
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
Brion Vibber
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
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
Brion Vibber
d806907b81 Initial test threaded convo view inline on public, all timelines 2011-02-28 11:53:48 -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
Siebrand Mazeland
691f374a52 * Add/update translator documentation.
* Update punctuation in form validation message for consistency.
* Remove superfluous whitespace.
2011-01-30 19:01:55 +01:00
Siebrand Mazeland
7db24c32d6 * fix some i18n and L10n issues
* update/add translator documentation
* remove superfluous whitespace
2011-01-29 00:33:13 +01:00
Evan Prodromou
5fee38b025 events for modifying group edit form 2011-01-26 18:21:43 -07:00
Brion Vibber
54e98ffe22 Fix ticket #3013: MAX_FILE_SIZE hidden fields were incorrectly placed
In order to apply to PHP's POST processing, the MAX_FILE_SIZE field must appear *before* the file upload field. They were incorrectly placed after, where they had no effect on POST processing.
2011-01-26 15:49:57 -08:00
Brion Vibber
621a7cb36d Merge branch '0.9.x' into testing 2011-01-25 12:57:49 -08:00
Brion Vibber
0a3c05feb0 Fix XML API output for several profile update methods that returned a <user> entry but didn't set namespaces, causing XML parse failures. 2011-01-24 12:41:30 -08:00
Brion Vibber
820dd293c9 Fix for ticket #3007: .bmp avatar uploads weren't being properly converted to PNG in all cases
Part of the reported issue was previuosly fixed by dc497ed0 (smaller size images being blanked).
This commit fixes the remaining bug with original-size avatars being left as BMP (which could include the 96px size for instance, which could cause problems in browsers not supporting BMP natively)

Added ImageFile::copyTo() as a convenient alias for resizeTo() when not resizing; this performs the BMP/XPM/XBM->PNG conversion if needed, or copies the original file.
Copying instead of using move_uploaded_file() is fine here since:
a) the files are cleaned up on script completion anyway (vs moving to remove it)
b) we're already performing getimagesize() and possibly load/resize on the file before this point (vs needing to move the file into a usable area to work with open_basedir restrictions that prevent working directly with uploaded files in the temp dir; since this would fail anyway, we lose nothing)

ImageFile::preferredType() now works on $this->type instead of asking for one, to make it handier to use from outside. (This is still needed in order for calling code to generate a target filename.)

Recommended for future:
* additional consolidation between the various ways of uploading avatars (touched avatarsettings, grouplogo, and apiaccountupdateprofileimage with similar minor changes)
* consolidate type checks and file naming into Avatar class
2011-01-24 12:22:47 -08:00
Evan Prodromou
570c7b63a2 Add internal URL shortener 2011-01-23 16:49:12 -05:00
Evan Prodromou
592e2be5e1 Make new menu the default menu
There's a new menu layout in this version of the software. It was
implemented as a plugin in 0.9.x to avoid clashes with existing themes,
but we're going to break that compatibility in this version, so we're just going for it.

This change involved moving all the changes in NewMenuPlugin into the
default code that was calling it. In addition, since
accountsettingsaction and connectsettingsaction differed only by menu,
I removed them, changed all references to them to the settingsmenu, and moved
the combined nav to its own class.

Let's put that episode behind us.

The CSS shim that was loaded by NewMenuPlugin for certain themes and certain actions
was removed.
2011-01-23 12:35:35 -05:00
Siebrand Mazeland
6c0e43be9e L10n consistency updates in wording and punctuation.
Translator documentation added/updated.
Superfluous whitespace removed.
2011-01-21 22:45:37 +01:00
Siebrand Mazeland
08cb576b52 Add translator documentation
Fix L10n issues
Remove superfluous whitespace
2011-01-21 16:35:00 +01:00
Siebrand Mazeland
bcd34a7f3c Add correct punctuation for client exceptions. 2011-01-21 10:55:10 +01:00
Siebrand Mazeland
ee5479b902 Add correct punctuation for client exception. 2011-01-21 10:55:08 +01:00
Siebrand Mazeland
31895ba33a Add correct punctuation for client exception. 2011-01-21 10:55:07 +01:00
Brion Vibber
6fa0bea76d Merge branch '0.9.x' into testing 2011-01-20 15:12:57 -08:00
Siebrand Mazeland
91ee2ea3b1 Translator comments added
L10n updates
Remove superfluous whitespace
Number parameters in message when two or more are used
ClientException and ServerException should end with a period
2011-01-20 20:00:45 +01:00
Siebrand Mazeland
6658bd1893 Update translator documentation
Remove unneeded i18n for debug message
Remove superfluous whitespace
2011-01-20 18:45:13 +01:00
Siebrand Mazeland
26652d9be6 Update translator documentation
Update L10n
Remove superfluous whitespace
2011-01-20 18:40:20 +01:00
Zach Copley
882b6862a3 OAuth: Fix rare problem in which request tokens were sometimes being
returned as access tokens.
2011-01-19 23:00:24 -08:00
Zach Copley
28f10ac528 Fix syntax error in error msg 2011-01-19 23:00:10 -08:00
Zach Copley
1543af748c Merge branch 'testing' of gitorious.org:statusnet/mainline into testing
* 'testing' of gitorious.org:statusnet/mainline: (63 commits)
  Add a scary 'experimental feture' warning & are-you-sure prompt on moveuser.php
  fix wrong datatypes (saving string instead of array) in AtomPub notice processing
  Account moving is a background activity
  return a 409 Conflict when subscription already exists
  OStatusPlugin does discovery in Profile::fromURI()
  considerably more logging and error checking in AccountMover
  add a log method to AccountMover
  normalize accounts and check for return in HTTP for moving
  move account-moving classes to their own libraries
  execution protection on discovery.php
  PHPCS discovery.php
  Move discovery library from OStatus plugin to core
  Revert "Revert "0.9.7alpha1""
  first example of moving a user
  Parse properties of links in XRD files
  Add the Atom username to the XRD output
  preserve activities in object
  let callers pass in an XMLOutputter to output to
  execution protection on discovery.php
  PHPCS linkheader.php
  ...
2011-01-19 22:58:07 -08:00
Zach Copley
e475bdfe77 OAuth: Fix rare problem in which request tokens were sometimes being
returned as access tokens.
2011-01-19 22:55:00 -08:00
Zach Copley
a79427d86f Fix syntax error in error msg 2011-01-19 16:13:42 -08:00
Brion Vibber
4026e208c2 Add a scary 'experimental feture' warning & are-you-sure prompt on moveuser.php
As with deleteuser.php, can pass -y to bypass the prompt if you're sure.
2011-01-19 15:13:46 -08:00
Brion Vibber
64844473f8 fix wrong datatypes (saving string instead of array) in AtomPub notice processing 2011-01-19 14:26:31 -08:00
Brion Vibber
963e7576f2 Merge branch 'testing' into moveaccount 2011-01-19 10:41:14 -08:00
Evan Prodromou
aa4a8e5051 wrap account actions in a section 2011-01-17 18:04:10 -05:00
Evan Prodromou
2a59453d4c Merge branch 'testing' into moveaccount 2011-01-17 17:34:03 -05:00