wamo/gnu-social
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
11,037 Commits 8 Branches 0 Tags 330 MiB
a923ef9719
Commit Graph

3692 Commits

Author SHA1 Message Date
Brion Vibber
42dd460d3b Merge branch 'master' into 0.9.x 2010-09-21 12:48:16 -07:00
Brion Vibber
1bc45e191d Merge branch 'twitter-avatar' 2010-09-21 12:46:16 -07:00
Brion Vibber
94de78fa0f Workaround for #2485: in profile output on feeds, fall back to the Twitter 73x73 avatar instead of going straight to the 96x96 default image on twitter-import profiles. 2010-09-21 12:38:04 -07:00
Evan Prodromou
28fdc733a7 change the location and title of the feeds section 2010-09-21 14:09:46 -04:00
Brion Vibber
aef42e2f65 Don't spew a notice warning to output while processing logging for PEAR DB errors 2010-09-20 16:52:22 -07:00
Brion Vibber
24bb6feba7 Clean up notice spew from accessing member variables of null when opening the add/edit oauth application form 2010-09-20 16:39:51 -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
Brion Vibber
2f38c9c99c Fix bug in db queue manager: when receiving an invalid or deleted notice, we were running it through the 'temporary fail, release it to try again' path instead of the 'done, discard item' path. Should fix some infinite-loop-of-doom-in-queue cases. 2010-09-20 13:19: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
Brion Vibber
20a0a4acff Explicitly mark a translator note on the command list help message that the command names must not be translated 2010-09-16 11:05:31 -07:00
Evan Prodromou
670ad53215 Merge branch '0.9.x' into activityexport 2010-09-15 23:31:20 -04:00
Siebrand Mazeland
85154a49d0 Add plural support for minutes/hours/days/months ago. 
Reapply of revised b27882c916 that was reverted by Brion Vibber in 2d4c0f9a47.
 2010-09-16 00:07:47 +02:00
Brion Vibber
2d4c0f9a47 Revert "Add plural support for minutes/hours/days/months ago." -- currently doesn't work and spews error messages 
This reverts commit b27882c916.
 2010-09-15 14:10:18 -07:00
Evan Prodromou
1ceb93cce4 move useractivitystream class to its own module 2010-09-15 15:18:01 -04:00
Evan Prodromou
0a5aa95746 flag to leave out author information in activity output 2010-09-15 07:11:50 -04:00
Evan Prodromou
d2877f4c3d change user attribute from private to protected so subclasses can use it 2010-09-15 07:08:28 -04:00
Siebrand Mazeland
c218eb5077 L10n: Fix punctuation. 2010-09-14 22:30:55 +02:00
Evan Prodromou
a2fe29388d Activity::asString() should format numerical not string time 2010-09-13 17:05:02 -04:00
Evan Prodromou
d207f19d22 accept null constructor for ActivityContext 2010-09-13 16:23:10 -04:00
Siebrand Mazeland
39802077a8 * update/add translator documentation 
* remove superfluous whitespace
 2010-09-13 21:10:55 +02:00
Siebrand Mazeland
8c94ebf537 * update/add translator documentation 
* remove superfluous whitespace
 2010-09-13 21:10:54 +02:00
Siebrand Mazeland
d6be5be548 Move translator hint to where gettext will actually see it and replace tab by spaces. 2010-09-13 21:10:53 +02:00
Siebrand Mazeland
a590f2cb0f Fix typos in translator comments. 2010-09-13 21:10:53 +02:00
Siebrand Mazeland
6817420e6c Remove trailing whitespace and update comment consistency on methods. 2010-09-13 21:10:52 +02:00
Siebrand Mazeland
b27882c916 Add plural support for minutes/hours/days/months ago. 2010-09-13 21:10:51 +02:00
Siebrand Mazeland
0d1b60b11d Update translator documentation. 2010-09-12 18:34:33 +02:00
Siebrand Mazeland
128607a270 Update translator documentation and add punctuation where missing to exception messages. 2010-09-12 18:24:44 +02:00
Siebrand Mazeland
e88ee4ec46 Fix i18n issue and add translator documentation. 2010-09-12 18:11:28 +02:00
Siebrand Mazeland
8adef3127c Update translator documentation. 2010-09-12 17:49:56 +02:00
Siebrand Mazeland
99f6a70937 * add two FIXMEs for gettext messages not being processed. 
* update translator documentation.
 2010-09-12 17:44:28 +02:00
