671b0f4cd9
format_notice -> formatNotice
2010-09-03 17:50:29 -04:00
a70cceaddd
send_confirmation_code -> sendConfirmationCode
2010-09-03 17:50:28 -04:00
1eccd2a4bd
send_from_site -> sendFromSite
2010-09-03 17:50:28 -04:00
b4d02650df
get_user_im_prefs_from_user -> getUserImPrefsFromUser
2010-09-03 17:50:28 -04:00
8263ae601b
get_user_im_prefs_from_screenname -> getUserImPrefsFromScreenname
2010-09-03 17:50:28 -04:00
f038eacca4
enqueue_incoming_raw -> enqueueIncomingRaw
2010-09-03 17:50:28 -04:00
e7a026091c
enqueue_outgoing_raw -> enqueueOutgoingRaw
2010-09-03 17:50:28 -04:00
b05ab5fc85
daemon_screenname -> daemonScreenname
2010-09-03 17:50:28 -04:00
764e0ab962
receive_raw_message -> receiveRawMessage
2010-09-03 17:50:28 -04:00
80176b0b2c
send_notice -> sendNotice
2010-09-03 17:50:28 -04:00
6a848bcc8a
send_message -> sendMessage
2010-09-03 17:50:28 -04:00
326258bfef
Merge branch '0.9.x' into 1.0.x
2010-09-02 22:57:37 -04:00
6c14235d6c
Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.x
2010-09-02 22:56:18 -04:00
388495f6b1
use etag preferably for caching
2010-09-02 22:26:20 -04:00
c8a69f433c
add some caching headers
2010-09-02 22:26:19 -04:00
0c5ca46ba3
combine our standard scripts into one big script
2010-09-02 22:21:07 -04:00
2196d00b1b
Merge branch '0.9.x' into 1.0.x
...
Conflicts:
lib/command.php
2010-09-02 15:04:25 -07:00
e365e709c5
Merge branch 'master' into testing
2010-09-02 14:58:11 -07:00
cbcb9b0080
Fixes for Mac metadata files mucking up theme zip files
2010-09-02 14:24:46 -07:00
c24458a9f0
Ticket #2638 : allow themes to specify a base theme to load with 'include' setting in a theme.ini file
2010-09-02 14:11:52 -07:00
c7d81f2d9d
hooks for showing <title> and <h1> elements
2010-09-02 17:10:25 -04:00
7517409bf1
Merge branch 'testing' into 0.9.x
2010-09-02 16:56:52 -04:00
11f7fce3bb
Fixes for custom theme upload:
...
* skip more files (.xcf image sources, .html docs)
* skip files before rejecting them for funky filenames!
* allow period in filenames (eg foo-1.4.ttf) but blacklist some unsafe extensions-within-extensions
2010-09-02 12:11:45 -07:00
4cbbfdab84
Fix for #2635 : use ssl-sometimes settings for Twitter settings & auth pages
2010-09-02 10:55:26 -07:00
f64fff379c
* when using multiple parameters, number them
...
* fix double space to single space
* use consistent punctuation in messages
* complete translation hints for all commands
* add an i18n fixme for missing plural support
* trailing whitespace removed
2010-08-28 16:51:49 +02:00
2eb894e535
Document UI text and number parameters.
2010-08-28 16:28:23 +02:00
0cfaae48a3
Merge branch '0.9.x' into 1.0.x
2010-08-16 16:56:27 -07:00
a68c10280f
Merge branch 'master' into 0.9.x
2010-08-16 16:56:15 -07:00
033a757013
More schema work in progress... removing duped code from schema child classes, rebuilding things a bit more (incomplete; non-working state)
2010-08-16 16:31:18 -07:00
eaa4ded053
first pass at columndef->drupal-style array converter (need to handle some more things probably; untested)
2010-08-16 15:14:16 -07:00
b2a5e0d09b
StatusNet 0.9.4 "Orange Crush"
2010-08-16 10:09:33 -07:00
7f9ab683b2
fixed a %d that should be a %s in an error message
2010-08-16 10:03:58 -07:00
e687862ca1
fixed a %d that should be a %s in an error message
2010-08-16 13:26:27 +12:00
7183175429
Merge branch 'master' into 1.0.x
2010-08-13 14:33:41 -07:00
9b7536351b
hide the Whats Up Nickname if notice title enabled
2010-08-13 12:22:58 -07:00
ed8d8eb5ee
hooks to allow changing RSS content
2010-08-13 11:44:26 -07:00
f7d599f8ea
Fix for ticket 2513: "Can't linkify" error when some links are shortened
...
When bogus SSL sites etc were hit through a shortening redirect, sometimes link resolution kinda blew up and the user would get a "Can't linkify" error, aborting their post.
Now catching this case and just passing through the URL without attempting to resolve it. Could benefit from an overall scrubbing of the freaky link/attachment code though...! :)
http://status.net/open-source/issues/2513
2010-08-12 15:25:32 -07:00
ae696728f5
Merge branch '0.9.x' into 1.0.x
2010-08-12 12:56:23 -07:00
111fc33e1a
Output "web" instead of gettext translation file metadata when notice.source is empty
2010-08-11 18:53:34 -07:00
d15a41c96e
0.9.4beta2 update some notes in README, note the fix from beta1
2010-08-11 10:32:52 -07:00
db46d73a5f
Add dummy support for Esperanto.
2010-08-11 12:46:54 +02:00
19e6b84050
StatusNet_network staticGet lookup fix
2010-08-10 17:22:26 -07:00
5c210f724a
update version for 0.9.4beta1
2010-08-10 16:28:33 -07:00
08fc6053ec
Fix for regression with OStatus mention processing (duplicated new and old style lead to trying to save a reply entry twice).
2010-08-10 13:49:11 -07:00
6a2659ed67
Workaround for index setup on SubMirror until I'm done w/ arbitrary index support for Schema setup.
2010-08-10 11:45:34 -07:00
855f1f6623
Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 1.0.x
2010-08-09 13:11:41 -07:00
09dee24cbe
Add two i18n related FIXMEs.
2010-08-08 21:13:21 +02:00
ebd2fc2f7c
Partial fix for ticket #2489 -- problems with SNI SSL virtual host certificate validation.
...
Two prongs here:
* We attempt to enable SNI on the SSL stream context with the appropriate hostname... This requires PHP 5.3.2 and OpenSSL that supports the TLS extensions. Unfortunately this doesn't seem to be working in my testing.
* If set $config['http']['curl'] = true, we'll use the CURL backend if available. In my testing on Ubuntu 10.04, this works. No guarantees on other systems.
I'm not enabling CURL mode by default just yet; want to make sure there's no other surprises.
2010-08-06 10:14:07 -07:00
433c43c999
Merge branch 'testing' into 0.9.x
2010-08-05 11:02:53 -07:00
77a96e3d7c
Merge branch 'master' into testing
2010-08-05 10:56:49 -07:00
fd530a892f
Fix for source attribution on notices; it was displaying the code instead of the source name sometimes.
2010-08-04 12:31:31 -07:00
9f0715a993
Merge branch '0.9.x' into 1.0.x
2010-08-03 16:05:03 -07:00
004e42e3e0
Merge remote branch 'gitorious/1.0.x' into 1.0.x
2010-08-03 16:04:54 -07:00
eaef724c49
urgh. typo
2010-08-02 14:24:50 -04:00
e603632f13
add support for Salmon's new "mentioned" rel value
2010-08-02 14:06:14 -04:00
a1aea74fe2
Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.x
2010-08-02 09:43:58 -07:00
44d01f70a6
Localisation updates from http://translatewiki.net
...
* add support for Danish
2010-07-31 23:59:22 +02:00
1bb18e9bab
Merge branch '2471' into 0.9.x
2010-07-30 17:52:12 -07:00
0caebc9308
Fix for ticket #2471 : install.php returns unsuccessfully but doesn't display error message if PHP < 5.2.6 is used
...
http://status.net/open-source/issues/2471
Old bit of code didn't get updated for new installer
2010-07-30 13:16:47 -07:00
47f19988d1
allow schema to work on more than one connection (namely, the Status_network DB)
2010-07-29 21:04:28 -04:00
c2a26ba653
removing redundant constructor
2010-07-29 21:03:48 -04:00
fb2e00eacc
Merge branch 'master' into 0.9.x
...
Conflicts:
classes/Notice.php
2010-07-29 20:44:11 +00:00
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
e10621a52a
Merge branch 'testing' of gitorious.org:statusnet/mainline into testing
2010-07-28 17:51:07 -04:00
a01bc6b575
Merge branch 'googleadsadminpanel' into testing
2010-07-28 17:50:49 -04:00
ab2c3686b7
Merge branch 'testing' into 0.9.x
2010-07-28 11:59:42 -07:00
dbb5e9e191
accept mailto: URIs as OStatus identifiers
2010-07-22 16:00:26 -07:00
65862d8f7f
Suppress HTTP error headers for JSONP API output
2010-07-16 14:40:22 -07:00
453a06fff4
Exceptions are caught and continued on JSON, XML, Atom and RSS output in API
2010-07-13 11:11:29 -04:00
1044f27e47
handle missing profile for notices better in Rss10Action
2010-07-13 10:59:15 -04:00
d706a3e21b
handle missing profile for notices better in NoticeList
2010-07-13 10:59:01 -04:00
6968c96b44
log exceptions in atom feeds, but don't let them kill the output
2010-07-13 10:53:47 -04:00
dfd65a4290
push exception on missing profile down to Notice::getProfile()
2010-07-13 10:51:25 -04:00
ab149755b6
handle notices without profiles better in RSS output
2010-07-13 10:42:06 -04:00
1b3b7f9a42
Ticket 2427: fix regression in plugin i18n
2010-07-12 10:27:23 -07:00
974c4df029
Ticket 2433: Skip locale fallback list check on Windows ('locale -a' shell-out doesn't work there)
2010-07-12 09:56:32 -07:00
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
c9863bb864
Update version and code name: 0.9.3 Half a World Away
2010-06-28 15:08:01 -04:00
b2ad8ec571
Fix for PHP notice when given an integer degrees in decimalDegreesToDMS(); using math instead of string manipulation to split integer portion from decimal remainder.
2010-06-28 14:41:33 -04:00
fdd9aa58e3
Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 1.0.x
2010-06-28 13:41:04 -04:00
53f14ddde6
Merge branch 'testing' of gitorious.org:statusnet/mainline into 0.9.x
2010-06-28 13:39:52 -04:00
9c7b66984c
Enhanced upload file type detection. If given an original filename, we'll attempt to detect type from the extension if we were unable to make a definitive match from content. Generic octet-stream, zip, and MS Office type are explicitly singled out for re-checks, which fixes OpenOffice and MS Office documents to come up with the proper types when misdetected.
...
File extensions can also be added to the upload type whitelist; they'll be normalized to types for the actual comparison, so only known extensions will work.
2010-06-28 08:59:47 -07:00
fa282823d9
Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 1.0.x
2010-06-26 15:10:47 -04:00
c6b1e25d17
Merge branch 'testing' of gitorious.org:statusnet/mainline into 0.9.x
2010-06-26 15:09:30 -04:00
ef7e85c0ab
Merge branch 'master' of gitorious.org:statusnet/mainline into testing
2010-06-26 15:09:08 -04:00
f0c5e7eca3
Fix for bug #2382 : releasing claim on failed queue item works again with DB-based queues.
...
Warning: DB-based queue doesn't currently implement discarding of items after a retry limit. Failed items will be retried until they succeed.
2010-06-26 15:07:32 -04:00
00e129b013
Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 1.0.x
2010-06-26 10:18:03 -04:00
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
d9e56e15cc
Merge branch 'master' into testing
2010-06-26 10:16:27 -04:00
9eb5a976b0
Have API methods for search subclass ApiPrivateAuthAction
2010-06-24 18:11:50 -07:00
dad0b06a38
Throw an error if queueing is disable when using an IM plugin
2010-06-22 22:01:13 -04:00
1eec7f779f
- Add profile_info tag to Atom author
...
- Normalize xmlns:statusnet links in the API
2010-06-22 16:28:06 -07:00
87125a1395
Improve error message per discussion on http://translatewiki.net/wiki/Thread:Support/Unclear_message .
...
Spotted by Peter17 and changed per suggestion of McDutchie with approval of Brion.
2010-06-21 20:15:26 +02:00
a6ce4eef0d
Fix problem with AvatarLink in which it was sometimes leaving the width attribute empty
2010-06-16 18:27:51 -07:00
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
1a62d1b493
Use presence of IM plugins to decide if "IM" options should be available
2010-06-16 16:00:54 -04:00
d65d982681
Merge branch 'master' into testing
2010-06-16 12:37:14 -07:00
4ee2c12507
Use presence of IM plugins to decide if "IM" menu option should be shown in Connect
2010-06-15 17:04:15 -04:00
327ed5b87e
fix URL regex for tags to use UTF-8
2010-06-14 15:51:49 -04:00
a1b25b46bc
Merge branch 'master' into testing
2010-06-14 10:53:22 -07:00
3da8914edb
Fix for DB error reporting in installer (MySQL path)
2010-06-11 12:38:22 -07:00
004200f958
Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 1.0.x
2010-06-11 12:09:55 -07:00
7f3b3620af
Merge branch 'testing' of gitorious.org:statusnet/mainline into 0.9.x
2010-06-11 12:05:53 -07:00
47665e845a
Merge branch 'testing' of gitorious.org:statusnet/mainline into testing
2010-06-11 12:04:03 -07:00
ec15546476
Fix a couple bad format entries in router setup (format param had 'xmljson' instead of 'xml|json').
...
Warning: the format strings aren't actually being enforced here which is probably why they weren't caught earlier. Not quite sure why, it should be looked at!
2010-06-11 11:52:06 -07:00
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
e121d472e7
Revert "added notice.location to group by"
...
This reverts commit 48dc899acb
2010-06-09 16:30:50 +12:00
054ac909bf
Merge branch 'integration' into testing
2010-06-07 18:19:12 -07:00
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
5a96b9e805
Merge branch 'master' of gitorious.org:statusnet/mainline into testing
2010-06-07 10:34:00 -07:00
d88b208edc
Merge branch 'testing' of gitorious.org:statusnet/mainline into 0.9.x
...
Conflicts:
plugins/OpenID/openid.php
2010-06-07 10:19:40 -07:00
8b9436e8ae
Option to divert PuSH items directly to the target site's queue when local
2010-06-03 18:06:55 -07:00
5f4c6ec626
Skip enqueueing to outgoing bridges on incoming remote messages. Twitter, Facebook, RSSCloud, and OStatus checks were enqueued on these when they'd never do anything but churn the queue servers.
...
Notice::isLocal() can replace a number of manual checks for $notice->is_local being LOCAL_PUBLIC or LOCAL_NONPUBLIC.
2010-06-03 16:58:45 -07:00
791b98046d
Stomp blocking writes fix
2010-06-03 16:09:47 -07:00
135b398d4b
Merge branch 'master' of gitorious.org:statusnet/mainline
2010-06-03 14:50:52 -04:00
9bb48c36ea
Installer tweak to aid with IIS setup: if config.php exists, but is both empty and writable, let the installer proceed and overwrite it.
2010-06-03 10:13:28 -07:00
a5de215267
Merge branch 'master' of gitorious.org:statusnet/mainline
2010-06-01 13:51:41 -07:00
d223458035
Widgetize the design form
...
Squashed commit of the following:
commit a4610db66974866fdeb98184ce7e2be1470fb4d7
Author: Evan Prodromou <evan@status.net>
Date: Mon May 31 08:48:35 2010 -0700
use selfUrl for designform action
commit fd9f46ab33caa2c2d0df90d1d596c7b8c6453ce3
Author: Evan Prodromou <evan@status.net>
Date: Mon May 31 08:29:43 2010 -0700
fix design settings syntax
commit d1797ef9f90bf038665463424ad962bfe039c9f0
Author: Evan Prodromou <evan@status.net>
Date: Mon Nov 9 23:23:53 2009 -0500
widgetizing design form
2010-05-31 08:49:14 -07:00
f4539b52ad
Ticket 2329 followup: my clever 'let it use the default' was foiled by PHP gettext module not quite exposing a compatible interface as the backend gettext library. (Most funcs squash null domain parameter into '' empty string, which isn't interpreted as 'use the current default'.)
2010-05-28 16:03:09 -07:00
6317f7d92b
Assigning my copyrights to the Free Software Foundation
2010-05-27 18:27:33 -04:00
696aeea113
Merge branch 'testing' of gitorious.org:statusnet/mainline into 0.9.x
...
Conflicts:
lib/language.php
plugins/OpenID/finishaddopenid.php
2010-05-27 14:57:32 -07:00
2b318a3420
Merge branch 'master' of gitorious.org:statusnet/mainline
2010-05-27 14:22:24 -07:00
697a9948df
Ticket #2329 : fix for use of _m() translation functions from outside of plugin directories
2010-05-27 14:18:08 -07:00
c5b61078e1
Pass auth user into Atom feed generators (needed for outputting favorited status in statusnet:notice_info tag)
2010-05-27 13:49:23 -07:00
2062298755
Add $config['queue']['stomp_enqueue_to'] override for which queue server to send to.
...
Must be set to a value that matches one of the entries in $config['queue']['stomp_server'] array, otherwise ignored.
2010-05-21 14:07:59 -07:00
6d8e01ad13
Merge branch 'master' of gitorious.org:statusnet/mainline
2010-05-21 16:47:57 -04:00
6eae5d6a7e
Merge branch 'testing' into 0.9.x
2010-05-21 13:15:08 -07:00
2c12d837c6
Disable SSL peer/hostname verification for HTTPClient unless we've configured a trusted CA bundle like this: $config['http']['ssl_cafile'] = '/usr/lib/ssl/certs/ca-certificates.crt';
...
The previous state was failing on all HTTPS hits due to HTTP_Request2 library turning on the validation check but not specifying a CA file.
2010-05-21 10:12:39 -07:00
68305d4b68
Added block link to subscription notification emails; block action can now take a profile ID on the URL; added profile details to block page so there's an indication of who you're blocking before you pull the trigger.
...
Fixed typo in RedirectingAction when no return-to data provided in form submission.
RedirectingAction::returnToArgs() has been renamed to returnToPrevious() to avoid conflict with Action::returnToArgs() which returns arguments to be passed to other actions as return-to arguments. All callers should now be updated.
More profile settings actions will now redirect through a login form if visited as a GET request, as would be expected from a bookmark, link sent in e-mail etc.
2010-05-20 14:24:44 -07:00
708d22848e
Quick fix for creating OpenID accounts authenticating against a MediaWiki site; trim the 'User:' etc from the final path segment before generating a nickname from it. Avoids ending up with nicks like 'userbrion' on your first OpenID login!
2010-05-19 16:19:06 -07:00
c4203be9a4
Merge branch '0.9.x' into 1.0.x
2010-05-19 12:52:23 -07:00
7005ef6661
Merge branch 'testing' into 0.9.x
...
Conflicts:
plugins/OpenID/openidlogin.php
2010-05-19 12:51:25 -07:00
74a89b1fc3
Locale switch cleanup: use common_switch_locale() which is safer for updating gettext state. Also moved a few calls to reduce chance of hitting an exception before switching back.
...
Should help with problems where xmppdaemon would get stuck in wrong locale.
2010-05-19 10:10:55 -07:00
5ea019c41a
Remove errant double HTML entity encoding in API source attribution
2010-05-18 15:16:23 -07:00
3708341857
Allow OStatusPlugin to set the source attribution title
2010-05-18 15:16:13 -07:00
6187266205
- OStatusPlugin should return true if it doesn't need to handle source
...
attribution
- Remove stray break statement from NoticeList
2010-05-18 15:16:03 -07:00
0dfef88cac
HTML entity encode source link URLs in plain XML output and add rel="nofollow" to them
2010-05-18 15:15:52 -07:00
c78f67aa73
Refactor and centralize notice source link calculation
2010-05-18 15:15:27 -07:00
d9fddff539
Add xmlns:statusnet and statusnet:notice_info element to Atom entries for notices
2010-05-18 15:15:14 -07:00
48dc899acb
added notice.location to group by
2010-05-17 14:17:49 +12:00
6f19830c9a
fix the column modify on stuff for postgres. change serial to bigserial
2010-05-17 13:50:37 +12:00
9bb18541df
added missing field to the group by. this makes postgres happy
2010-05-15 15:33:55 +12:00
7bd6b62461
comment out the extra bit, cos there's always mysql-only stuff in therre.
...
this isn't a very good idea
2010-05-15 15:32:22 +12:00
a467c0ebba
caitalise the sql keywords
2010-05-15 15:31:54 +12:00
191752138a
indexes now working in postgres schemas
2010-05-15 15:14:11 +12:00
7cf250ff18
removed sneaky debug echo that shouldn't be there
2010-05-15 15:08:22 +12:00
599942f58a
sorted enums and auto_increments on postgres.
...
Still needs inline indexes on table creation
2010-05-15 14:56:40 +12:00
91367dbc21
Merge branch '0.9.x' into 1.0.x
2010-05-14 12:15:13 -07:00
065ecc5573
Merge branch 'testing' into 0.9.x
2010-05-14 12:14:02 -07:00
3d00cfd47f
Windows server fix: Use platform EOL in debug log file
2010-05-11 12:22:14 -07:00
Craig Andrews
Evan Prodromou
Brion Vibber
Siebrand Mazeland
Brenda Wallace
Brion Vibber
Zach Copley
James Walker