Commit Graph

2647 Commits

Author SHA1 Message Date
Zach Copley 4e8e77f6b0 Return HTTP 403 instead of 400 when silenced users try to post via API 2010-07-29 18:47:28 +00:00
Eric Helgeson 9b899eea75 Make some messages gender neutral. 2010-07-19 21:09:09 -05:00
Zach Copley 923d9ef71c - Fix bugs with block and friendship API methods
- Friendship API methods now use a Profile instead of User for target
2010-06-28 16:54:39 -07:00
Brion Vibber 696e4ba393 Merge branch 'testing' of gitorious.org:statusnet/mainline into 0.9.x
Conflicts:
	plugins/OpenID/openidserver.php (cleaned up mismatched comment)
2010-06-26 10:17:36 -04:00
Brion Vibber d9e56e15cc Merge branch 'master' into testing 2010-06-26 10:16:27 -04:00
Zach Copley 9eb5a976b0 Have API methods for search subclass ApiPrivateAuthAction 2010-06-24 18:11:50 -07:00
Brion Vibber 9d890e2be0 Catch a couple of missing XML namespace declarations on API XML output. Missing NS declarations were breaking XML parsing for some clients since beaecb18d5 2010-06-18 09:59:11 -07:00
Zach Copley d3d499879c - More useful group info from api/statusnet/group/show
- Add statusnet:group_info tag to group Atom feeds
2010-06-16 14:29:24 -07:00
Brion Vibber 7f3b3620af Merge branch 'testing' of gitorious.org:statusnet/mainline into 0.9.x 2010-06-11 12:05:53 -07:00
Brion Vibber 47665e845a Merge branch 'testing' of gitorious.org:statusnet/mainline into testing 2010-06-11 12:04:03 -07:00
Brion Vibber 352a3edfb3 Ticket #2350: fix for incorrect FOAF sioc:follows entries for users who are followed by, but don't themselves follow the user whose FOAF we're displaying. 2010-06-10 11:42:58 -07:00
Brenda Wallace 5afd07e5e8 added missing author 2010-06-08 16:46:32 +12:00
Brenda Wallace 4617545ece added missing authors 2010-06-08 16:34:16 +12:00
Brenda Wallace dc0f7189f2 added missing authors 2010-06-08 16:32:53 +12:00
Brion Vibber 09208f8d65 Basic custom CSS and theme uploading features. 'local' subdir can now be customized to a distinct directory and URL path to make it easier to separate custom themes for a multi-site farm running a common code base.
Currently only one custom theme may be uploaded per site, saved with the name 'custom' and stored into the local/themes subdirectory.
Administrators can upload a .ZIP archive containing a theme through the design admin panel; its contents are validated to ensure that only legit files are saved, and a 5M size quota is enforced.
Theme upload requires the zip extension for PHP; if not present, theme uploading is disabled by default.

Uploading and the custom CSS can be controlled via $config['theme_upload']['enabled'] and $config['custom_css']['enabled'].

Configurable directory/path/server for 'local' subdirectory (currently only as used for themes; local plugins not yet switched over)

Can set $config['local']['dir'] etc; not currently exposed in the admin panels.

Per-site directories on a separate themes server could be set up such as:
  $config['local']['dir'] = '/path/to/themes/local/' . $_nickname;
  $config['local']['server'] = 'themes.example.com';
  $config['local']['path'] = '/local/' . $_nickname;
  $config['local']['ssl'] = 'never';
2010-06-07 18:14:16 -07:00
Brion Vibber 8e33cdd36a break up the giant form function in design admin panel into individual sections to make it a little more manageable 2010-06-07 18:14:15 -07:00
Brion Vibber d88b208edc Merge branch 'testing' of gitorious.org:statusnet/mainline into 0.9.x
Conflicts:
	plugins/OpenID/openid.php
2010-06-07 10:19:40 -07:00
Evan Prodromou 135b398d4b Merge branch 'master' of gitorious.org:statusnet/mainline 2010-06-03 14:50:52 -04:00
Zach Copley 4bbb259baf - Fix bad argument being passed (error code) when invalid format specified
- Reformat whitespace
2010-06-03 10:52:16 -07:00
Evan Prodromou a5de215267 Merge branch 'master' of gitorious.org:statusnet/mainline 2010-06-01 13:51:41 -07:00
Brion Vibber 3ba165cfab Merge branch 'master' into testing 2010-05-28 16:18:40 -07:00
Zach Copley cef302cacd Bugfix: api/statuses/destroy.:format was outputting deleted notice
twice, causing parsers to fail.
2010-05-28 06:24:10 +00:00
Craig Andrews 6317f7d92b Assigning my copyrights to the Free Software Foundation 2010-05-27 18:27:33 -04:00
Brion Vibber 696aeea113 Merge branch 'testing' of gitorious.org:statusnet/mainline into 0.9.x
Conflicts:
	lib/language.php
	plugins/OpenID/finishaddopenid.php