Siebrand Mazeland
6b010ac79c Update/add translator documentation. 2010-09-12 17:27:38 +02:00
Siebrand Mazeland
9bc4aaeca3 Update incomplete documentation. 2010-09-12 17:17:43 +02: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
Brion Vibber
cb1d5049b8 Bump version to 0.9.5 2010-09-08 15:35:23 -07:00
Evan Prodromou
e6c84dec19 Pragma was accidentally triggering some underwear-catapult-connected hardware 2010-09-08 15:41:39 -04:00
Evan Prodromou
338aa4bf1d Merge branch 'apinamespace' into 0.9.x 2010-09-07 16:39:43 -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
Evan Prodromou
86a702953a Merge branch '0.9.x' into 1.0.x 2010-09-06 10:12:17 -04:00
Evan Prodromou
a319b40c97 common_cache_key() -> Cache::key() 2010-09-06 10:07:43 -04:00
Evan Prodromou
e42d2124a3 common_keyize() -> Cache::keyize() 2010-09-06 10:03:51 -04:00
Evan Prodromou
c2de44a530 remove NOOP function common_broadcast_notice() 2010-09-06 09:59:08 -04:00
Evan Prodromou
8f81762d68 common_memcache() => Cache::instance() 2010-09-06 09:56:45 -04:00
Siebrand Mazeland
f2d6e1e375 Add basic support for Georgian (ka) 2010-09-05 10:45:03 +02:00
Craig Andrews
f7c46effa2 set_notify -> setNotify 2010-09-03 17:50:29 -04:00
Craig Andrews
44f1b94301 get_screenname -> getScreenname 2010-09-03 17:50:29 -04:00
Craig Andrews
c54ef9b8b6 is_otr -> isOtr 2010-09-03 17:50:29 -04:00
Craig Andrews
d68914e4f3 is_autoreply -> isAutoreply 2010-09-03 17:50:29 -04:00
Craig Andrews
cce92e394b public_notice -> publicNotice 2010-09-03 17:50:29 -04:00
Craig Andrews
00e21d4a6f broadcast_notice -> broadcastNotice 2010-09-03 17:50:29 -04:00
Craig Andrews
9ccf65a311 get_user -> getUser 2010-09-03 17:50:29 -04:00
Craig Andrews
054111bb54 add_notice -> addNotice 2010-09-03 17:50:29 -04:00
Craig Andrews
a3725de47b handle_incoming -> handleIncoming 2010-09-03 17:50:29 -04:00
Craig Andrews
463e9c10d1 handle_command -> handleCommand 2010-09-03 17:50:29 -04:00
Craig Andrews
671b0f4cd9 format_notice -> formatNotice 2010-09-03 17:50:29 -04:00
Craig Andrews
a70cceaddd send_confirmation_code -> sendConfirmationCode 2010-09-03 17:50:28 -04:00
Craig Andrews
1eccd2a4bd send_from_site -> sendFromSite 2010-09-03 17:50:28 -04:00
Craig Andrews
b4d02650df get_user_im_prefs_from_user -> getUserImPrefsFromUser 2010-09-03 17:50:28 -04:00
Craig Andrews
8263ae601b get_user_im_prefs_from_screenname -> getUserImPrefsFromScreenname 2010-09-03 17:50:28 -04:00
Craig Andrews
f038eacca4 enqueue_incoming_raw -> enqueueIncomingRaw 2010-09-03 17:50:28 -04:00
Craig Andrews
e7a026091c enqueue_outgoing_raw -> enqueueOutgoingRaw 2010-09-03 17:50:28 -04:00
Craig Andrews
b05ab5fc85 daemon_screenname -> daemonScreenname 2010-09-03 17:50:28 -04:00
Craig Andrews
764e0ab962 receive_raw_message -> receiveRawMessage 2010-09-03 17:50:28 -04:00
Craig Andrews
80176b0b2c send_notice -> sendNotice 2010-09-03 17:50:28 -04:00
Craig Andrews
6a848bcc8a send_message -> sendMessage 2010-09-03 17:50:28 -04:00
Evan Prodromou
326258bfef Merge branch '0.9.x' into 1.0.x 2010-09-02 22:57:37 -04:00
Evan Prodromou
6c14235d6c Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.x 2010-09-02 22:56:18 -04:00
Evan Prodromou
388495f6b1 use etag preferably for caching 2010-09-02 22:26:20 -04:00
Evan Prodromou
c8a69f433c add some caching headers 2010-09-02 22:26:19 -04:00
Evan Prodromou
0c5ca46ba3 combine our standard scripts into one big script 2010-09-02 22:21:07 -04:00
Brion Vibber
2196d00b1b Merge branch '0.9.x' into 1.0.x 
Conflicts:
	lib/command.php
 2010-09-02 15:04:25 -07:00
