Commit Graph

10392 Commits

Author SHA1 Message Date
Craig Andrews 3dd734b2c3 Remove CSRF protection from username/password login and from OpenID login. 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 80044ad735 Merge branch 'testing' into 0.9.x 2010-09-06 10:11:59 -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
Craig Andrews 6fe2429c41 Fix syntax error 2010-09-05 17:31:46 -04:00
Siebrand Mazeland 5d3136726a Localisation updates from http://translatewiki.net 2010-09-05 12:04:32 +02:00
Siebrand Mazeland f2d6e1e375 Add basic support for Georgian (ka) 2010-09-05 10:45:03 +02:00
Brion Vibber 58b5ff718a Merge branch 'testing' of gitorious.org:statusnet/mainline into testing 2010-09-03 18:01:08 -07:00
Brion Vibber ab0ced4dfd Suppress notices in index.php running under lighttpd 2010-09-03 17:57:23 -07: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 61ca2cb6b5 Merge remote branch 'gitorious/0.9.x' into 0.9.x 2010-09-03 15:27:02 -04:00
Evan Prodromou ef1cb1cc94 explicitly license documentation under CC-BY 3.0 2010-09-03 15:26:25 -04:00
Brion Vibber 43b0c65a86 Fix output bug in DisqusPlugin -- 'Comments' link contents was in attributes instead of comments, which broke output and spewed errors 2010-09-03 11:57:33 -07:00
Evan Prodromou 4aac47de03 syntax error in exception string in discovery.php 2010-09-03 01:41:01 -04:00
Evan Prodromou edf45ad647 Merge branch 'testing' into 0.9.x 2010-09-02 23:41:56 -04:00
Evan Prodromou cc6e4c93e5 explicit attribution 2010-09-02 23:41:48 -04:00
Evan Prodromou 7d878b7c35 Merge branch 'testing' into 0.9.x 2010-09-02 23:30:24 -04:00
Evan Prodromou 3010429579 note that images and CSS files in /themes/ are CC-BY 3.0, and that themes are exempt from AGPL copyleft 2010-09-02 23:23:46 -04:00
Evan Prodromou db5d7e0167 add CC BY 3.0 license to CSS files 2010-09-02 23:16:29 -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