2010-05-27 14:57:32 -07:00
Brion Vibber 2f2fa10071 Merge branch 'master' of gitorious.org:statusnet/mainline into testing 2010-05-27 14:54:43 -07:00
Zach Copley c5b61078e1 Pass auth user into Atom feed generators (needed for outputting favorited status in statusnet:notice_info tag) 2010-05-27 13:49:23 -07:00
Evan Prodromou 6d8e01ad13 Merge branch 'master' of gitorious.org:statusnet/mainline 2010-05-21 16:47:57 -04:00
Brion Vibber 6eae5d6a7e Merge branch 'testing' into 0.9.x 2010-05-21 13:15:08 -07:00
Brion Vibber 87b8a89aa7 Merge branch 'master' of gitorious.org:statusnet/mainline into testing 2010-05-21 13:12:25 -07:00
Brion Vibber 68305d4b68 Added block link to subscription notification emails; block action can now take a profile ID on the URL; added profile details to block page so there's an indication of who you're blocking before you pull the trigger.
Fixed typo in RedirectingAction when no return-to data provided in form submission.
RedirectingAction::returnToArgs() has been renamed to returnToPrevious() to avoid conflict with Action::returnToArgs() which returns arguments to be passed to other actions as return-to arguments. All callers should now be updated.
More profile settings actions will now redirect through a login form if visited as a GET request, as would be expected from a bookmark, link sent in e-mail etc.
2010-05-20 14:24:44 -07:00
Brion Vibber 7005ef6661 Merge branch 'testing' into 0.9.x
Conflicts:
	plugins/OpenID/openidlogin.php
2010-05-19 12:51:25 -07:00
Brion Vibber a39a934dd4 Merge branch 'master' of gitorious.org:statusnet/mainline into testing 2010-05-19 10:59:14 -07:00
Zach Copley 5ea019c41a Remove errant double HTML entity encoding in API source attribution 2010-05-18 15:16:23 -07:00
Zach Copley 0dfef88cac HTML entity encode source link URLs in plain XML output and add rel="nofollow" to them 2010-05-18 15:15:52 -07:00
Zach Copley c78f67aa73 Refactor and centralize notice source link calculation 2010-05-18 15:15:27 -07:00
Brion Vibber 14a76926a2 Redirect non-SSL hits to login & register actions to SSL if 'always' or 'sometimes' SSL modes are kicked in.
The forms would already submit to SSL, but people are happier if they start on a secure page!

Note: this really should be done for sensitive/all URLs in index.php, but it seems a bit awkward to reconstruct the SSL version of the link atm. Cleanup todo!
2010-05-18 21:52:17 +00:00
James Walker 6da59fab58 invalid mbox_sha1sum in the case where users don't have an email address
(reported by pedantic-web.org)
2010-05-18 10:09:16 -04:00
Brion Vibber 065ecc5573 Merge branch 'testing' into 0.9.x 2010-05-14 12:14:02 -07:00
Brion Vibber 2e808fdc82 More direct text for registration licensing/tos checkbox for private and all-rights-reserved sites. 2010-05-13 16:47:58 -07:00
Zach Copley fba140f4e0 Fix for repeats from the API having null source attribution 2010-05-08 00:07:42 +00:00
Zach Copley 3c9686e80f Fix for repeats from the API having null source attribution 2010-05-07 16:32:24 -07:00
Zach Copley 869bc32d0d Remove errant double HTML entity encoding in API source attribution 2010-05-06 21:48:12 +00:00
Zach Copley 209fd12cd0 HTML entity encode source link URLs in plain XML output and add rel="nofollow" to them 2010-05-06 21:48:12 +00:00
Zach Copley 22fde00def Refactor and centralize notice source link calculation 2010-05-06 21:48:11 +00:00
Brion Vibber e05415f621 Merge branch 'testing' of gitorious.org:statusnet/mainline into 0.9.x
Conflicts:
	locale/ca/LC_MESSAGES/statusnet.po
	locale/de/LC_MESSAGES/statusnet.po
	locale/statusnet.pot
2010-05-05 17:07:50 -07:00
Zach Copley b50f300566 Implement since_id and max_id param handling for /api/favorites 2010-05-05 14:46:36 -07:00
Evan Prodromou 3f2c805652 Merge branch 'master' of gitorious.org:statusnet/mainline 2010-04-30 15:00:55 -04:00
Zach Copley f852a1931b Add docs for public_timeline 2010-04-22 15:48:58 -07:00
Zach Copley 1b561065b0 Some initial Doxygen-based documentation for the API 2010-04-22 13:11:49 -07:00
Evan Prodromou beaecb18d5 Add statusnet: prefix for API to JSON and XML output
I added the statusnet: prefix to the xml output. This prefix should
be declared on the root element of all relevant XML output.