Brion Vibber
e365e709c5 Merge branch 'master' into testing 2010-09-02 14:58:11 -07:00
Brion Vibber
cbcb9b0080 Fixes for Mac metadata files mucking up theme zip files 2010-09-02 14:24:46 -07:00
Brion Vibber
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
Evan Prodromou
c7d81f2d9d hooks for showing <title> and <h1> elements 2010-09-02 17:10:25 -04:00
Evan Prodromou
7517409bf1 Merge branch 'testing' into 0.9.x 2010-09-02 16:56:52 -04:00
Brion Vibber
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
Brion Vibber
4cbbfdab84 Fix for #2635: use ssl-sometimes settings for Twitter settings & auth pages 2010-09-02 10:55:26 -07:00
Siebrand Mazeland
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
Siebrand Mazeland
2eb894e535 Document UI text and number parameters. 2010-08-28 16:28:23 +02:00
Brion Vibber
0cfaae48a3 Merge branch '0.9.x' into 1.0.x 2010-08-16 16:56:27 -07:00
Brion Vibber
a68c10280f Merge branch 'master' into 0.9.x 2010-08-16 16:56:15 -07:00
Brion Vibber
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
Brion Vibber
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
Brion Vibber
b2a5e0d09b StatusNet 0.9.4 "Orange Crush" 2010-08-16 10:09:33 -07:00
Brenda Wallace
7f9ab683b2 fixed a %d that should be a %s in an error message 2010-08-16 10:03:58 -07:00
Brenda Wallace
e687862ca1 fixed a %d that should be a %s in an error message 2010-08-16 13:26:27 +12:00
Evan Prodromou
7183175429 Merge branch 'master' into 1.0.x 2010-08-13 14:33:41 -07:00
Evan Prodromou
9b7536351b hide the Whats Up Nickname if notice title enabled 2010-08-13 12:22:58 -07:00
Evan Prodromou
ed8d8eb5ee hooks to allow changing RSS content 2010-08-13 11:44:26 -07:00
Brion Vibber
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
Brion Vibber
ae696728f5 Merge branch '0.9.x' into 1.0.x 2010-08-12 12:56:23 -07:00
Brion Vibber
111fc33e1a Output "web" instead of gettext translation file metadata when notice.source is empty 2010-08-11 18:53:34 -07:00
Brion Vibber
d15a41c96e 0.9.4beta2 update some notes in README, note the fix from beta1 2010-08-11 10:32:52 -07:00
Siebrand Mazeland
db46d73a5f Add dummy support for Esperanto. 2010-08-11 12:46:54 +02:00
Brion Vibber
19e6b84050 StatusNet_network staticGet lookup fix 2010-08-10 17:22:26 -07:00
Brion Vibber
5c210f724a update version for 0.9.4beta1 2010-08-10 16:28:33 -07:00
Brion Vibber
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
Brion Vibber
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
Brion Vibber
855f1f6623 Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 1.0.x 2010-08-09 13:11:41 -07:00
Siebrand Mazeland
09dee24cbe Add two i18n related FIXMEs. 2010-08-08 21:13:21 +02:00
Brion Vibber
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
Brion Vibber
433c43c999 Merge branch 'testing' into 0.9.x 2010-08-05 11:02:53 -07:00
Brion Vibber
77a96e3d7c Merge branch 'master' into testing 2010-08-05 10:56:49 -07:00
Zach Copley
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
Evan Prodromou
9f0715a993 Merge branch '0.9.x' into 1.0.x 2010-08-03 16:05:03 -07:00
Evan Prodromou
004e42e3e0 Merge remote branch 'gitorious/1.0.x' into 1.0.x 2010-08-03 16:04:54 -07:00
James Walker
eaef724c49 urgh. typo 2010-08-02 14:24:50 -04:00
James Walker
e603632f13 add support for Salmon's new "mentioned" rel value 2010-08-02 14:06:14 -04:00
Brion Vibber
a1aea74fe2 Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.x 2010-08-02 09:43:58 -07:00
Siebrand Mazeland
44d01f70a6 Localisation updates from http://translatewiki.net 
* add support for Danish
 2010-07-31 23:59:22 +02:00
