Siebrand Mazeland
573925c52a
* number parameters in messages
...
* add translator documentation
* remove superfluous whitespace
* small L10n update
2011-01-15 00:24:06 +01:00
Evan Prodromou
5c25364141
remove extraneous <dl> and <dt> tags
2011-01-14 15:36:06 -05:00
Siebrand Mazeland
7903a2504f
* remove i18n for debug message.
...
* add i18n for some server exceptions.
* add translator documentation.
* L10n updates.
* remove superfluous whitespace.
2011-01-14 21:25:46 +01:00
Siebrand Mazeland
6e1dfab1b9
* change i18n for confirmation string to make a bit more certain that the confirmation string is consistent in all messages where it is used.
...
* add translator documentation.
* remove superfluous whitespace.
2011-01-14 20:48:17 +01:00
Brion Vibber
74a1c9def0
Fix error handling for missing group in apigroupmembership -- was trying to call methods on the variable before we checked it, which triggers PHP fatal error
2011-01-07 16:25:58 -08:00
Brion Vibber
5616bfb5ff
Fix warning in subscribers/subscriptions list pages where we attempted to call free() an ArrayWrapper after it was used up, thus trying to forward the call to a nonexistent object.
...
Removed the free calls (unneeded since destructors now work), and added an error check w/ logging & an exception for future attempts to forward calls to nonexistent object.
2011-01-07 15:29:30 -08:00
Brion Vibber
edf8101b29
allow group join/leave commands in api posting, at least for the moment (no other way to do remote subscribe without a preexisting local id number via api)
2011-01-06 13:46:39 -08:00
Brion Vibber
281076d5f6
Fix for PHP notice spew in group creation via API: set default 'mainpage' in User_group::register() rather than forcing all callers to do it manually.
2011-01-06 13:22:44 -08:00
Evan Prodromou
32eb4c5e2d
Merge remote branch 'gitorious/0.9.x' into 1.0.x
...
Conflicts:
lib/common.php
2010-12-30 15:52:08 -08:00
Evan Prodromou
d3b10959f4
Merge branch '0.9.x' into noactor
2010-12-29 15:29:29 -08:00
Evan Prodromou
26afe79ed9
Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.x
2010-12-29 14:53:38 -08:00
Evan Prodromou
48edbb3023
add hooks for the account-management tools
2010-12-29 14:02:04 -08:00
Brion Vibber
e211e6228d
Merge branch '0.9.x' into 1.0.x
2010-12-28 11:38:34 -08:00
Brion Vibber
90c7ff1983
Merge branch 'master' into 0.9.x
2010-12-28 11:37:38 -08:00
Brion Vibber
d3d9797496
Prevent group creation by silenced users.
...
* adds Right::CREATEGROUP
* logic in Profile::hasRight() checks for silencing
* NewgroupAction checks for the permission before letting you see or process the form in the UI
* User_group::register() logic does a low-level check on the specified initial group admin, and rejects creation if that user doesn't have the right; guaranteeing that API methods etc will also have this restriction applied sensibly.
2010-12-28 11:34:02 -08:00
Evan Prodromou
0bcc3ee005
include saved notice in atompub events
2010-12-27 22:11:30 -08:00
Evan Prodromou
a85bbd9088
Add a user parameter to atom pub api events
2010-12-27 20:49:08 -08:00
Evan Prodromou
ab92496ddc
Stop using <activity:subject> for atom feeds
2010-12-27 10:03:34 -08:00
Brion Vibber
26baad63f2
Merge branch '0.9.x' into 1.0.x
2010-12-22 15:25:38 -08:00
Brion Vibber
d5c2b0d216
When queueing is off, restore runs immediately. Indicate that we've already finished processing on the success page in this case; otherwise continue to show the 'will take a few minutes' message.
2010-12-22 14:55:13 -08:00
Brion Vibber
055630516c
Merge branch 'righttoleave' into 0.9.x
2010-12-22 11:28:34 -08:00
Evan Prodromou
9a6ceb3303
Merge branch 'righttoleave' into 0.9.x
2010-12-22 11:22:51 -08:00
Brion Vibber
754bc1b616
Error handling cleanup on backup/restore:
...
* avoid PHP notice from using wrong variable
* show a visible error instead of blank screen if no file submitted with restore form
* avoid PHP strict warning from using calling "non-static" DOMDocument::loadXML statically
* suppress PHP warning from XML parse errors
2010-12-22 11:13:57 -08:00
Brion Vibber
5abd2b7d0c
fix notice error
2010-12-22 11:06:45 -08:00
Brion Vibber
d8a3a88ec8
Merge branch '0.9.x' into 1.0.x
...
Conflicts:
classes/Memcached_DataObject.php
2010-12-17 17:13:21 -08:00
Brion Vibber
fb8312ebf4
Ticket #2959 : implement api/users/profile_image endpoint in Twitter-compat API
2010-12-17 17:10:52 -08:00
Brion Vibber
c0669969f2
fix typo in showstream
2010-12-17 16:21:33 -08:00
Evan Prodromou
573bbeced1
action to restore a user's backup from the Web interface
2010-12-17 18:56:48 -05:00
Evan Prodromou
fd22f684bf
syntax error in deleteaccount
2010-12-15 17:39:58 -05:00
Evan Prodromou
e16cb8c03a
Merge branch '0.9.x' into righttoleave
2010-12-15 16:48:28 -05:00
Brion Vibber
bf20258f4b
Merge branch '0.9.x' into 1.0.x
2010-12-15 11:59:31 -08:00
Brion Vibber
6c67114198
Mark OembedAction, XrdAction, and (plugin) AutocompleteAction as read-only. Tweaked ApiStatusesShow and ApiTimelineUser to still claim read-only when hit with a HEAD request (usually link checkers or a precursor to a GET, and should be semantically equivalent to a GET without actually transferring data)
2010-12-14 16:14:15 -08:00
Brion Vibber
82a9560a2d
AtomPub fix: correct the response URL given from posting a new message (wrong parameter meant we got the main page instead of the message's URL)
2010-12-14 13:19:22 -08:00
Brion Vibber
54a0e801f3
AtomPub fixes: return '201 Created' on POST of new message; better error checking on Atom input
2010-12-14 13:12:24 -08:00
Evan Prodromou
d840578aa0
An action to delete your own account
...
The new DeleteaccountAction lets a user delete their own account
(subject to global rights set by the admin). It presents a form to
delete the account, with an "I am sure." text entry box.
It then schedules the account for deletion and logs the user out.
2010-12-14 12:38:43 -05:00
Evan Prodromou
6a7bf9dbf9
don't show the backup link if the user can't backup
2010-12-13 16:49:01 -05:00
Evan Prodromou
5089d3065c
add an action to backup the current account in ActivityStreams format
2010-12-13 16:32:39 -05:00
Evan Prodromou
027c73a4a1
Merge branch 'activityatompub' into 0.9.x
2010-12-13 14:35:42 -05:00
Evan Prodromou
1033e1e519
add the other three feeds to AtomPub service document
2010-12-13 14:35:29 -05:00
Evan Prodromou
c6d6f25b52
Atom pub feed for group memberships
...
Feed for group memberships, in activity streams format.
Shows a feed; has proper pagination; accepts activitystreams "join"
activities to start a new membership.
2010-12-13 13:56:54 -05:00
Evan Prodromou
156bd011af
fix navigation links for favorite feed
2010-12-13 13:08:38 -05:00
Evan Prodromou
c5fee7573e
fix navigation links for subscriptions feed
2010-12-13 13:07:25 -05:00
Evan Prodromou
1a58fdd695
add atompub show membership action
2010-12-13 12:40:22 -05:00
Zach Copley
bb55784e90
Move getConnectedApps() from Profile to User, where it belongs
2010-12-12 17:37:42 -08:00
Evan Prodromou
30f0defcf1
atompub favorite feed
2010-12-12 13:16:34 -05:00
Evan Prodromou
1817aedb5c
fix subtitle in subscriptions feed
2010-12-12 12:13:54 -05:00
Evan Prodromou
d9a614c57e
use new Subscription stream methods for AtomPub
2010-12-11 11:24:07 -05:00
Evan Prodromou
37c447be46
Show a single favorite for AtomPub
2010-12-10 18:50:50 -05:00
Evan Prodromou
5d56dba904
add a new subscription using POST to APP
2010-12-09 16:25:47 -05:00
Evan Prodromou
c619a257fe
Add subscription feed for AtomPub
2010-12-09 16:05:07 -05:00
Evan Prodromou
34b8eb207d
make HEAD work for AtomPubShowSubscription
2010-12-09 14:25:57 -05:00
Evan Prodromou
11a0bde459
AtomPub for single subscription
2010-12-09 13:11:02 -05:00
Brion Vibber
9df856e667
Merge branch '0.9.x' into merge
...
Conflicts:
README
actions/hostmeta.php
classes/File_redirection.php
lib/common.php
lib/designsettings.php
lib/router.php
lib/util.php
lib/xmppmanager.php
plugins/OStatus/OStatusPlugin.php
2010-12-07 10:50:05 -08:00
Brion Vibber
aa96c3c1d9
Fix for tickets #2917 , #2262 : user URL shortening options not being applied in non-web channels
...
common_shorten_links() can only access the web session's logged-in user, so never properly took user options into effect for posting via XMPP, API, mail, etc.
Adds an optional $user parameter on common_shorten_links(), and a $user->shortenLinks() as a clearer interface for that.
Tweaked some lower-level functions so $user gets passed down -- making the $notice_id param previously there for saving URLs at notice save time generalized a little.
Note also ticket #2919 : there's a lot of duplicate code calling the shortening, checking the length, and reporting near-identical error messages. These should be consolidated to aid in code and translation maintenance.
2010-12-02 13:41:56 -08:00
Siebrand Mazeland
086d6c9f36
* Fix an incorrectly formatted message parameter in line 334.
...
* i18n/L10n updates
* translator documentation updated
2010-12-02 12:33:03 +01:00
Brion Vibber
5d9d0d7349
Ticket #2912 further cleanup: use JS on emailsettings form to help connect the 'I want to post by email' checkbox with the controls for adding or removing a post-by-email alias.
...
Now, when you first come up the checkbox will most likely be off and the button to create an address is grayed out.
Checking the box enables use of the 'new' button to generate an email address -- it's left disabled until you check the box, so you can't accidentally trip it.
Actually adding the address now enables the post-by-mail option, as well, thus ensuring that it's saved. WARNING: OTHER CHANGES ON THE FORM WILL STILL BE LOST.
Removing the address now disables the post-by-mail option, so it's not sitting around confusingly enabled but useless.
You can still disable the checkbox manually without removing the address, in case you want to keep it for later.
It's also still possible to actually save it in the state where the option is enabled, but there's no configured address, but that shouldn't happen too often. Possibly that should be prevented outright though.
2010-12-01 14:23:56 -08:00
Brion Vibber
36d605a1e9
Ticket #2912 tweaks: clean up wording on the incoming email generator box a bit.
2010-12-01 13:10:54 -08:00
Brion Vibber
3048f9100d
Ticket #2912 : move 'I want to post notices by email" checkbox up from the email *output* prefs up into the box for the address to post to, so they're next to each other.
2010-12-01 13:04:18 -08:00
Brion Vibber
dc350b5463
Work in progress on nickname validation changes. lib/nickname.php appears to have been destroyed by NetBeans and will be rewritten shortly. Sigh.
2010-11-29 14:15:25 -08:00
Evan Prodromou
edf660c6ff
Make userxrd work without OStatus enabled
2010-11-26 22:09:51 -05:00
Evan Prodromou
fcc0825b14
Make userxrd part of the default hostmeta
2010-11-26 21:46:51 -05:00
Evan Prodromou
0a4911552e
Move user xrd action to core and use hooks to extend
...
Moved the Webfinger user XRD action from the OStatus plugin to core.
Added hooks to add OStatus-specific stuff, but kept general stuff in
the core.
2010-11-26 21:38:38 -05:00
Craig Andrews
3f3b38766f
move xrd and hostmeta out of the OStatus plugin and into core
...
add event for setting up hostmeta, and use them in the OStatus plugin
2010-11-26 21:12:14 -05:00
Brion Vibber
e0e7cb7c53
Merge branch 'master' into 0.9.x
2010-11-19 14:03:59 -08:00
Brion Vibber
ca55d6c514
Ticket #1987 : support since_id on API notice search methods.
...
max_id is not yet implemented, as it'll need support added to the search backends. (since_id we get 'for free' by just cropping off the list, it'll do for now)
2010-11-19 14:00:22 -08:00
Brion Vibber
fa6c6077d6
Merge branch 'master' into 0.9.x
2010-11-16 11:17:29 -08:00
Brion Vibber
9b9db3b28a
Prep for ticket #2895 : consolidate common code from PopularNoticeList and FavoritedAction for fetching popular notice lists
2010-11-16 11:10:32 -08:00
Brion Vibber
89d5993674
Include width/height of locally-uploaded images in our oembed provider data for attachment pages.
2010-11-15 12:57:15 -08:00
Evan Prodromou
d038d0fa46
AtomPub-related actions are only read-only on GET
2010-11-15 14:14:09 -05:00
Evan Prodromou
8a21b13ee9
Merge remote branch 'gitorious/0.9.x' into 0.9.x
2010-11-15 11:57:31 -05:00
Evan Prodromou
c1cee3b27f
Merge branch 'atompub' into 0.9.x
...
Conflicts:
actions/apistatusesshow.php
actions/apitimelineuser.php
2010-11-15 11:57:19 -05:00
Evan Prodromou
cb371d65c1
add hooks for atom pub posts
2010-11-15 11:54:42 -05:00
Evan Prodromou
01f32e3998
Merge remote branch 'gitorious/1.0.x' into 1.0.x
...
Conflicts:
actions/urlsettings.php
2010-11-14 06:49:43 -05:00
Brion Vibber
e4913f9722
fix syntax error introduced in i18n tweaks: newgroup action
2010-11-12 13:35:19 -08:00
Brion Vibber
9621904cac
Revert "Missing one close-paren in newgroup.php" - incorrect fix for paren bug
...
This reverts commit 3afb031d92
.
2010-11-12 13:34:04 -08:00
Brion Vibber
5d12ec0532
Merge branch 'oembed-thumbnails' into 0.9.x
2010-11-12 12:28:44 -08:00
Zach Copley
0ed572ff3f
Fix missing close of comment block
2010-11-11 10:39:05 -08:00
Zach Copley
09aaf21e8d
Fix missing close of comment block
2010-11-11 10:33:26 -08:00
Evan Prodromou
3afb031d92
Missing one close-paren in newgroup.php
2010-11-09 17:08:11 -05:00
Evan Prodromou
a988e2e97b
hook points for the email settings form
2010-11-09 15:00:30 -05:00
Brion Vibber
f25accc43e
split out InlineAttachmentList from AttachmentList
2010-11-09 10:45:19 -08:00
Brion Vibber
6d7f02ff31
Pass file attachment thumbnails along with oEmbed data.
2010-11-08 17:22:01 -08:00
Brion Vibber
551b196a35
doomy doom doom
2010-11-08 15:32:41 -08:00
Evan Prodromou
719b480eaa
use subclassing to change notice list output for single notice
2010-11-08 13:08:59 -05:00
Siebrand Mazeland
f5b037c169
Update translator documentation.
2010-11-07 22:32:52 +01:00
Siebrand Mazeland
66e34a28f7
screen_name -> nick names. Spotted by The Evil IP address.
2010-11-07 22:31:02 +01:00
Brion Vibber
b716d01a41
Merge branch '0.9.x' into 1.0.x
2010-11-03 16:09:49 -07:00
Brion Vibber
51a756c211
Fix ticket #2860 : clarify API doc comments for 'source' parameter's interaction with OAuth on api/statuses/update
2010-11-03 14:58:33 -07:00
Brion Vibber
6e03456753
Migrate some more code from manually constructing "fullname (nickname)" to using Profile->getFancyName(). Encapsulates common logic and allows for localization of the parens.
2010-11-03 13:10:42 -07:00
Brion Vibber
dc4fafbbd1
General cleanup & part of ticket #2864 : use User_group->getFancyName() instead of replicating the logic in various places. Encapsulates and allows for localization of parens.
2010-11-03 12:59:19 -07:00
Siebrand Mazeland
973a48bded
i18n/L10n fixes and translator documentation addded/updated.
2010-11-02 23:48:36 +01:00
Siebrand Mazeland
a65362f7fa
Add context for different uses of "%1$s (%2$s)"
2010-11-02 23:08:59 +01:00
Brion Vibber
04ca706601
Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 1.0.x
...
Conflicts:
actions/confirmaddress.php
actions/othersettings.php
2010-11-02 15:02:10 -07:00
Brion Vibber
81e0653080
Merge branch 'pretty-title2' into 0.9.x
2010-11-02 14:21:23 -07:00
Brion Vibber
6a181bb128
Unrolled tagged vs untagged, page 1 vs page N message variants for showstream title. #2668
2010-11-02 14:20:06 -07:00
Brion Vibber
bc85f6914b
fix syntax error introduced in i18n tweaks: newgroup action
2010-11-02 14:03:50 -07:00
Brion Vibber
426cda5e1f
Alternate pretty-title tweaks for #2668
2010-11-02 13:42:44 -07:00
Siebrand Mazeland
760a1c27bc
Update translator documentation.
2010-11-01 16:49:36 +01:00
Siebrand Mazeland
6ab34fd8e8
* i18n/L10n updates.
...
* translator documentation added.
* superfluous whitespace removed.
2010-11-01 16:49:35 +01:00
Siebrand Mazeland
5c6732c4bb
Update translator documentation.
2010-11-01 16:49:35 +01:00
Siebrand Mazeland
1c0e84f066
Add forgotten translator documentation.
2010-10-31 01:26:39 +02:00
Siebrand Mazeland
5406873007
* translator documentation updated.
...
* superfluous whitespace removed.
* added FIXMEs for missing documentation and un-i18n-able timestamps.
2010-10-31 01:16:59 +02:00
Siebrand Mazeland
08edd1fedf
* i18n/L10n updates.
...
* translator documentation added/updated.
* superfluous whitespace removed.
2010-10-31 00:58:35 +02:00
Siebrand Mazeland
234b03d945
* translator documentation updates.
...
* added FIXMEs in actions/showgroup.php.
* superfluous whitespace removed.
2010-10-30 14:36:54 +02:00
Evan Prodromou
c4b8f68a1a
Merge remote branch 'gitorious/1.0.x' into 1.0.x
2010-10-29 11:14:02 -04:00
Brion Vibber
b26eccf33c
Merge branch '0.9.x' into 1.0.x
2010-10-28 16:26:34 -07:00
Brion Vibber
8d0c014ced
Merge branch 'master' into 0.9.x
2010-10-28 13:01:10 -07:00
Brion Vibber
9ea7cafd27
Fix for regression: fatal error on group page display when not logged in.
...
Bug was introduced with group deletion feature.
2010-10-28 12:19:19 -07:00
Siebrand Mazeland
796d7b4939
Update translator documentation.
2010-10-28 01:42:09 +02:00
Siebrand Mazeland
04ae500749
* i18n/L10n fixes.
...
* translator documentation updated.
* superfluous whitespace removed.
2010-10-28 01:21:21 +02:00
Siebrand Mazeland
a12474a99d
* i18n/L10n fixes.
...
* translator documentation updated.
* superfluous whitespace removed.
2010-10-28 01:21:09 +02:00
Zach Copley
b3cd558fe7
Fix OAuth verifier display page title and msgs for i18n
2010-10-26 13:19:23 -07:00
Evan Prodromou
93a8718f97
Merge remote branch 'gitorious/1.0.x' into 1.0.x
2010-10-26 09:22:21 -04:00
Zach Copley
1a1ca22aca
Supress header, footer, sidebar on OAuth verifier pin page when in "desktop" mode
2010-10-25 13:30:38 -07:00
Brion Vibber
ca489631db
Merge branch '0.9.x' into 1.0.x
...
Conflicts:
actions/subscriptions.php
lib/router.php
lib/xmppmanager.php
lib/xmppoutqueuehandler.php
2010-10-25 13:08:57 -07:00
Zach Copley
82c280979d
Add special CSS classes to OAuth authorization and pin pages when
...
in desktop mode
2010-10-25 11:25:35 -07:00
Zach Copley
479096c8d7
Less scary OAuth authorization messages when using anonymous consumer
2010-10-25 10:38:40 -07:00
Evan Prodromou
e6ba379c8b
navigation links in user timeline (for AtomPub)
2010-10-25 11:08:10 -04:00
Evan Prodromou
59a7d78acb
Atom Service Document
2010-10-24 23:43:26 -04:00
Evan Prodromou
c0664599aa
allow posting to user timeline using AtomPub
2010-10-24 22:50:13 -04:00
Evan Prodromou
292e789584
delete a notice using AtomPub
2010-10-24 21:24:23 -04:00
Evan Prodromou
43a67b150a
show a single notice in atom entry format
2010-10-24 15:58:53 -04:00
Siebrand Mazeland
0b6cc7c33d
* translator documentation added.
...
* superfluous whitespace removed.
2010-10-23 19:20:51 +02:00
Zach Copley
3913b6a5d8
Updated styling for OAuth authorization page's desktop mode.
...
TODO: move these styles into the main CSS file.
2010-10-22 11:21:44 -07:00
Evan Prodromou
568cb8a205
Merge remote branch 'gitorious/1.0.x' into 1.0.x
2010-10-22 09:24:50 -04:00
Zach Copley
131c339c5a
Pass OAuth authorize page's mode paramater to OpenID plugin so it can create a correct
...
returnto URL
2010-10-22 02:08:38 +00:00
Zach Copley
ac45f661f6
Fix regression (whoops!)
2010-10-21 18:38:54 -07:00
Zach Copley
c5a84ef76f
Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.x
2010-10-21 18:16:35 -07:00
Zach Copley
0b134d3e69
Re-camelcase ApiOauthAuthorizeAction so it will be accessible when
...
a site is in pivate mode
2010-10-21 18:15:11 -07:00
Zach Copley
aa6ec40c51
Fix syntax errors
2010-10-22 00:48:26 +00:00
Zach Copley
ce0d81c190
OAuth - inform consumer when user refused to authorize a request token
...
http://status.net/open-source/issues/2848
2010-10-21 17:11:59 -07:00
Zach Copley
94f7bfa50a
Don't show 'anonymous' app in OAuth application list.
2010-10-21 16:42:59 -07:00
Zach Copley
4ab110e071
Fix bad reference.
2010-10-21 14:52:41 -07:00
Zach Copley
a548861dbf
OAuth - proper callback handling and better styling for authorization
...
page when in desktop mode
2010-10-21 14:45:42 -07:00
Zach Copley
648f79be10
Change OAuth authorization page's action name to be inline with
...
other web page action names so the body id outputs correctly. Fix
some other bugs.
2010-10-21 13:00:59 -07:00
Zach Copley
bab012bd67
New "desktop" mode for the OAuth authorization page. If mode=deskstop
...
is specified in the request the page is probably meant to be displayed
in a small webview of another application, so suppress header, aside
and footer.
2010-10-21 12:23:04 -07:00
Siebrand Mazeland
cb74822e7a
i18n/L10n consistency updates.
2010-10-21 13:20:21 +02:00
Siebrand Mazeland
fb12094f61
i18n/L10n updates, translator docs updated, superfluous whitespace removed.
2010-10-21 03:10:46 +02:00
Zach Copley
bfdb8385ec
Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.x
...
Conflicts:
actions/apioauthauthorize.php
lib/apioauthstore.php
2010-10-20 17:28:28 -07:00
Craig Andrews
90c87553ee
Redirect to https when making an http request for a sensitive action
2010-10-20 20:26:35 -04:00
Zach Copley
e56385a7bb
Use a new table (oauth_token_association) to associate authorized
...
request tokins with OAuth client applications and profiles.
2010-10-20 17:21:04 -07:00
Siebrand Mazeland
1603b7afc9
i18n/L10n updates, translator comments added/fixed, superfluous whitespace removed.
2010-10-21 01:53:42 +02:00
Brion Vibber
c24f4ddfdb
Pretty up the OpenID variant of the OAuth login form a bit; change the 'Allow' button to 'Continue' so we're not confused why we get the form again after authenticating.
2010-10-20 16:14:32 -07:00
Brion Vibber
bcc06d05e8
Initial OpenID+OAuth thingy.
2010-10-20 15:59:27 -07:00
Siebrand Mazeland
ac4afb31e8
Consistent punctuation.
2010-10-20 20:29:59 +02:00
Siebrand Mazeland
59d0be4761
* i18n for many missing messages (???)
...
* add translator documentation.
2010-10-20 20:28:04 +02:00
Siebrand Mazeland
dc62cf1c0b
* i18n/L10n fixes.
...
* translator documentation updated/added.
* superfluous whitespace removed.
2010-10-20 19:34:27 +02:00
Zach Copley
2760ef07f5
Stick OAuth developer help info in a section
2010-10-19 21:24:19 -07:00
Zach Copley
5ca29ab0de
Merge branch 'anon-consumer' into 0.9.x
2010-10-19 21:01:53 -07:00
Zach Copley
e8b6d7c946
Add support for an anonymous OAuth consumer. Note: this requires a
...
small DB tweak. Oauth_application_user needs to have the primary
compound key: (profile_id, application_id, token).
http://status.net/open-source/issues/2761
This should also make it possible to have multiple access tokens
per application.
http://status.net/open-source/issues/2788
2010-10-19 20:54:53 -07:00
Siebrand Mazeland
0157df7396
Add missing "address"
2010-10-20 00:49:12 +02:00
Siebrand Mazeland
4b4894b121
Many i18n/L10n updates and lots of descriptions for translators added.
2010-10-20 00:35:39 +02:00
Brion Vibber
3593f3f132
Merge branch '0.9.x' into 1.0.x
2010-10-19 15:18:07 -07:00
Brion Vibber
d358c88f94
Merge branch 'master' of gitorious.org:statusnet/mainline into 0.9.x
2010-10-19 15:10:47 -07:00
Brion Vibber
e13eb797c7
Fix PHP notice when submitting 'design' admin panel on a browser that doesn't support file uploads such as Mobile Safari
2010-10-19 15:09:45 -07:00
Zach Copley
d48f4a81d6
Relax restrictions on URL validation for oauth_callback. We need to
...
allow custom schemes like mustard:// etc.
2010-10-19 19:29:21 +00:00
Zach Copley
5ac694c74f
Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.x
2010-10-19 12:08:48 -07:00
Zach Copley
5866493cae
OAuth - better log messages
2010-10-19 12:07:59 -07:00
Brion Vibber
53d45d7ffb
Merge branch '0.9.x'
2010-10-18 15:21:02 -07:00
Siebrand Mazeland
24b94ebb2c
* fix bugs in parameter numbering for two messages
...
* add translator documentation
2010-10-18 22:47:50 +02:00
Evan Prodromou
3a36714847
Merge remote branch 'gitorious/1.0.x' into 1.0.x
2010-10-18 15:42:21 -04:00
Brion Vibber
7765ddae81
Merge branch '0.9.x' into 1.0.x
...
Conflicts:
README
lib/default.php
2010-10-18 12:17:11 -07:00
Evan Prodromou
7c05b0dafc
options to nofollow external links in notices
2010-10-18 11:29:52 -04:00
Siebrand Mazeland
505ac6eba0
* add plural support where missing
...
* update translator documentation.
2010-10-16 14:38:12 +02:00
Siebrand Mazeland
31415b5853
Update translator documentation.
2010-10-16 14:31:41 +02:00
Brion Vibber
9a35e48ee2
Fix for ticket #2837 : white screen when hitting 'make admin' button on group members list.
...
RedirectingAction->returnToArgs() has been renamed to returnToPrevious() to avoid confusion with the existing Action->returnToArgs which gives the arguments that would be used to pass to one of those. :)
Switching to the correct function call gets it working.
Thanks to Siebrand for catching it when I could debug it live!
2010-10-15 15:33:54 -07:00
Evan Prodromou
9abe6fa666
Merge remote branch 'gitorious/1.0.x' into 1.0.x
2010-10-15 13:46:44 -04:00
Evan Prodromou
9b9ba29791
add SSL servers and paths to pathadminpanel.php
2010-10-15 13:46:21 -04:00
Craig Andrews
0721d8d3e2
Merge remote branch 'statusnet/0.9.x' into 1.0.x
2010-10-14 15:27:17 -04:00
Evan Prodromou
fc6711327b
let users set their SSL logo through the admin panel
2010-10-14 15:06:11 -04:00
Evan Prodromou
07963a2a10
Merge remote branch 'gitorious/1.0.x' into 1.0.x
2010-10-13 15:18:33 -04:00
Craig Andrews
f79dbaf9a7
Add a doc page that links to the StatusNet wiki API page
...
Add a redirect action that merely redirects to another action
Redirect /api to /doc/api so users don't get the "lame" "No such user" error message
2010-10-12 23:38:16 -04:00
Zach Copley
04f3f57e2e
Merge branch 'oauth-1.0a' into 0.9.x
2010-10-12 17:52:04 -07:00
Brion Vibber
5f81f6119b
Merge branch '0.9.x' into 1.0.x
2010-10-12 16:33:36 -07:00
Zach Copley
d8e06e66e9
Print a proper error message
2010-10-12 16:19:53 -07:00
Brion Vibber
f4f16af8ac
Add a basic group deletion for moderator users.
2010-10-12 15:49:20 -07:00
Zach Copley
a77bc11326
Output a log message when issuing a request token
2010-10-12 12:25:34 -07:00
Evan Prodromou
4580d6065c
Merge remote branch 'gitorious/1.0.x' into 1.0.x
2010-10-12 11:16:32 -04:00
Brion Vibber
aa02f6020e
Merge branch '0.9.x' into 1.0.x
2010-10-08 11:47:50 -07:00
Brion Vibber
f62e7c461f
Fix PHP fatal error in DeletenoticeAction: died when we had a valid notice, but weren't logged in due to accessing $this->user before the login check. Moved check up to prepare() from handle() so it's done before usage
2010-10-08 10:33:43 -07:00
Zach Copley
459727bd61
Update ApiOauthAccessTokenAction to OAuth 1.0a
2010-10-07 18:32:27 -07:00
Zach Copley
f8808b0761
Added a comment about an open question: Should we allow pin-based
...
workflow for clients registered as web applications?
2010-10-07 14:19:42 -07:00
Zach Copley
b8f2cc4e6f
Make the verifier pin display a little nicer
2010-10-07 13:51:47 -07:00
Zach Copley
69e621a3e8
- Update ApiOauthAuthorizeAction to 1.0a
...
- Fix enumerable bugs
- New page for displaying 1.0a verifier (still needs work)
2010-10-06 19:20:47 -07:00
Zach Copley
f97b863fd7
Update ApiOauthRequestTokenAction to support OAuth 1.0a
2010-10-06 13:40:03 -07:00
Evan Prodromou
8aa9c271df
Merge remote branch 'gitorious/1.0.x' into 1.0.x
2010-10-05 14:09:17 -04:00
Brion Vibber
5c4723919f
Merge branch '0.9.x' into 1.0.x
2010-10-04 13:06:40 -07:00
Brion Vibber
59119482ca
Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 1.0.x
...
Conflicts:
actions/hostmeta.php
actions/imsettings.php
classes/User.php
lib/adminpanelaction.php
lib/channel.php
lib/default.php
lib/router.php
lib/util.php
2010-10-04 12:54:36 -07:00
Brion Vibber
5c19d33b27
Bugfix in FB-sharing header for empty profile avatar
2010-10-01 14:42:12 -07:00
Brion Vibber
12f68c4ff2
Throw in a quick event hook to override the profile list type on showstream (should be made more general in future).
...
Replace with a NoticeList to have output include avatar and username -- but CSS still hides them in default theme.
Event::addHandler('ShowStreamNoticeList', 'awesome');
function awesome($notice, $action, &$pnl)
{
$pnl = new NoticeList($notice, $action);
return false;
}
2010-10-01 11:05:15 -07:00
Brion Vibber
8b8450f9ad
Add helper metadata on individual notice pages to aid sharing to Facebook (use poster's avatar as image, indicate the text content)
2010-09-30 18:21:38 -07:00
Zach Copley
fd779009b8
Add Start/EndShowNoticeItem event hooks to single notice page
2010-09-29 16:35:12 -07:00
Brion Vibber
a6469aeed8
Fix PHP syntax errors introduced during localization fixups in a few files.
2010-09-25 12:10:36 -07:00
Zach Copley
da04858902
Update OAuth actions in show application page so it will display the right endpoint URLs
2010-09-23 16:16:32 -07:00
Evan Prodromou
0f1fc36a05
Merge branch '0.9.x'
2010-09-23 09:50:46 -04:00
Zach Copley
84331ca7bd
Fix for ticket 2756 - Calls to OAuth endpoints are redirected to the
...
login page when a site is in private mode
2010-09-22 23:33:06 +00:00
Zach Copley
77609e0c4a
Fix for ticket 2756 - Calls to OAuth endpoints are redirected to the
...
login page when a site is in private mode
2010-09-22 23:30:50 +00:00
Zach Copley
da4463cb76
License admin panel should allow empty or valid URLs for (license
...
URL and license image URL) when selecting private or allrightsreserved
licenses.
2010-09-21 13:06:23 -07:00
Brion Vibber
42dd460d3b
Merge branch 'master' into 0.9.x
2010-09-21 12:48:16 -07:00
Brion Vibber
d342899677
Fix #2323 : typo on oauth connections page
2010-09-20 18:07:19 -07:00
Brion Vibber
85bf20d95a
Fix error when editing OAuth app registration and only changing the icon.
2010-09-20 16:57:07 -07:00
Brion Vibber
a47e664094
Fix for #2419 : There is no function maxDescription in Oauth_application class (broke the 'description too long' error message when editing oauth app registrations)
2010-09-20 16:43:00 -07:00
Brion Vibber
64cdbe6c55
Ticket #2750 : fixes to HTTP caching behavior across login/logout boundaries
...
* now ignoring if-modified-since if we failed an etag if-none-match comparison, per spec
* now including a hash of user id/nickname in most etags, so we'll update the view properly after login/logout
For API methods, checking the API-auth'ed user. (Many change results to include things like 'you're subscribed to this user' or 'this is one of your favorites', so user info is again needed)
There'll still be some last-modified stamps that aren't including user info properly, probably.
2010-09-20 13:42:58 -07:00
Zach Copley
55ad954b15
Basic license admin panel (maybe we can make it fancier later)
2010-09-17 16:38:12 -07:00
Zach Copley
afc799ddf8
Removed periods from instructions on some admin panels for consistency
2010-09-17 14:32:18 -07:00
Zach Copley
f4a1858b33
Fixed typo, and updated copyright dates while I was there
2010-09-17 14:20:05 -07:00
Brion Vibber
ead2f3375a
Ticket #2701 : old color settings now get reset when changing themes, so you don't end up with the previous theme's colors.
2010-09-13 13:37:13 -07:00
Siebrand Mazeland
bb2a4e7aac
Update translator documentation.
2010-09-12 17:43:43 +02:00
Siebrand Mazeland
6b010ac79c
Update/add translator documentation.
2010-09-12 17:27:38 +02:00
Siebrand Mazeland
a9fad9a7ac
Add translator hint.
2010-09-12 17:08:49 +02:00
Evan Prodromou
76788d9790
note what 0 means for shorteners
2010-09-11 16:23:41 -04:00
Evan Prodromou
76c0e3169b
move othersettings to urlsettings
2010-09-11 16:22:03 -04:00
Evan Prodromou
fca7ea664b
move view designs setting to user design tab
2010-09-11 16:16:38 -04:00
Evan Prodromou
4419e43f7f
Merge branch '0.9.x' into 1.0.x
...
Conflicts:
EVENTS.txt
plugins/TwitterBridge/daemons/twitterstatusfetcher.php
plugins/TwitterBridge/twitterbasicauthclient.php
2010-09-09 15:01:03 -04:00
Evan Prodromou
255e96d3b5
add a hook for when someone deletes their own notice
2010-09-08 16:37:12 -04:00
Craig Andrews
8d54809c35
move xrd and hostmeta out of the OStatus plugin and into core
...
add event for setting up hostmeta, and use them in the OStatus plugin
2010-09-07 13:45:52 -04:00
Craig Andrews
3dd734b2c3
Remove CSRF protection from username/password login and from OpenID login.
2010-09-07 13:45:52 -04:00
Evan Prodromou
a319b40c97
common_cache_key() -> Cache::key()
2010-09-06 10:07:43 -04:00
Evan Prodromou
8f81762d68
common_memcache() => Cache::instance()
2010-09-06 09:56:45 -04:00
Craig Andrews
b05ab5fc85
daemon_screenname -> daemonScreenname
2010-09-03 17:50:28 -04:00
Brion Vibber
0cfaae48a3
Merge branch '0.9.x' into 1.0.x
2010-08-16 16:56:27 -07:00
Evan Prodromou
21bf50bad6
Merge branch 'noticetitle' into 0.9.x
2010-08-14 12:03:25 -07:00
Evan Prodromou
1dadb8efc0
Merge branch '0.9.x' into 1.0.x
2010-08-13 14:51:51 -07:00
Evan Prodromou
7dd46222a8
add StartNoticeSaveWeb and EndNoticeSaveWeb to hook web-based UI for notices
2010-08-13 11:21:07 -07:00
Brion Vibber
d9942a558a
Fix regression in replies made from web (was saving reply_to value in wrong array key)
2010-08-12 15:18:16 -07:00
Brion Vibber
6ee3f35302
work in progress: prettier attachment mode for tinymce?
2010-08-11 15:56:40 -07:00
Brion Vibber
527561cd93
TinyMCE: core tweak; switching order of input processing so length limit is applied to stripped version of the text
2010-08-11 14:41:31 -07:00
Brion Vibber
3a85318bd0
First stab redoing argument loading for TinyMCE (to avoid hacking checks for all notice saves everywhere)
2010-08-10 16:55:03 -07:00
Evan Prodromou
9f0715a993
Merge branch '0.9.x' into 1.0.x
2010-08-03 16:05:03 -07:00
Siebrand Mazeland
46bffe3d69
Tweak message per suggestion of The Evil IP Address[1].
...
[1] http://translatewiki.net/w/i.php?title=Thread:Translating_talk:StatusNet/to_their_attention%3F&oldid=2220913
2010-08-01 00:16:39 +02:00
Zach Copley
0faa988e91
Fix for issue ID 2290: make sure errors are returned in the right
...
format, and use callback for errors when the request is JSONP
2010-07-29 20:31:22 +00:00
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
00e129b013
Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 1.0.x
2010-06-26 10:18:03 -04: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
Craig Andrews
1a62d1b493
Use presence of IM plugins to decide if "IM" options should be available
2010-06-16 16:00:54 -04:00
Brion Vibber
004200f958
Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 1.0.x
2010-06-11 12:09:55 -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
b1a68e15b7
Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 1.0.x
...
Conflicts:
lib/default.php
lib/util.php
plugins/UrlShortener/UrlShortenerPlugin.php (has been removed?)
2010-06-10 15:37:06 -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
c4203be9a4
Merge branch '0.9.x' into 1.0.x
2010-05-19 12:52:23 -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
91367dbc21
Merge branch '0.9.x' into 1.0.x
2010-05-14 12:15:13 -07: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
da18701394
Fix for repeats from the API having null source attribution
2010-05-07 17:22:16 -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
06a63b0404
Finish api/statusnet/groups/update
2010-05-07 10:10:30 -07:00
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
3f2c805652
Merge branch 'master' of gitorious.org:statusnet/mainline
2010-04-30 15:00:55 -04: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
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
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
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
2f4438fe24
Merge branch '0.9.x' into 1.0.x
...
Conflicts:
actions/imsettings.php
lib/jabber.php
Made a quick attempt to merge the new JID validation into the XmppPlugin, have not had a chance to test that version live yet.
Should also move over the test cases.
2010-04-02 15:56:25 -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
Evan Prodromou
4b80ce0be8
if user allows location sharing but turned off browser location use profile location
2010-04-01 12:09:33 -04:00
Craig Andrews
5f19a94646
add missing semicolon
2010-03-31 23:18:40 -04:00
Brion Vibber
df9eb4164a
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into 0.9.x
2010-03-31 12:48:24 -07:00
Sarven Capadisli
534c12e540
Revert "Multiple file upload handling."
...
This reverts commit 260f00d60b
.
As mentioned in
260f00d60b (comment_8367)
Reverting this merge until the bugs are fixed and there is a general
agreement on the need for this enhancement.
2010-03-31 10:57:20 +02:00
Brion Vibber
0841fa712e
Ticket #1281 : JID validation now more or less follows spec instead of calling e-mail validator
...
Basic splitting/validation code submitted via http://status.net/wiki/XMPP/JID_validation -- Copyright 2009 Patrick Georgi <patrick@georgi-clan.de> Licensed under ISC-L, which is compatible with everything else that keeps the copyright notice intact.
Added PEAR Net_IDNA package to extlib to handle IDN normalization (also used by Validate's email verifier if present).
* added test suite, supplemented my own test cases with JID validation and normalization test cases from libpurple
* follows XMPP rules for validation of name part
* fixes for normalization with non-ASCII names
* will do domain checks if $config['email']['check_domain'] is on, checking for an XMPP-server SRV record or any lookup. (We don't actually need to ping those direct though.)
* some more obscure stringprep validation rules aren't quite followed yet, but we err on the side of permissiveness.
* we still don't actually let you save your address with a resource on it, as we strip resources when looking up users who've sent us presence or message updates. I would recommend saving the outgoing resource as a separate field if/when we add that..?
2010-03-30 17:35:27 -07:00
Brion Vibber
f694f254a4
Fix for error output on invalid user ID to api groups list
2010-03-30 11:47:49 -07:00
Brion Vibber
37b41d227d
Fix for error output on invalid user ID to api groups list
2010-03-30 11:47:23 -07:00
Brion Vibber
034e88bcbc
Fixes for apigrouplist - notice spew from undefined var, notice spew from missing escape in sprintf format
2010-03-30 11:45:41 -07:00
Brion Vibber
0284e1315c
Quick fixes for grouplistall:
...
* respect count instead of listing all groups
* respect page parameter
* don't spew notice on undefined $id
* don't spew notice on undefined $group->homepage_url (dropped the element since there's nothing to go in it)
2010-03-30 11:45:35 -07:00
Brion Vibber
0fa894be9d
Fixes for apigrouplist - notice spew from undefined var, notice spew from missing escape in sprintf format
2010-03-30 11:44:13 -07:00
Brion Vibber
ca897ef346
Quick fixes for grouplistall:
...
* respect count instead of listing all groups
* respect page parameter
* don't spew notice on undefined $id
* don't spew notice on undefined $group->homepage_url (dropped the element since there's nothing to go in it)
2010-03-30 11:10:29 -07:00
Brion Vibber
d38ce90fa1
Fix to profile location in FOAF output: longitude was repeating the latitude by mistake
2010-03-29 17:54:22 -07:00
Brion Vibber
17f1ea703d
Fix to profile location in FOAF output: longitude was repeating the latitude by mistake
2010-03-29 17:53:31 -07:00
Brion Vibber
01a03e34c8
Merge branch '0.9.x' into 1.0.x
2010-03-29 15:15:51 -07:00
Nick Holliday
260f00d60b
Multiple file upload handling.
2010-03-26 18:28:54 -04:00
Zach Copley
15736ea435
Really make sure we return 'true' and 'false' strings for boolean vals in api/statusnet/config.:format.
2010-03-26 19:59:05 +00:00
Zach Copley
c9a3916c34
Really make sure we return 'true' and 'false' strings for boolean vals in api/statusnet/config.:format.
2010-03-26 19:58:26 +00:00
Sarven Capadisli
b4a4438abd
Using unique @for, @id pair for jabber and sms options in subscriptions
2010-03-25 22:20:20 +01:00
Sarven Capadisli
321093886f
Assigned an identifier for the representative user and group profile
2010-03-25 21:32:28 +01:00
Brion Vibber
c3ceaa893f
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 1.0.x
2010-03-24 14:11:01 -07:00
Sarven Capadisli
9fe12be41e
Using unique @for, @id pair for jabber and sms options in subscriptions
2010-03-24 21:34:53 +01:00
Julien C
a3da5b24c9
Misc small fixes, plus a new hook in tag.php
2010-03-23 23:02:17 -04:00
Brion Vibber
2ae61307bb
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into 0.9.x
2010-03-23 14:20:14 -07:00
Brion Vibber
7dc24b4ca7
FOAF was missing OStatus remote subscriptions, now fixed.
2010-03-23 13:10:23 -07:00
Brion Vibber
7277b59734
Merge branch 'master' of git@gitorious.org:statusnet/mainline into testing
2010-03-23 12:13:32 -07:00
Brion Vibber
44caa3a93f
Consistently send Profiles into Fave::addNew()
2010-03-23 11:08:30 -07:00
Brion Vibber
533a3bf6a3
Consistently send Profiles into Fave::addNew()
2010-03-23 11:06:37 -07:00
Brion Vibber
886e28aaa9
Stub plugins administration panel, allows for disabling/re-enabling plugins from the default plugins list.
2010-03-22 13:58:27 -07:00
Brion Vibber
e89908f261
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 1.0.x
...
Conflicts:
lib/channel.php
scripts/imdaemon.php
2010-03-22 13:56:16 -07:00
Brion Vibber
7e2af3dcae
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into 0.9.x
...
Conflicts:
plugins/OStatus/extlib/hkit/hkit.class.php
plugins/OStatus/lib/discoveryhints.php
2010-03-19 15:51:22 -07:00
Brion Vibber
79ec565104
Merge branch 'master' of git@gitorious.org:statusnet/mainline into testing
2010-03-19 15:29:00 -07:00
Brion Vibber
8a221228eb
Fix typo in public tag cloud query setup which caused the cutoff to get skipped.
2010-03-19 12:51:27 -07:00
Brion Vibber
2097e6a293
Fix typo in public tag cloud query setup which caused the cutoff to get skipped.
2010-03-19 12:50:34 -07:00
Zach Copley
348412f9c9
Allow admins to set a min site textlimit of 0 (unlimited)
2010-03-19 10:30:04 -07:00
Brion Vibber
3e2e88b0df
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into 0.9.x
2010-03-18 17:19:28 -07:00
Brion Vibber
01a1e882af
Handle "forgot to upload an avatar on avatarsettings" a little more gracefully.
2010-03-18 17:18:01 -07:00
Zach Copley
e10d023d03
API - handle any exceptions thrown during notice save. The API was
...
occasionally spitting out HTML, which is hard for clients to deal
with.
2010-03-18 15:26:13 -07:00
Zach Copley
54c6dc090b
Remove deprecated call-by-reference. Was causing a warning on Dreamhost.
2010-03-18 13:49:28 -07:00
Zach Copley
c09db79b95
Remove deprecated call-by-reference. Was causing a warning on Dreamhost.
2010-03-18 13:46:11 -07:00
Brion Vibber
67f2f01c5e
Merge branch 'testing' into 0.9.x
2010-03-17 12:15:40 -07:00
Brion Vibber
b9fc4c24b4
Pulling the stub plugin panel back out; we'll flesh it out more for 1.0.x and see if we can make it easier to disable through the config file for now.
...
Revert "Stub plugins administration panel, allows for disabling/re-enabling plugins from the default plugins list."
This reverts commit d9a9fd3779
.
2010-03-17 08:55:16 -07:00
Brion Vibber
d9a9fd3779
Stub plugins administration panel, allows for disabling/re-enabling plugins from the default plugins list.
2010-03-16 16:01:00 -07:00
Zach Copley
d1ea448c27
Always output a site logo via /api/statusnet/config.:format (so client devs have something to use)
2010-03-15 18:41:15 -07:00
Brion Vibber
441e52718e
Background deletion of user accounts. Notices are deleted in chunks, then the user itself when they're all gone.
...
While deletion is in progress, the account is locked with the 'deleted' role, which disables all actions with rights control.
Todo:
* Pretty up the notice on the profile page about the pending delete. Show status?
* Possibly more thorough account disabling, such as disallowing all use for login and access.
* Improve error recovery; worst case is that an account gets left locked in 'deleted' state but the queue jobs have gotten dropped out. This would leave the username in use and any undeleted notices in place.
2010-03-15 16:08:00 -07:00
Zach Copley
40cde2f710
Initial Twitpic-like media upload endpoint /api/statusnet/media/upload
2010-03-15 22:16:33 +00:00
Brion Vibber
c89e1865f7
Merge branch 'testing' into 0.9.x
2010-03-15 12:45:38 -07:00
Brion Vibber
e9b671e3af
Consolidate and patch up redirection to remote notices.
...
Now using the correct order consistently (URL, then URI if http/s), and as a niceness measure skipping the redirect if the only URL we have stored is the local one. (Could happen if remote OStatus feed has tag URIs and no alt link.)
2010-03-15 11:38:37 -07:00
Sarven Capadisli
5b078eadd9
Assigned an identifier for the representative user and group profile
2010-03-13 16:48:21 -05:00
Brion Vibber
d2c4ff5f7c
Ticket 2239: white space before apostrophe in metadata of status of notice
2010-03-13 11:54:04 -08:00
Brion Vibber
f72eb17304
Merge commit 'origin/testing' into 0.9.x
2010-03-12 09:41:49 -08:00
Zach Copley
13556e7ba9
Add Atom self link to tag timeline
2010-03-12 04:08:31 +00:00
Zach Copley
d31004653f
Add Atom self link to favorites timeline
2010-03-12 03:42:00 +00:00
Zach Copley
4b41a8ebbf
- Output correct content header for Atom output in mentions timeline
...
- Add self link
2010-03-12 03:27:37 +00:00
Zach Copley
849d0b5dcd
Output Atom self link in home timeline
2010-03-12 03:15:51 +00:00
Zach Copley
0444cc7bfb
Calculate Atom self link for friends timeline
2010-03-12 02:18:53 +00:00
Brion Vibber
b9e9030201
Fixes for password recovery; lookups for unconfirmed addresses were failing or inconsistent (using staticGet with unindexed fields, which would not get decached correctly and could get confused if multiple pending confirmations of different types are around).
...
Also uses updated email functions to include extra headers and ensure the proper address is used.
2010-03-11 18:01:50 -08:00
Zach Copley
d10cb89f6a
- Output correct content type header for public timeline Atom feed
...
- Also calculate Atom link and self links properly
2010-03-12 02:00:53 +00:00
Zach Copley
e1537d8387
More generalized method for calculating Atom rel="self" links
2010-03-12 01:40:52 +00:00
Zach Copley
212b20e876
Add self link to user and group rss2 feeds
2010-03-11 23:43:03 +00:00
Sarven Capadisli
20cb9fa28f
foaf:holdsAccount is deprecated in favour of foaf:account. See
...
http://lists.foaf-project.org/pipermail/foaf-dev/2009-December/009903.html
for the news. Patch by Toby Inkster <mail@tobyinkster.co.uk>.
2010-03-11 17:16:37 -05:00
Zach Copley
2a426f24c0
Allow site-specific doc files
2010-03-10 22:27:28 +00:00
Zach Copley
4741683298
Allow site-specific doc files
2010-03-10 22:05:28 +00:00
Brion Vibber
6c4ade4251
Merge branch 'testing' into 0.9.x
2010-03-09 11:27:53 -08:00
Michele
b98f956c6b
API config return textlimit value
2010-03-09 15:39:40 -08:00
Evan Prodromou
0d66dc543d
an otp is a real login
2010-03-08 18:06:21 -05:00
Craig Andrews
714d920fae
Merge branch '0.9.x' into 1.0.x
...
Conflicts:
classes/statusnet.ini
db/statusnet.sql
lib/jabber.php
lib/xmppmanager.php
2010-03-08 17:22:23 -05:00
Zach Copley
421041c51a
No need to pass in $this->limit and $this-tag
2010-03-05 16:53:48 -08:00
Zach Copley
d59284d42d
No need to pass in $this->limit and $this-tag
2010-03-05 16:52:15 -08:00
Zach Copley
4ada86560c
Fix undefined variable error and some other cleanup
2010-03-05 16:42:27 -08:00
Christopher Vollick
1a03820628
UserRSS Didn't Use the Tag Propery.
...
This meant that server.com/user/tag/TAG/rss just returned all user data.
That was incorrect.
2010-03-05 16:42:17 -08:00
Zach Copley
f653c3b914
Fix undefined variable error and some other cleanup
2010-03-05 16:40:35 -08:00
Christopher Vollick
43cc24a0cc
UserRSS Didn't Use the Tag Propery.
...
This meant that server.com/user/tag/TAG/rss just returned all user data.
That was incorrect.
2010-03-05 16:29:14 -08:00
Zach Copley
ab8aa67008
Fix for blank RSS1 tag feeds
2010-03-05 16:23:28 -08:00
Zach Copley
f39d3e34bb
Fix for blank RSS1 tag feeds
2010-03-05 16:20:33 -08:00
Rasmus Lerdorf
086d517b87
Fix a few typos
2010-03-04 23:30:04 -05:00
Brion Vibber
f969d6349c
Merge branch 'testing' into 0.9.x
...
Conflicts:
db/08to09.sql
2010-03-04 10:16:59 -08:00
Brion Vibber
9f861e9d89
Fix on sitenotice admin panel save
2010-03-04 06:39:46 -08:00
Brion Vibber
b218aee94e
Merge commit 'origin/testing' into 0.9.x
...
Conflicts:
lib/action.php
lib/adminpanelaction.php
2010-03-04 06:07:28 -08:00
Zach Copley
61de37ec7b
Move snapshot configuration to its own admin panel
...
Turn on with: $config['admin']['panels'][] = 'snapshot';
2010-03-03 16:49:14 -08:00
Brion Vibber
8436306d28
Fix notice warning in RSS friends timeline
2010-03-03 16:38:51 -08:00
Brion Vibber
9fadf8da11
Put all required field setup into AtomUserNoticeFeed and AtomGroupNoticeFeed, consolidating some code. (RSS feeds pulling title, logo etc from the Atom data structure so we don't dupe it.)
...
OStatus now calling the feed classes directly instead of faking a call into the API, should be less flakey.
2010-03-03 16:33:20 -08:00
Brion Vibber
4a2511139e
Initial user role controls on profile pages, for owner to add/remove administrator and moderator options.
...
Buttons need to be themed.
2010-03-03 15:43:49 -08:00
Zach Copley
337b1aaaa1
Site-wide notice text admin panel
2010-03-03 14:37:30 -08:00
Sarven Capadisli
2a96d1d59d
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
2010-03-03 16:27:19 -05:00
Sarven Capadisli
6ff994b14c
Fix to group join event position.
2010-03-03 16:25:17 -05:00
Brion Vibber
c04c8ae59a
quick fix: skip notice from unused variable on group atom feed generation
2010-03-03 13:00:09 -08:00
Sarven Capadisli
13713a09bb
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
2010-03-03 15:31:44 -05:00
Sarven Capadisli
2ce9ae004d
Added event hooks for before and after user groups content
2010-03-03 15:29:51 -05:00
Zach Copley
09169d6f3c
Merge branch 'testing' of gitorious.org:statusnet/mainline into testing
...
* 'testing' of gitorious.org:statusnet/mainline:
Language setting fixes:
2010-03-03 12:11:20 -08:00
Zach Copley
82ea0f7884
Merge branch 'testing' of gitorious.org:statusnet/mainline into testing
...
* 'testing' of gitorious.org:statusnet/mainline:
subscribers list wasn't firing correct events
2010-03-03 12:10:48 -08:00
Brion Vibber
0881eba80e
Language setting fixes:
...
- switch 'en_US' to 'en', fixes the "admin panel switches to Arabic" bug
- tweak setting descriptions to clarify that most of the time we'll be using browser language
- add a backend switch to disable language detection (should this be exposed to ui?)
2010-03-03 12:10:43 -08:00
Zach Copley
2f167f2663
Fix syntax errors
2010-03-03 12:10:21 -08:00
Evan Prodromou
c82efb7fd8
subscribers list wasn't firing correct events
2010-03-03 15:09:07 -05:00
Sarven Capadisli
b65ee23e82
Added event hooks for group subscribe
2010-03-03 12:01:38 -05:00
Brion Vibber
ddf3614c84
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into 0.9.x
2010-03-02 13:38:10 -08:00
Brion Vibber
72460091dd
Merge branch 'master' of git@gitorious.org:statusnet/mainline into testing
2010-03-02 12:21:48 -08:00
Brion Vibber
6b134ae4c7
Dropped deprecated timestamp-based 'since' parameter for all API methods. When it sneaks in it can cause some very slow queries due to mismatches with the indexing.
...
Twitter removed 'since' support some time ago, and we've already removed it from the public timeline, so it shouldn't be missed.
2010-03-02 11:54:02 -08:00
Sarven Capadisli
350e1289af
Added event hook for before and after personal timeline content
2010-03-02 12:33:25 -05:00
Siebrand Mazeland
767d49495d
Add translator documentation
...
Signed-off-by: Siebrand Mazeland <s.mazeland@xs4all.nl>
2010-03-02 17:45:15 +01:00
Siebrand Mazeland
d08fd8254a
Document 404 "Page not found" server error for translators.
2010-03-02 17:30:22 +01:00
Siebrand Mazeland
53ac232f91
Documented all but one UI string in actions/accessadminpanel.php to get a feel on what documenting them in code actually means.
...
Signed-off-by: Siebrand Mazeland <s.mazeland@xs4all.nl>
2010-03-02 17:23:40 +01:00
Siebrand Mazeland
284b1dc014
* Change translator documentation using _m() as designed together with Brion
...
* Add more translator documentation
Signed-off-by: Siebrand Mazeland <s.mazeland@xs4all.nl>
2010-03-02 16:38:36 +01:00
Brion Vibber
493b5479c1
OStatus: support @example.com/path/to/profile mentions as well as @profile@example.com (latter requires webfinger, former doesn't)
...
Plus misc warnings/notices cleanup in the submission path.
2010-03-01 16:43:36 -08:00
Evan Prodromou
656a977016
remove strict check on OMB exception strings
2010-03-01 18:03:18 -05:00
Evan Prodromou
c7d8641e7d
return correct HTTP status code for OMB errors
2010-03-01 18:03:18 -05:00
Evan Prodromou
1414b6b849
send smaller error pages for OMB API endpoints
2010-03-01 18:03:18 -05:00
Siebrand Mazeland
8e102da76c
Add contextual documentation to allow better localisation.
2010-03-01 22:28:38 +01:00
Siebrand Mazeland
63ff9d86b8
Add content for all 3 Send buttons (2 are the same as far as I can tell)
2010-03-01 15:57:27 +01:00
Siebrand Mazeland
78ea4c711e
Add context for Send button on invite.php
2010-03-01 15:49:53 +01:00
Brion Vibber
9b366547d7
Merge branch 'testing' of gitorious.org:statusnet/mainline into 0.9.x
2010-02-26 12:33:50 -08:00
Brion Vibber
88ae7f53bb
Merge branch 'master' of gitorious.org:statusnet/mainline into testing
2010-02-26 12:33:13 -08:00
Christopher Vollick
c95daacfdb
Updated ShowGroup to Resolve Aliases Again.
...
The way we find groups changed with this new Local_group table.
I had to update this too.
2010-02-26 12:30:23 -08:00
Evan Prodromou
fc576562a3
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
2010-02-26 12:40:59 -05:00
Evan Prodromou
6781f95c73
Merge branch 'blacklistplus' into testing
...
Conflicts:
EVENTS.txt
2010-02-26 12:40:30 -05:00
Brion Vibber
8dfc8f1635
Merge branch 'testing' into 0.9.x
2010-02-26 09:35:28 -08:00
Michele
6ae39da198
Fixed object name
2010-02-26 11:35:55 +01:00
Zach Copley
6cc26a613b
Remove unnecessary requires
2010-02-25 22:08:25 -08:00
Zach Copley
e650794300
Remove unnecessary requires
2010-02-25 22:06:31 -08:00
Zach Copley
c49fbb63c5
Merge branch 'testing' of gitorious.org:statusnet/mainline into testing
...
* 'testing' of gitorious.org:statusnet/mainline:
init_conversation.php script to copy old notice conversations into the conversation table
cache results of webfinger lookups
Parse an hcard for hints, if available
use new hcard method for webfinger
add hkit for hCard parsing
use new dedicated hcard method for Webfinger profile
Add an hcard action
2010-02-25 18:13:34 -08:00
Zach Copley
792f0942f7
Fix atom feed IDs in user and group atom feeds
2010-02-25 18:13:06 -08:00
Evan Prodromou
4aa82f75ed
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
2010-02-25 18:45:32 -05:00
Evan Prodromou
76216af806
Add an hcard action
...
A dedicated hcard action for users. Our profile page includes
an hcard, but it's so full of other hcards that it's ambiguous which
one is the "real" one. So, this one make sense for meaning, "This is
my hcard."
2010-02-25 18:39:55 -05:00
Brion Vibber
e254c660f6
Fix bug on subscribe/unsubscribe in profile lists. Bogus call to nonexisting profile->getProfile() was masked by DB_DataObject
2010-02-25 15:22:23 -08:00
Brion Vibber
b5b5184c88
OStatus: fix remote groups to work with new user_groups/local_groups split.
...
- fix <activity:subject> generation so we get the profile info (what's available so far)
- use id instead of nickname for group join/leave forms so we can join/leave remote groups
while the rest of the groups UI remains limited to local groups
(plugins are responsible for making sure remote notifications and permission checks are done)
- fix remote notification when joining group through OStatus's remote subscribe form
2010-02-25 13:02:08 -08:00
Evan Prodromou
d53b4b9b84
save mainpage element for groups
2010-02-25 12:05:22 -05:00
Evan Prodromou
e6858d7203
modify group actions so they use Local_group to look up by nickname
2010-02-25 08:44:15 -05:00
Craig Andrews
c187bf5597
Merge branch '0.9.x' into 1.0.x
...
Conflicts:
EVENTS.txt
db/statusnet.sql
lib/queuemanager.php
2010-02-24 20:52:45 -05:00
Brion Vibber
59be4b8cae
Merge branch 'testing' of gitorious.org:statusnet/mainline into 0.9.x
2010-02-24 15:47:51 -08:00
Evan Prodromou
1bffe42413
Drop user-only requirement for subscribe action
...
I removed the check for local users in the subscribe button. I replaced
it with a more specific check for OMB 0.1 remote profiles, which you
can't use with this action.
I also took the opportunity to split the handle() method into
prepare() and handle(), and added PHPCS clean documentation.
2010-02-23 08:38:23 -05:00
Brion Vibber
d410df0406
OStatus group delivery initial implementation.
...
- added rel="ostatus:attention" links for group delivery
- added events for plugins to override group profile/permalink pages
- pulled Notice::saveGroups up to save-time so we can override;
it's relatively cheap and gives us a clean list of target
groups for distrib time even with customized delivery.
- fixed notice::getGroups to return group objects as expected
- added some doc on new parameters to Notice::saveNew
- 'groups' list of group IDs to push to in place of parsing
- messages that come in via PuSH and contain local group targets
are delivered to local group members
- messages that come in via PuSH and contain remote group targets
are delivered to local members of the remote group
Todo:
- handle group posts that only come through Salmon
- handle conflicts in case something comes in both through Salmon and PuSH
- better source verification
- need a cleaner interface to look up groups by URI
- need a way to handle remote groups with conflicting names
2010-02-23 00:44:45 +00:00
Sarven Capadisli
c88507fe11
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
2010-02-22 17:08:54 +01:00
Evan Prodromou
13ad48fab3
Merge branch 'master' into testing
2010-02-22 11:04:11 -05:00
Evan Prodromou
5a6967db6c
clear the site owner when profile changes
2010-02-22 11:03:56 -05:00
Sarven Capadisli
8ccc9e2c38
Added before and after event hooks for subscriptions content
2010-02-22 17:03:28 +01:00
Brion Vibber
3c61f45de1
Merge branch 'master' of gitorious.org:statusnet/mainline into testing
2010-02-21 18:56:41 -08:00
Brion Vibber
f6ebe81538
Performance fix for FriendFeed sup interface: MySQL query optimizer was doing a table scan on notice; explicit subquery makes it run much more efficiently, only scanning items within the period under consideration. Standard subquery should be PostgreSQL-compatible.
2010-02-21 15:21:18 -08:00
Brion Vibber
85528ccb1f
Merge branch 'testing' of gitorious.org:statusnet/mainline into 0.9.x
2010-02-21 11:12:56 -08:00
Brion Vibber
3e7a2a4014
Fix for doc action on systems that return false for globbing in a non-existing dir
2010-02-21 11:11:37 -08:00
Evan Prodromou
a3de4caf49
make sure argument to Fave::addNew() is a profile
2010-02-20 20:31:06 -05:00
Evan Prodromou
f3b08461bd
Change to use TagURI::base() instead of common_config()
...
I changed the way that tag: URIs are minted, so we now use the right
base. Ideally most of these would use HTTP URIs instead, but for
now at least they use the right base.
2010-02-20 13:31:20 -05:00
Evan Prodromou
b0a75a2ab2
replace calls to subs_(un)subscribe_user with Subscription methods
2010-02-19 08:31:20 -05:00
Brion Vibber
5a6cbb248f
Merge branch 'testing' into 0.9.x
2010-02-17 10:14:08 -08:00
Brion Vibber
880acb05b0
OStatus: temporary output mode hack for apitimelineuser until PuSH feed generation is updated to use the shared code instead of output buffering
2010-02-16 22:04:57 +00:00
Craig Andrews
20d6a7caed
Merge branch '0.9.x' into 1.0.x
...
Conflicts:
lib/queuemanager.php
lib/xmppmanager.php
plugins/Xmpp/Fake_XMPP.php
scripts/imdaemon.php
2010-02-16 13:15:09 -05:00
Brion Vibber
d5cbfe8071
Merge branch 'testing' into 0.9.x
...
Conflicts:
lib/iomaster.php
2010-02-16 09:25:09 -08:00
Craig Andrews
32084e33a2
Merge branch '0.9.x' into 1.0.x
...
Conflicts:
lib/queuemanager.php
2010-02-16 10:25:57 -05:00
Zach Copley
f3a82e787c
Add OStatus PuSH hub and Salmon links back into user and group feeds
2010-02-12 19:02:27 -08:00
Brion Vibber
f8a459a88a
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into 0.9.x
2010-02-12 15:32:12 -08:00
Zach Copley
506c2d7491
Initial upgraded Atom output for group timelines
2010-02-12 12:24:29 -08:00
Brion Vibber
122c8677b7
Merge branch 'testing' of gitorious.org:statusnet/mainline into 0.9.x
2010-02-12 11:18:35 -08:00
Zach Copley
c465f675d9
Make Atom timelines in the API use Atom10feed
2010-02-11 13:56:05 -08:00
Zach Copley
e2c0f59414
Some upgrades to Atom output for OStatus
2010-02-11 13:56:05 -08:00
Zach Copley
ce3c3be1bf
Utility classes for atom feeds
2010-02-11 13:56:05 -08:00
Brion Vibber
c4557d4d07
Merge branch 'master' of git@gitorious.org:statusnet/mainline into testing
2010-02-10 11:12:11 -08:00
Brion Vibber
8449256817
OStatus partial support for group subscriptions:
...
* detection of group feeds is currently a nasty hack based on presence of '/groups/' in URL -- should use some property on the feed?
* listing for the remote group is kinda cruddy; needs to be named more cleanly
* still need to establish per-author profiles (easier once we have the updated Atom code in)
* group delivery probably not right yet
* saving of group messages still triggering some weird behavior
Added support for since_id and max_id on group timeline feeds as a free extra. Enjoy!
2010-02-09 18:32:52 -08:00
Zach Copley
70d5f39ed6
Better checking for duplicate app names
2010-02-08 21:57:29 -08:00
Zach Copley
2600ad9643
Better checking for duplicate app names
2010-02-08 21:56:47 -08:00
Zach Copley
602b01a755
Merge branch 'testing' of gitorious.org:statusnet/mainline into testing
...
* 'testing' of gitorious.org:statusnet/mainline:
Pull GeoRSS locations over OStatus feeds
Allow scripts/decache.php to blow out cache for objects that don't exist (anymore).
OStatus cleanup...
readme and version for beta5
Delete old Twitter user record when user changes screen name instead of updating. Simpler.
Store Twitter screen_name, not name, for foreign_user.nickname when saving Twitter user.
Actually store the timestamp on each nonce
OAuth app name should not be null
Fix issue with OAuth request parameters being parsed/stored twice when
- Fix cache handling in TwitterStatusFetcher
Added right margin for notice text. Helps Conversation notices look
Confirm dialog for reset OAuth consumer key and secret button
Always check for an OAuth request. This allows OAuth clients to set an
Linkify notice source when posting from registered OAuth apps
Suppress notice input box on OAuth authorization page
Better token revocation
Allow developers to delete OAuth applications
OAuth app names should be unique.
Prevents app statistic text from wrapping around avatar
Sentence case for app statistics
2010-02-08 21:55:32 -08:00
Zach Copley
b56b154b51
Better checking for duplicate app names
2010-02-08 21:52:05 -08:00
Brion Vibber
bc4e843f39
Disable deprecated 'since' parameter on public_timeline API; causes performance problems. (since_id will work cleanly)
2010-02-08 19:22:55 -08:00
Brion Vibber
b2e8d8407c
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into 0.9.x
2010-02-08 15:48:52 -08:00
Brion Vibber
384387c9b0
OStatus cleanup...
...
* Treat linkless feed posts as status updates; drop the "New post:" prefix and quotes on them.
* Use stable user IDs for atom/rss2 feed links instead of unstable nicknames
* Pull Atom feed preferentially when subscribing -- can now put the remote user's profile page straight into the feed subscription form and get to the right place.
* Clean up naming for push endpoints
2010-02-08 14:58:12 -08:00
Brion Vibber
dc09453a77
First steps on converting FeedSub into the pub/sub basis for OStatus communications:
...
* renamed FeedSub plugin to OStatus
* now setting avatar on subscriptions
* general fixes for subscription
* integrated PuSH hub to handle only user timelines on canonical ID url; sends updates directly
* set $config['feedsub']['nohub'] = true to test w/ foreign feeds that don't have hubs (won't actually receive updates though)
* a few bits of code documentation
* HMAC support for verified distributions (safest if sub setup is on HTTPS)
And a couple core changes:
* minimizing HTML output for exceptions in API requests to aid in debugging
* fix for rel=self link in apitimelineuser when id given
This does not not yet include any of the individual subscription management (Salmon notifications for sub/unsub, etc) nor a nice UI for user subscriptions.
Needs some further cleanup to treat posts as status updates instead of link references.
2010-02-08 11:15:29 -08:00
Evan Prodromou
a092aac32d
add events to fine-tune user deletion
2010-02-06 12:59:41 +01:00
Evan Prodromou
5fdcd88176
Moderator can make users admins of a group
2010-02-06 11:36:59 +01:00
Zach Copley
ff509feff0
Updated /api/statusnet/config.xml to show new config params potentially relevant to client devs
2010-02-05 13:40:00 -08:00
Michele
b65ed56c7a
API config return textlimit value
2010-02-05 13:12:49 -08:00
Zach Copley
23802e58d6
Merge branch 'temp'
2010-02-05 03:19:12 +00:00
Zach Copley
4379027432
Fix issue with OAuth request parameters being parsed/stored twice when
...
calling /api/account/verify_credentials.:format
2010-02-05 03:18:45 +00:00
Zach Copley
7931875bbb
Confirm dialog for reset OAuth consumer key and secret button
2010-02-05 03:18:44 +00:00
Zach Copley
e9ecd8062a
Suppress notice input box on OAuth authorization page
2010-02-05 03:18:44 +00:00
Zach Copley
b31c79cee1
Better token revocation
2010-02-05 03:18:43 +00:00
Zach Copley
e495ac356c
Allow developers to delete OAuth applications
2010-02-05 03:18:43 +00:00
Zach Copley
dc183f23cf
OAuth app names should be unique.
2010-02-05 03:18:43 +00:00
Sarven Capadisli
52397f1474
Sentence case for app statistics
2010-02-05 03:18:43 +00:00
Zach Copley
6cf5df505a
Fix issue with OAuth request parameters being parsed/stored twice when
...
calling /api/account/verify_credentials.:format
2010-02-05 02:09:50 +00:00
Zach Copley
8d320d7cc2
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
2010-02-05 02:08:37 +00:00
Zach Copley
5e0cc07b0e
Fix issue with OAuth request parameters being parsed/stored twice when
...
calling /api/account/verify_credentials.:format
2010-02-05 01:13:23 +00:00
Eric Helgeson
2eadeca745
Missed change when refactoring groups. Thanks macno
2010-02-04 14:00:46 -08:00
Eric Helgeson
37f3a3d558
Missed change when refactoring groups. Thanks macno
2010-02-04 14:00:06 -08:00
Brion Vibber
0d0749e224
Merge branch 'testing' of gitorious.org:statusnet/mainline into 0.9.x
2010-02-04 13:12:18 -08:00
Brion Vibber
ed8553eea8
Merge branch 'master' of gitorious.org:statusnet/mainline into testing
2010-02-04 13:11:41 -08:00
Brion Vibber
239b88025e
Should fix spurious 'nickname taken' and 'email taken' errors on registration. Form's checks for existing nicks & emails would incorrectly return true on the second lookup due to bad interaction with negative caching.
...
(was checking $obj !== false but we return null now on negative cache hits, with false for cache misses)
2010-02-04 13:08:34 -08:00
Brion Vibber
c59eee72a8
Merge branch 'testing' of gitorious.org:statusnet/mainline into 0.9.x
2010-02-04 12:23:56 -08:00
Brion Vibber
a020e23086
Merge branch 'master' of gitorious.org:statusnet/mainline into testing
2010-02-04 11:56:07 -08:00
Brion Vibber
5a1cbdc6f1
Add time-based cutoffs for public tag cloud, favorited lists to speed up those queries.
...
Defaulting to only looking at last 90 days of activity, can be adjusted up or down.
$config['tag']['cutoff'] = 86400 * 90;
$config['popular']['cutoff'] = 86400 * 90;
Per-user and per-group tag clouds do not use the cutoff (and it doesn't help with indexing on them).
2010-02-04 11:06:01 -08:00
Sarven Capadisli
48782ee1d9
Fixes minor remote subscription profile layout
2010-02-04 17:55:24 +01:00
Sarven Capadisli
d2dc3e41c5
Fixes minor remote subscription profile layout
2010-02-04 16:27:34 +00:00
Zach Copley
ac8a4a7e56
Confirm dialog for reset OAuth consumer key and secret button
2010-02-03 05:43:08 +00:00
Zach Copley
03e8ba144e
Confirm dialog for reset OAuth consumer key and secret button
2010-02-03 01:43:59 +00:00
Craig Andrews
057ec1fcea
Merge branch '0.9.x' into 1.0.x
...
Conflicts:
EVENTS.txt
lib/imqueuehandler.php
lib/jabber.php
lib/util.php
plugins/Xmpp/Sharing_XMPP.php
2010-02-02 17:00:10 -05:00
Brion Vibber
f4c81fa1e1
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into 0.9.x
2010-02-02 09:57:50 -08:00
Zach Copley
3906713b2a
Suppress notice input box on OAuth authorization page
2010-02-02 08:50:45 +00:00
Zach Copley
8191273078
Better token revocation
2010-02-02 08:50:33 +00:00
Zach Copley
f0875ceea1
Allow developers to delete OAuth applications
2010-02-02 08:50:18 +00:00
Zach Copley
df2a081265
OAuth app names should be unique.
2010-02-02 08:50:01 +00:00
Zach Copley
c03883fc88
Suppress notice input box on OAuth authorization page
2010-02-02 07:59:28 +00:00
Zach Copley
f1094185e4
Better token revocation
2010-02-02 07:35:54 +00:00
Zach Copley
38bebb4c0d
Allow developers to delete OAuth applications
2010-02-02 06:26:03 +00:00
Sarven Capadisli
803c6d954c
Revert "Removed hAtom pattern from registration page."
...
This reverts commit d6fe865133
.
Screws up list rendering when registration is complete.
2010-02-01 23:10:44 +00:00
Zach Copley
59d16cf16a
OAuth app names should be unique.
2010-02-01 20:58:30 +00:00
Sarven Capadisli
95e70f5e53
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
2010-02-01 20:32:48 +01:00
Sarven Capadisli
0e49b3525d
Sentence case for app statistics
2010-02-01 20:31:56 +01:00
Brion Vibber
c14ac57b19
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into 0.9.x
2010-02-01 10:30:45 -08:00
Brion Vibber
1625a13b93
Merge remote branch 'statusnet/master' into testing
2010-02-01 09:04:13 -08:00
Brion Vibber
6159edcebb
Improve name validation checks on local File references
2010-02-01 08:49:59 -08:00
Evan Prodromou
0787daff2c
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
2010-02-01 11:49:50 -05:00
Brion Vibber
d9e7d4c4ad
Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.x
2010-02-01 08:49:19 -08:00
Brion Vibber
84ab0156b4
Improve name validation checks on local File references
2010-02-01 08:48:31 -08:00
Evan Prodromou
7390b1d1ac
Merge branch 'master' into testing
2010-02-01 11:21:50 -05:00
Evan Prodromou
57d8f22a3a
fix local file include vulnerability in doc.php
...
Conflicts:
actions/doc.php
2010-02-01 11:20:22 -05:00
Evan Prodromou
d264db6119
fix local file include vulnerability in doc.php
...
Conflicts:
actions/doc.php
2010-02-01 11:10:36 -05:00
Sarven Capadisli
d6fe865133
Removed hAtom pattern from registration page.
2010-02-01 13:14:35 +01:00
Evan Prodromou
779204b194
Merge branch 'testing' into 0.9.x
...
Conflicts:
actions/apioauthauthorize.php
2010-01-31 15:27:58 -05:00
Evan Prodromou
30268cff78
Add Really Simple Discovery (RSD) support
...
Anil Dash suggested that all implementers of the Twitter API include
support for the remedial RSD format. This commit adds an RSD action
that returns the API root and additional API data to help client
developers discover and use our Twitter-compatible API.
http://dashes.com/anil/2009/12/the-twitter-api-is-finished.html
http://tales.phrasewise.com/rfc/rsd
2010-01-31 15:16:59 -05:00
Evan Prodromou
dc62246443
Add a robots.txt URL to the site root
...
Adds a robots.txt file to the site root. Defaults defined by
'robotstxt' section of config. New events StartRobotsTxt and
EndRobotsTxt to let plugins add information. Probably not
useful if path is not /, but won't hurt anything, either.
2010-01-31 10:12:26 -05:00
Evan Prodromou
def5d56ce1
add lat, lon, location and remove closing tag from geocode.php
2010-01-30 12:47:21 -05:00
Evan Prodromou
1b7cc3393a
Use passed-in lat long in geocode.php
...
Don't rewrite the lat-long for a location in geocode.php.
2010-01-30 12:43:00 -05:00
Zach Copley
5868511716
Move sessions settings to its own panel
2010-01-28 22:06:01 -08:00
Zach Copley
440ee00b1e
Move sessions settings to its own panel
2010-01-28 22:04:14 -08:00
Craig Andrews
d14651706c
Merge branch '0.9.x' into 1.0.x
2010-01-28 16:13:06 -05:00
Sarven Capadisli
17f2096d70
Removed avatar from repeat of username (matches noticelist)
2010-01-28 15:08:33 +01:00
Sarven Capadisli
5b1245a32a
Removed avatar from repeat of username (matches noticelist)
2010-01-28 15:06:03 +01:00
Craig Andrews
914bc9f9c5
Merge branch '0.9.x' into 1.0.x
...
Conflicts:
lib/queuemanager.php
2010-01-27 22:07:04 -05:00
Zach Copley
5182cc686d
Numbered format specifiers
2010-01-28 01:39:18 +00:00
Zach Copley
420ae06faf
These API methods should return true for ->isReadOnly($args)!
2010-01-28 00:44:55 +00:00
Zach Copley
9589985e29
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
2010-01-28 00:43:24 +00:00
Zach Copley
77aed28f17
These API methods should return true for ->isReadOnly($args)!
2010-01-28 00:40:44 +00:00
Siebrand Mazeland
fcc48155ed
L10n updates:
...
* app -> application
* number parameters when using more than one in a message
2010-01-28 01:32:48 +01:00
Zach Copley
78079f34e2
Merge branch 'testing' into -1.9.x
...
* testing: (130 commits)
HTTP auth provided is evaluated even if it's not required
Rename rc3to09.sql to rc3torc4.sql to avoid confusion if we add a last-minute change after this!
Add new oauth tables and modifications to 'consumer' table for rc4
Centred leaderboard ad
camelcase the uap param names
move leaderboard to after the header
Moved rectangle ad into aside and leaderboard to the right in header.
Aligning wide skyscraper to the right instead of left
CSS ids and classes fixed in UAPPlugin
wrong height for rectangle in BlankAd
Add the moved BlankAdPlugin
make BlankAd dir and change to use a 1x1 image
move BlankAdPlugin to its own dir
Add BlankAdPlugin to test ad layout in different themes
make uapplugin an abstract class
move UAP plugin to core
Lowercased switch cases in UAP Plugin
Plugin for Universal Ad Package. Outputs four most widely used ad types.
Add persistent:true property to Stomp messages so ActiveMQ doesn't decide to discard them even though persistence is enabled on the broker. :) (Thanks Aric!)
quick fix: use common_path() on realtime update JS so it works with the new JS path code (will pull from main server for now)
...
Conflicts:
actions/apioauthaccesstoken.php
actions/apioauthauthorize.php
actions/apioauthrequesttoken.php
actions/editapplication.php
actions/newapplication.php
lib/apiauth.php
lib/queuemanager.php
lib/router.php
2010-01-27 14:27:22 -08:00
Craig Andrews
e9995b0f6a
Create IM plugin, Pluginize XMPP, Create AIM plugin
2010-01-27 13:48:35 -05:00
Evan Prodromou
c52951cef5
Optionally set a separate Javascript server and path
...
We have about 10-12 JavaScript pages per Web page. They usually
are based on the same server as the Web pages, but since they're
static files, it makes sense to offload them to a lite server that
handles static files well.
This commit lets you set a separate Javascript server and path for the
default Javascript code in StatusNet.
Squashed commit of the following:
commit 139d1622fdafe5ad00c820224416d9021efc3234
Author: Evan Prodromou <evan@status.net>
Date: Wed Jan 27 11:30:24 2010 -0500
modules that call htmloutputter::script() don't prescribe js/ path
commit c6ca3174af73efed55eaed5ff1e2a3bdc77d2d87
Author: Evan Prodromou <evan@status.net>
Date: Wed Jan 27 11:28:07 2010 -0500
configurable server and path for javascript files
2010-01-27 11:37:22 -05:00
Zach Copley
756da7bc51
s/LOG_WARN/LOG_WARNING/
2010-01-27 08:45:56 +00:00
Zach Copley
923b7de3c6
- Check for read-only vs. read-write access to protected API resources (OAuth)
...
- Some cleanup
2010-01-27 08:41:26 +00:00
Siebrand Mazeland
97e1acdc32
Fix casing for HMAC-SHA1.
2010-01-27 00:56:45 +00:00
Siebrand Mazeland
492950b784
Fix inconsistent title case in page title
2010-01-27 00:56:31 +00:00
Zach Copley
aad42427cc
New access admin panel for site registration settings
2010-01-26 15:56:19 -08:00
Zach Copley
03685bba1e
- Remove redudant/unused 'server' setting from site admin panel
...
- Move 'fancy urls' checkbox from site admin panel to paths admin panel
2010-01-26 15:11:09 -08:00
Evan Prodromou
663e4e02a1
Merge branch 'master' into testing
...
Conflicts:
lib/queuemanager.php
2010-01-25 18:13:09 -05:00
Evan Prodromou
b6aa1511eb
Merge branch 'master' into 0.9.x
2010-01-25 18:10:59 -05:00
Evan Prodromou
e26a843caf
Offload inbox updates to a queue handler to speed up posting online
...
Moved much of the writing that happens when posting a notice to a new
queuehandler, distribqueuehandler. This updates tags, groups, replies
and inboxes at queue time (or at Web time, if queues are disabled).
To make this work well, I had to break up the monolithic
Notice::blowCaches() and make cache blowing happen closer to where
data is updated.
Squashed commit of the following:
commit 5257626c62750ac4ac1db0ce2b71410c5711cfa3
Author: Evan Prodromou <evan@status.net>
Date: Mon Jan 25 14:56:41 2010 -0500
slightly better handling of blowing tag memory cache
commit 8a22a3cdf6ec28685da129a0313e7b2a0837c9ef
Author: Evan Prodromou <evan@status.net>
Date: Mon Jan 25 01:42:56 2010 -0500
change 'distribute' to 'distrib' so not too long for dbqueue
commit 7a063315b0f7fad27cb6fbd2bdd74e253af83e4f
Author: Evan Prodromou <evan@status.net>
Date: Mon Jan 25 01:39:15 2010 -0500
change handle_notice() to handle() in distributqueuehandler
commit 1a39ccd28b9994137d7bfd21bb4f230546938e77
Author: Evan Prodromou <evan@status.net>
Date: Mon Jan 25 16:05:25 2010 -0500
error with queuemanager
commit e6b3bb93f305cfd2de71a6340b8aa6fb890049b7
Author: Evan Prodromou <evan@status.net>
Date: Mon Jan 25 01:11:34 2010 -0500
Blow memcache at different point rather than one big function for Notice class
commit 94d557cdc016187d1d0647ae1794cd94d6fb8ac8
Author: Evan Prodromou <evan@status.net>
Date: Mon Jan 25 00:48:44 2010 -0500
Blow memcache at different point rather than one big function for Notice class
commit 1c781dd08c88a35dafc5c01230b4872fd6b95182
Author: Evan Prodromou <evan@status.net>
Date: Wed Jan 20 08:54:18 2010 -0500
move broadcasting and distributing to new queuehandler
commit da3e46d26b84e4f028f34a13fd2ee373e4c1b954
Author: Evan Prodromou <evan@status.net>
Date: Wed Jan 20 08:53:12 2010 -0500
Move distribution of notices to new distribute queue handler
2010-01-25 18:08:21 -05:00
Evan Prodromou
089305ac7a
fix interpolation of positional arguments to sprintf in tag action
2010-01-24 22:59:22 -05:00
Evan Prodromou
a9da43a416
fix interpolation of positional arguments to sprintf in show group
2010-01-24 22:57:33 -05:00
Evan Prodromou
019dad95e1
fix interpolation of positional arguments to sprintf in show favorites
2010-01-24 22:56:41 -05:00
Evan Prodromou
73fdec6c12
fix interpolation of positional arguments to sprintf in usergroups
2010-01-24 22:55:29 -05:00
Evan Prodromou
9077db00a5
fix interpolation of positional arguments to sprintf in inbox
2010-01-24 22:54:25 -05:00
Evan Prodromou
02526f1100
fix interpolation of positional arguments to sprintf in outbox
2010-01-24 22:53:29 -05:00
Evan Prodromou
fc7afed924
fix interpolation for positional arguments in replies
2010-01-24 22:52:03 -05:00
Evan Prodromou
e400437d57
fix interpolation for positional arguments in showstream
2010-01-24 22:50:07 -05:00
Zach Copley
4daf76212a
- Had to remove checking read vs. read-write in OAuth authenticated methods
...
- Will now pick up source attr from OAuth app
2010-01-25 00:51:56 +00:00
Zach Copley
9e7f47652d
Revoke access token UI
2010-01-24 16:36:05 -08:00