dc0f7189f2
added missing authors
2010-06-08 16:32:53 +12:00
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
3ba165cfab
Merge branch 'master' into testing
2010-05-28 16:18:40 -07:00
cef302cacd
Bugfix: api/statuses/destroy.:format was outputting deleted notice
...
twice, causing parsers to fail.
2010-05-28 06:24:10 +00:00
6317f7d92b
Assigning my copyrights to the Free Software Foundation
2010-05-27 18:27:33 -04:00
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
2f2fa10071
Merge branch 'master' of gitorious.org:statusnet/mainline into testing
2010-05-27 14:54:43 -07:00
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
6eae5d6a7e
Merge branch 'testing' into 0.9.x
2010-05-21 13:15:08 -07:00
87b8a89aa7
Merge branch 'master' of gitorious.org:statusnet/mainline into testing
2010-05-21 13:12:25 -07:00
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
7005ef6661
Merge branch 'testing' into 0.9.x
...
Conflicts:
plugins/OpenID/openidlogin.php
2010-05-19 12:51:25 -07:00
a39a934dd4
Merge branch 'master' of gitorious.org:statusnet/mainline into testing
2010-05-19 10:59:14 -07:00
5ea019c41a
Remove errant double HTML entity encoding in API source attribution
2010-05-18 15:16:23 -07:00
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
c78f67aa73
Refactor and centralize notice source link calculation
2010-05-18 15:15:27 -07:00
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
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
065ecc5573
Merge branch 'testing' into 0.9.x
2010-05-14 12:14:02 -07:00
2e808fdc82
More direct text for registration licensing/tos checkbox for private and all-rights-reserved sites.
2010-05-13 16:47:58 -07:00
fba140f4e0
Fix for repeats from the API having null source attribution
2010-05-08 00:07:42 +00:00
3c9686e80f
Fix for repeats from the API having null source attribution
2010-05-07 16:32:24 -07:00
869bc32d0d
Remove errant double HTML entity encoding in API source attribution
2010-05-06 21:48:12 +00:00
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
22fde00def
Refactor and centralize notice source link calculation
2010-05-06 21:48:11 +00:00
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
b50f300566
Implement since_id and max_id param handling for /api/favorites
2010-05-05 14:46:36 -07:00
f852a1931b
Add docs for public_timeline
2010-04-22 15:48:58 -07:00
1b561065b0
Some initial Doxygen-based documentation for the API
2010-04-22 13:11:49 -07:00
fee6b78e28
Merge branch 'testing' into 0.9.x
2010-04-19 18:47:56 +02:00
369885f04f
Merge branch 'master' into testing
2010-04-19 18:47:11 +02:00
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
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
97ee2c2f12
Fix a typo and small error in translator documentation
2010-04-11 23:22:36 +02:00
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
69eebc1ec8
Add translator documentation for uses of 'Yes' and 'No' in the interface.
2010-04-11 21:04:07 +02:00
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
19b86da426
Lower case "Web"
2010-04-11 01:03:06 +02:00
518832da28
Document messages for which clarification was requested.
2010-04-10 01:48:16 +02:00
c15549ff5a
Fix double space in message
2010-04-10 01:47:27 +02:00
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
8dda28d374
Merge branch '0.9.x' of git://gitorious.org/statusnet/mainline into 0.9.x
2010-04-10 00:59:21 +02:00
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
5c6c9b6f5f
Update message formatting for serverError to use a starting capital and a leading period.
2010-04-09 15:29:41 -07:00
58d5d7baee
Clean up badly formatted strings in OembedAction
2010-04-09 15:29:25 -07:00
7303acf7ad
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
2010-04-09 15:20:14 -07:00
ae4ade53a8
Fix E_NOTICE and use of limit on userrss
2010-04-09 15:19:04 -07:00
47eed2c999
Update message formatting for serverError to use a starting capital and a leading period.
2010-04-10 00:07:20 +02:00
85fb32a359
Ticket #946 : annotate use of singular 'them' in invite mail messages to aid translators
2010-04-09 14:02:01 -07:00
f4ad0acd84
Merge branch 'master' of git@gitorious.org:statusnet/mainline into testing
2010-04-09 12:01:53 -07:00
Brenda Wallace
Brion Vibber
Zach Copley
Craig Andrews
James Walker
Siebrand Mazeland