Brion Vibber
1bb18e9bab Merge branch '2471' into 0.9.x 2010-07-30 17:52:12 -07:00
Brion Vibber
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
James Walker
47f19988d1 allow schema to work on more than one connection (namely, the Status_network DB) 2010-07-29 21:04:28 -04:00
James Walker
c2a26ba653 removing redundant constructor 2010-07-29 21:03:48 -04:00
Zach Copley
fb2e00eacc Merge branch 'master' into 0.9.x 
Conflicts:
	classes/Notice.php
 2010-07-29 20:44:11 +00: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
Evan Prodromou
e10621a52a Merge branch 'testing' of gitorious.org:statusnet/mainline into testing 2010-07-28 17:51:07 -04:00
Evan Prodromou
a01bc6b575 Merge branch 'googleadsadminpanel' into testing 2010-07-28 17:50:49 -04:00
Brion Vibber
ab2c3686b7 Merge branch 'testing' into 0.9.x 2010-07-28 11:59:42 -07:00
Evan Prodromou
dbb5e9e191 accept mailto: URIs as OStatus identifiers 2010-07-22 16:00:26 -07:00
Zach Copley
65862d8f7f Suppress HTTP error headers for JSONP API output 2010-07-16 14:40:22 -07:00
Evan Prodromou
453a06fff4 Exceptions are caught and continued on JSON, XML, Atom and RSS output in API 2010-07-13 11:11:29 -04:00
Evan Prodromou
1044f27e47 handle missing profile for notices better in Rss10Action 2010-07-13 10:59:15 -04:00
Evan Prodromou
d706a3e21b handle missing profile for notices better in NoticeList 2010-07-13 10:59:01 -04:00
Evan Prodromou
6968c96b44 log exceptions in atom feeds, but don't let them kill the output 2010-07-13 10:53:47 -04:00
Evan Prodromou
dfd65a4290 push exception on missing profile down to Notice::getProfile() 2010-07-13 10:51:25 -04:00
Evan Prodromou
ab149755b6 handle notices without profiles better in RSS output 2010-07-13 10:42:06 -04:00
Brion Vibber
1b3b7f9a42 Ticket 2427: fix regression in plugin i18n 2010-07-12 10:27:23 -07:00
Brion Vibber
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
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
c9863bb864 Update version and code name: 0.9.3 Half a World Away 2010-06-28 15:08:01 -04:00
Brion Vibber
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
Brion Vibber
fdd9aa58e3 Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 1.0.x 2010-06-28 13:41:04 -04:00
Brion Vibber
53f14ddde6 Merge branch 'testing' of gitorious.org:statusnet/mainline into 0.9.x 2010-06-28 13:39:52 -04:00
Brion Vibber
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
Brion Vibber
fa282823d9 Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 1.0.x 2010-06-26 15:10:47 -04:00
Brion Vibber
c6b1e25d17 Merge branch 'testing' of gitorious.org:statusnet/mainline into 0.9.x 2010-06-26 15:09:30 -04:00
Brion Vibber
ef7e85c0ab Merge branch 'master' of gitorious.org:statusnet/mainline into testing 2010-06-26 15:09:08 -04:00
Brion Vibber
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
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
Craig Andrews
dad0b06a38 Throw an error if queueing is disable when using an IM plugin 2010-06-22 22:01:13 -04:00
Zach Copley
1eec7f779f - Add profile_info tag to Atom author 
- Normalize xmlns:statusnet links in the API
 2010-06-22 16:28:06 -07:00
Siebrand Mazeland
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
Zach Copley
a6ce4eef0d Fix problem with AvatarLink in which it was sometimes leaving the width attribute empty 2010-06-16 18:27:51 -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
d65d982681 Merge branch 'master' into testing 2010-06-16 12:37:14 -07:00