Commit Graph

3559 Commits

Author SHA1 Message Date
Evan Prodromou fca7ea664b move view designs setting to user design tab 2010-09-11 16:16:38 -04:00
Evan Prodromou 12eee30586 Merge branch '1.0.x' into shortcontrol10x 2010-09-10 22:20:52 -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
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