I also added two StatusNet-specific fields:

* statusnet:html - rendered HTML. Clients shouldn't have to guess
  at the correct HTML rendering for notices, especially since some
  of the links depend on context.
* statusnet:profile_url - profile URL for a user. You can't count
  on a user being a local user in a distributed microblogging world.
  So, this shows the explicit profile_url.
2010-04-22 08:49:33 -07:00
Brion Vibber fee6b78e28 Merge branch 'testing' into 0.9.x 2010-04-19 18:47:56 +02:00
Brion Vibber 369885f04f Merge branch 'master' into testing 2010-04-19 18:47:11 +02:00
Brion Vibber e547a2f54c Fix ticket #2289: registration links were showing in top nav bar, login page message when site set to invite-only or closed registration, when the 'register' action can't be used. 2010-04-19 18:45:50 +02:00
Siebrand Mazeland 7ace3156ca Add translator documentation.
Fixed a few inconsistencies in the process. Confused about the e-mail related messages in the code.
2010-04-11 23:24:38 +02:00
Siebrand Mazeland 97ee2c2f12 Fix a typo and small error in translator documentation 2010-04-11 23:22:36 +02:00
Siebrand Mazeland 76d3fdacae Add translator documentation.
Fixed a few inconsistencies in the process. Apparently this code has been copied to imsettings.php, and some cases of 'email' had not been changed to 'IM'. Added FIXME for using globals/macros (?) in messages like "%%site.name%%". For easier/more consistent translation, this should preferably be plain %s parameters.
2010-04-11 22:37:03 +02:00
Siebrand Mazeland 69eebc1ec8 Add translator documentation for uses of 'Yes' and 'No' in the interface. 2010-04-11 21:04:07 +02:00
Brion Vibber 1eeb23e1e3 Merge branch 'testing' of gitorious.org:statusnet/mainline into 0.9.x
Conflicts:
	actions/confirmaddress.php
