Commit Graph

2576 Commits

Author SHA1 Message Date
Zachary Copley
b407665b98 Initial work on API method for updating a group's profile info 2010-05-07 10:10:30 -07:00
Brion Vibber
d9c1ac9053 Merge branch '0.9.x' into 1.0.x 2010-05-06 18:49:01 -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
173778eab1 Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 1.0.x
Conflicts:
	lib/xmppmanager.php (resolved: code has moved to XmppPlugin.php)
2010-05-05 17:11:23 -07: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
Brion Vibber
5414396a2e IM cleanup on 1.0.x branch:
* Fake_XMPP back to Queued_XMPP, refactor how we use it and don't create objects and load classes until we need them.
* fix fatal error in IM settings while waiting for a Jabber confirmation.
* Caching fix for user_im_prefs
* fix for saving multiple transport settings
* some fixes for AIM & using normalized addresses for lookups
2010-04-30 15:29:05 -07:00
Brion Vibber
cae1329f3b Merge branch '0.9.x' into 1.0.x
Conflicts:
	lib/util.php
2010-04-30 13:16:13 -07:00
Evan Prodromou
5c05cd2b1a Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x 2010-04-26 02:43:33 -04:00
Evan Prodromou
14adb7cc41 Give users more control over URL shortening
Users and administrators can set how long an URL can be before it's
shortened, and how long a notice can be before all its URLs are
shortened. They can also turn off shortening altogether.

Squashed commit of the following:

commit d136b39011
Author: Evan Prodromou <evan@status.net>
Date:   Mon Apr 26 02:39:00 2010 -0400

    use site and user settings to determine when to shorten URLs

commit 1e1c851ff3
Author: Evan Prodromou <evan@status.net>
Date:   Mon Apr 26 02:38:40 2010 -0400

    add a method to force shortening URLs

commit 4d29ca0b91
Author: Evan Prodromou <evan@status.net>
Date:   Mon Apr 26 02:37:41 2010 -0400

    static method for getting best URL shortening service

commit a9c6a3bace
Author: Evan Prodromou <evan@status.net>
Date:   Mon Apr 26 02:37:11 2010 -0400

    allow 0 in numeric entries in othersettings

commit 767ff2f7ec
Author: Evan Prodromou <evan@status.net>
Date:   Mon Apr 26 02:36:46 2010 -0400

    allow 0 or blank string in inputs

commit 1e21af42a6
Author: Evan Prodromou <evan@status.net>
Date:   Mon Apr 26 02:01:11 2010 -0400

    add more URL-shortening options to othersettings

commit 869a6be0f5
Author: Evan Prodromou <evan@status.net>
Date:   Sat Apr 24 14:22:51 2010 -0400

    move url shortener superclass to lib from plugin

commit 9c0c9863d5
Author: Evan Prodromou <evan@status.net>
Date:   Sat Apr 24 14:20:28 2010 -0400

    documentation and whitespace on UrlShortenerPlugin

commit 7a1dd5798f
Author: Evan Prodromou <evan@status.net>
Date:   Sat Apr 24 14:05:46 2010 -0400

    add defaults for URL shortening

commit d259c37ad2
Author: Evan Prodromou <evan@status.net>
Date:   Sat Apr 24 13:40:10 2010 -0400

    Add User_urlshortener_prefs

    Add a table for URL shortener prefs, a corresponding class, and the
    correct mumbo-jumbo in statusnet.ini to make everything work.
2010-04-26 02:40:36 -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
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
Craig Andrews
39392e03a7 Merge branch '0.9.x' into 1.0.x
Conflicts:
	actions/confirmaddress.php
	actions/imsettings.php
2010-04-18 19:21:15 -04: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
Evan Prodromou
727ea5a516 Merge branch '0.9.x' into 1.0.x 2010-04-07 10:47:29 -04: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