Commit Graph

11632 Commits

Author SHA1 Message Date
Brion Vibber
ea4ebe280a Merge branch 'testing' into filesize 2011-01-26 15:53:05 -08: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
625405910f Merge branch 'testing' of gitorious.org:statusnet/mainline into testing 2011-01-26 14:59:35 -08:00
Brion Vibber
c65480fb33 Fix ticket #3016: when using non-AJAX form of the ostatus subscription initiation for non-local group joins, show the "group" field instead of a blank "user" field 2011-01-26 14:59:24 -08:00
Brion Vibber
ee9e368aa8 Fix ticket #3016: when using non-AJAX form of the ostatus subscription initiation for non-local group joins, show the "group" field instead of a blank "user" field 2011-01-26 14:57:52 -08:00
Zach Copley
f6cb4ea58d Add IdentiCurse to notice sources 2011-01-26 10:51:44 -08:00
Zach Copley
73011e6344 Add IdentiCurse to notice sources 2011-01-26 10:50:53 -08:00
Zach Copley
c0bb1a5798 Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.x
* '0.9.x' of gitorious.org:statusnet/mainline: (102 commits)
  Fix for ticket #3010: blocks are now applied against the original poster of repeats.
  Fix XML API output for several profile update methods that returned a <user> entry but didn't set namespaces, causing XML parse failures.
  Fix for ticket #3007: .bmp avatar uploads weren't being properly converted to PNG in all cases
  Bookmark saving robustness fixes
  remove boilerplate from NewMenuPlugin
  Localisation updates from http://translatewiki.net.
  L10n consistency updates in wording and punctuation. Translator documentation added/updated. Superfluous whitespace removed.
  Add translator documentation Fix L10n issues Remove superfluous whitespace
  Add correct punctuation for client exceptions.
  Add correct punctuation for client exception.
  Add correct punctuation for client exception.
  Add email field to Twitter registration form; needed when RequireValidatedEmail plugin is present.
  Add email field on openid registration; needed to register if RequireValidatedEmail plugin is also present.
  Event hook points needed for recaptcha on facebook login form (untested, but should be legit -- same adds as openid & twitter reg forms)
  Event hook points needed to run Recaptcha on Twitter registration
  Fix inconsistent use of 'name' vs 'fullname' in tw_fields member variable
  Add Start/EndRegistrationData event hooks in finishopenidlogin: allows recaptcha to add its captcha display to the form (checked since addition of StartRegistrationTry)
  Ticket #2999: RequireValidatedEmail plugin now also prevents group creation by unvalidated users.
  Localisation updates from http://translatewiki.net.
  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-26 10:50:05 -08:00
Zach Copley
8535f4b073 Add IdentiCurse to notice sources 2011-01-26 10:49:14 -08:00
Brion Vibber
9fcad91d8d Ticket #3014: check upload size limits client-side in supporting browsers
Tested successfully in:
* Firefox 4.0b9
* Safari 5.0.5
* Chrome 8.0.522
2011-01-25 16:26:56 -08:00
Samantha Doherty
1563c95cc3 Wee style update for bookmarks plugin. 2011-01-25 18:33:47 -05:00
Samantha Doherty
8bc296bdbb A few wee fixes for rebase and shiny themes. 2011-01-25 18:32:12 -05:00
Samantha Doherty
0fc46d1629 Rounded corner fixes for base theme. 2011-01-25 18:29:07 -05:00
Brion Vibber
621a7cb36d Merge branch '0.9.x' into testing 2011-01-25 12:57:49 -08:00
Brion Vibber
e35d46b415 Fix for ticket #3010: blocks are now applied against the original poster of repeats.
Previously, if someone you subscribe to repeats a notice by someone you've blocked, you got the message and had to just roll your eyes.
Now blocks are checked against both the current notice's posting profile, and the poster of the original if it's a repeat.
2011-01-24 14:16:15 -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
c309bbae93 Merge remote branch 'gitorious/testing' into testing 2011-01-24 06:54:09 -07:00
Evan Prodromou
c2d7a08d07 Bookmark saving robustness fixes
First, if the tags box is empty, don't save an empty tag for the notice.

Second, if URL shortening fails, just use the regular URL.
2011-01-23 12:57:20 -05:00
Evan Prodromou
b72fe00ae3 remove boilerplate from NewMenuPlugin 2011-01-23 12:03:28 -05:00
Siebrand Mazeland
4642b024cc Localisation updates from http://translatewiki.net. 2011-01-22 20:17:19 +01: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
1f4b63d533 Add email field to Twitter registration form; needed when RequireValidatedEmail plugin is present.
Since Twitter doesn't provide email address back to us here, we only prefill the field if we have an invite.
2011-01-20 17:02:34 -08:00
Brion Vibber
06d895ee67 Add email field on openid registration; needed to register if RequireValidatedEmail plugin is also present. 2011-01-20 16:56:48 -08:00
Brion Vibber
ddde99cd89 Event hook points needed for recaptcha on facebook login form (untested, but should be legit -- same adds as openid & twitter reg forms) 2011-01-20 15:55:36 -08:00
Brion Vibber
c1e4be6ab9 Event hook points needed to run Recaptcha on Twitter registration 2011-01-20 15:49:57 -08:00
Brion Vibber
7a9040e360 Fix inconsistent use of 'name' vs 'fullname' in tw_fields member variable 2011-01-20 15:47:51 -08:00
Brion Vibber
7dc9d9c1fe Add Start/EndRegistrationData event hooks in finishopenidlogin: allows recaptcha to add its captcha display to the form (checked since addition of StartRegistrationTry) 2011-01-20 15:40:59 -08:00
Brion Vibber
6fa0bea76d Merge branch '0.9.x' into testing 2011-01-20 15:12:57 -08:00
Brion Vibber
6455461c19 Merge branch 'master' into 0.9.x 2011-01-20 15:08:31 -08:00
Brion Vibber
7c3f820ff0 Ticket #2999: RequireValidatedEmail plugin now also prevents group creation by unvalidated users. 2011-01-20 13:05:58 -08:00
Siebrand Mazeland
03acf301ba Localisation updates from http://translatewiki.net. 2011-01-20 21:12:51 +01: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
Zach Copley
05361bb686 OAuth: Fix rare problem in which request tokens were sometimes being
returned as access tokens.
2011-01-20 10:44:31 -08:00
Zach Copley
28d40e5eed Fix syntax error in error msg 2011-01-20 10:44:18 -08:00
Zach Copley
3a24b95edb Fix a couple spelling mistakes in comments and remove redundant statement terminator 2011-01-20 10:44:05 -08:00
Zach Copley
6dc94a5389 Move getConnectedApps() from Profile to User, where it belongs
Conflicts:

	classes/User.php
2011-01-20 10:43:27 -08: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
114d9ebf28 Fix a couple spelling mistakes in comments and remove redundant statement terminator 2011-01-19 22:59:51 -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
Zach Copley
6eca8188b6 Fix a couple spelling mistakes in comments and remove redundant statement terminator 2011-01-19 15:52:18 -08:00