Commit Graph

10355 Commits

Author SHA1 Message Date
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
Siebrand Mazeland 1bfbe9badf * i18n/L10n updates and FIXMEs added
* whitespace fixes
2010-09-03 01:35:04 +02:00
Brion Vibber 6f540f963b Switch default, identica themes from @import to theme.ini include key; doesn't make much difference for internal core themes but it'll provide cut-n-pasters with a better example. :) 2010-09-02 15:06:47 -07: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
Evan Prodromou 925381707b show notice title on shownotice page 2010-09-02 17:16:10 -04: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 82b1d6daef Merge branch 'swat0' into 0.9.x 2010-09-02 16:58:55 -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
Evan Prodromou ebcd8644a5 Revert "debugging replyToID"
This reverts commit bb9353f6e0.
2010-09-01 18:22:54 -04:00
Evan Prodromou bb9353f6e0 debugging replyToID 2010-09-01 17:59:49 -04:00
Evan Prodromou 27626c3abf Correctly check for user's id in replies in user salmon post 2010-09-01 17:10:29 -04:00
Evan Prodromou ab88123373 correctly return oprofile from Ostatus_profile::ensureProfileURI() 2010-09-01 17:05:11 -04:00
Evan Prodromou 974ac48771 bug in Profile::fromURI() wasn't returning profile 2010-09-01 16:55:16 -04:00
Evan Prodromou 2d4e0693c8 save URIs of remote profiles marked for attention 2010-09-01 16:17:18 -04:00
Evan Prodromou 3baff9aa98 Handle profile-from-uri hook to return ostatus profile if there's a match 2010-09-01 16:16:38 -04:00
Evan Prodromou a2de30b767 Notice::saveReplies() uses Profile::fromURI() to handle remote profiles too 2010-09-01 16:15:51 -04:00
Evan Prodromou 7bec455a21 Static method to get a profile based on an URI 2010-09-01 16:15:22 -04:00
Evan Prodromou c82b1cda82 send a salmon slap to mentioned person when we reply to a notice 2010-09-01 14:35:43 -04:00
Evan Prodromou 468a15db00 Merge branch 'master' into 0.9.x 2010-09-01 14:21:36 -04:00
Evan Prodromou 8ebb858964 remove noop function from OStatusPlugin 2010-09-01 14:21:24 -04:00
Craig Andrews 6df8230488 Leave session handling to StatusNet - disable phpCAS's handling. 2010-08-30 17:08:12 -04:00
Craig Andrews 6b4607f073 Upgrade from CAS 1.1.0RC6 to 1.1.2 2010-08-30 16:53:32 -04:00
Siebrand Mazeland 7ad43e19d9 Localisation updates from http://translatewiki.net
* removed messages marked fuzzy from translations.
2010-08-28 17:34:02 +02: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
Siebrand Mazeland 59eea85da5 Localisation updates from http://translatewiki.net 2010-08-28 15:11:23 +02:00
Brion Vibber 8f06e3b281 Fix for failover error in status_network_tag caching; when no tags present in table we would return an array with one empty element instead of no elements when getting the cached data. 2010-08-26 13:52:03 -07:00
Siebrand Mazeland 36c2ee1b4f Localisation updates from http://translatewiki.net 2010-08-25 23:50:29 +02:00
Brion Vibber 63fd2332f0 Use Status_network's caching settings when loading Status_network_tag entries; cache entries are batched per site and will be cleared when tags are inserted/deleted using the main interface.
(with fixes from tagcache branch)
2010-08-25 12:22:42 -07:00
Evan Prodromou a507f04bc4 fix incorrect function name in updateostatus.php script 2010-08-25 12:32:10 -04:00
Siebrand Mazeland 2e1f2a0481 Localisation updates from http://translatewiki.net 2010-08-24 08:21:13 +02:00
Craig Andrews 7cd0706aef Merge remote branch 'chat-interface-plugins/irc-plugin' into 1.0.x 2010-08-18 14:13:15 -04:00
Craig Andrews 6c02c665f2 Use hash if available 2010-08-18 14:07:40 -04:00
Craig Andrews 05712ae62b reconnect failed doesn't include a parameter in its invocation 2010-08-18 13:37:38 -04:00
Craig Andrews b699364982 Merge remote branch 'chat-interface-plugins/msn-plugin' into 1.0.x 2010-08-18 13:34:39 -04:00
Craig Andrews f5e4fc12e0 include mhash from php compat 2010-08-18 13:34:32 -04:00