2010-04-10 17:56:11 -07:00
Siebrand Mazeland 19b86da426 Lower case "Web" 2010-04-11 01:03:06 +02:00
Siebrand Mazeland 518832da28 Document messages for which clarification was requested. 2010-04-10 01:48:16 +02:00
Siebrand Mazeland c15549ff5a Fix double space in message 2010-04-10 01:47:27 +02:00
Siebrand Mazeland 166c1edba9 Fix inconsistencies in clientError() messages
* use correct punctuation
* single quotes when replace was possible
* wording updated when needed
2010-04-09 16:11:20 -07:00
Siebrand Mazeland 8dda28d374 Merge branch '0.9.x' of git://gitorious.org/statusnet/mainline into 0.9.x 2010-04-10 00:59:21 +02:00
Siebrand Mazeland 3656a2cb13 Fix inconsistencies in clientError() messages
* use correct punctuation
* single quotes when replace was possible
* wording updated when needed
2010-04-10 00:58:57 +02:00
Siebrand Mazeland 5c6c9b6f5f Update message formatting for serverError to use a starting capital and a leading period. 2010-04-09 15:29:41 -07:00
Brion Vibber 58d5d7baee Clean up badly formatted strings in OembedAction 2010-04-09 15:29:25 -07:00
Brion Vibber 7303acf7ad Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x 2010-04-09 15:20:14 -07:00
Brion Vibber ae4ade53a8 Fix E_NOTICE and use of limit on userrss 2010-04-09 15:19:04 -07:00
Siebrand Mazeland 47eed2c999 Update message formatting for serverError to use a starting capital and a leading period. 2010-04-10 00:07:20 +02:00
Brion Vibber 85fb32a359 Ticket #946: annotate use of singular 'them' in invite mail messages to aid translators 2010-04-09 14:02:01 -07:00
Brion Vibber f4ad0acd84 Merge branch 'master' of git@gitorious.org:statusnet/mainline into testing 2010-04-09 12:01:53 -07:00
Evan Prodromou 4e3fad4f0d fix attributes on homepage output 2010-04-09 14:11:18 -04:00
Brion Vibber 756dd15515 i18n cleanup: fix bad string breakdown in license agreement checkbox on registration form.
Note that much of that form is duplicated several times for Twitter, Facebook, and OpenID registrations -- these need to be refactored to avoid having multiple out-of-sync copies of code and messages.
2010-04-09 10:12:23 -07:00
Brion Vibber 4b20d68c48 i18n cleanup: fix bad string breakdown in license agreement checkbox on registration form.
Note that much of that form is duplicated several times for Twitter, Facebook, and OpenID registrations -- these need to be refactored to avoid having multiple out-of-sync copies of code and messages.
2010-04-09 10:11:11 -07:00
Brion Vibber f115c52d90 Clean up badly formatted strings in OembedAction 2010-04-09 09:56:19 -07:00
Brion Vibber b76b0d3a5f Cleanup bad i18n format for page title on bookmarklet posting window 2010-04-09 09:44:30 -07:00
Brion Vibber f13bf37e11 Cleanup bad i18n format for page title on bookmarklet posting window 2010-04-09 09:43:34 -07:00
Brion Vibber 1f8451f4aa Merge branch 'testing' into 0.9.x 2010-04-09 08:40:15 -07:00
Brion Vibber 7baf671570 Avoid E_NOTICE spew when listing group members who aren't admins 2010-04-09 08:38:42 -07:00
Christopher Vollick a93d0dc16a Undefined Variable in foafgroup.php
Probably just left over from the past.
2010-04-09 08:38:34 -07:00
Brion Vibber 2be04e2a63 Avoid E_NOTICE spew when listing group members who aren't admins 2010-04-09 08:37:24 -07:00
Christopher Vollick eefde36fcf Undefined Variable in foafgroup.php
Probably just left over from the past.
2010-04-09 08:35:13 -07:00
Brion Vibber 5dbaaed4e6 Maintain 'page' parameter for block from subscribers list, block & make-admin from group members list.
Refactored some of the returnto handling code. It looks like we have several different ways of handling this in the software, icky!
Marked the session-based functions with fixmes (they'll stomp on other forms when multiple tabs/windows are used) and combined some commonish bits of code between ProfileFormAction and the group block & makeadmin actions where they're using hidden form parameters. Extended that to allow passing dynamic parameters (eg 'page') as well as static ones (action, target user/group).
2010-04-08 19:06:55 -07:00
Brion Vibber 5dc169260d Merge branch 'testing' of git@gitorious.org:statusnet/mainline into 0.9.x 2010-04-06 15:22:23 -07:00
Siebrand Mazeland 5f7b7d7509 * move TRANS comment from ea99855b35 down to right before the line with the message, otherwise gettext does not pick it up.
* add another TRANS comment
2010-04-05 20:53:53 +02:00
Zach Copley ea99855b35 The translators were having trouble with the wording of the subtitle
for the list of groups a user is a member of.  I've changed the
wording and added a // TRANS: comment to hopefully make it more
clear.
2010-04-05 11:31:41 -07:00
Brion Vibber b71f276ed5 Merge branch 'master' into testing 2010-04-05 10:42:41 -07:00
Evan Prodromou 2a489018b1 use nofollow for subscribers list 2010-04-05 11:18:03 -04:00
Evan Prodromou 16827a66ba use nofollow for group members list 2010-04-05 11:17:51 -04:00
Evan Prodromou 95229bc7a0 use homepage link attributes method for peopletaglist 2010-04-05 11:17:36 -04:00
Evan Prodromou 0b30230b5a Merge branch 'nofollow' 2010-04-05 11:04:47 -04:00
Evan Prodromou 2882e40540 nofollow for peopletag pages 2010-04-05 11:03:14 -04:00
Evan Prodromou 96761c14ea override linkAttributes() method for groupmembersminilist 2010-04-05 10:47:07 -04:00
Evan Prodromou ffc1ac02c3 add an event for group members minilist 2010-04-05 10:12:27 -04:00
Brion Vibber d4940fe148 Ticket #2272: Block confirmation form should let enter trigger the 'yes' button
Setting focus into the form to make it easier to submit by keyboard. Enter or space will now trigger the button right off without having to mouse around to find the button after we've clicked into the conf form, and keyboarders can also get to the 'no' button more easily.
2010-04-03 10:29:24 -07:00
Brion Vibber f2b60b78b6 Ticket #2272: Block confirmation form should let enter trigger the 'yes' button
Setting focus into the form to make it easier to submit by keyboard. Enter or space will now trigger the button right off without having to mouse around to find the button after we've clicked into the conf form, and keyboarders can also get to the 'no' button more easily.
2010-04-03 10:26:43 -07:00
Brion Vibber e4d934827b Merge branch 'testing' into 0.9.x 2010-04-02 15:48:39 -07:00
Brion Vibber b42e044f6e Merge branch 'master' into testing 2010-04-02 15:48:17 -07:00
Evan Prodromou d60c1f1a9f Revert "Revert "if user allows location sharing but turned off browser location use profile location""
This reverts commit 8b24ad8a9c.
2010-04-01 12:58:06 -04:00
Evan Prodromou 8b24ad8a9c Revert "if user allows location sharing but turned off browser location use profile location"
This reverts commit 4b80ce0be8.
2010-04-01 12:52:12 -04:00