Commit Graph

138 Commits

Author SHA1 Message Date
Sarven Capadisli
d30df07908 Merge branch '0.7.x' into 0.8.x
Resolved Conflicts:
	lib/queuehandler.php
	lib/util.php
	theme/base/css/display.css
2009-05-01 00:16:25 +00:00
Zach Copley
f798d1ea43 Added dirty dates to Foreign_link 2009-04-28 17:08:20 -07:00
CiaranG
4cb0a92980 Add feed2omb to notice sources 2009-04-21 20:43:57 +01:00
Sarven Capadisli
8d4738d956 Merge branch '0.7.x' into 0.8.x 2009-04-19 23:40:26 +00:00
Evan Prodromou
e9213043a8 add reply_to index to notice 2009-04-18 19:36:25 -07:00
Sarven Capadisli
4c29cda000 Merge branch '0.7.x' into 0.8.x 2009-04-14 19:14:32 +00:00
Zach Copley
9f2e2e4b2c Notice sources: Fixed Nambu, added Tricklepost and sorted the list. 2009-04-14 11:50:59 -07:00
Sarven Capadisli
c9c5ec0e4b Merge branch '0.7.x' into 0.8.x 2009-04-10 17:39:56 +00:00
Evan Prodromou
fba0249932 add cliqset 2009-04-10 11:36:46 -04:00
Evan Prodromou
08c08d02aa Added maisha to notice_source 2009-04-10 10:47:53 -04:00
Evan Prodromou
4e3e4fcfff Merge branch '0.7.x' into 0.8.x 2009-04-07 17:14:23 -04:00
Evan Prodromou
5953d56fe2 Merge branch '0.8.x' of git@gitorious.org:laconica/dev into 0.8.x 2009-04-07 17:12:53 -04:00
Evan Prodromou
60861760fc Host multiple sites with the same codebase
This is the beginning of the code for status.net and related status
farms. It will read basic information about a site from a shared,
central database and use the data stored there to switch on the
hostname.
2009-04-07 17:10:54 -04:00
Evan Prodromou
770788d98e Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x 2009-04-07 11:40:38 -04:00
Evan Prodromou
f09886672b add peoplebrowsr 2009-04-06 15:51:57 -04:00
Sarven Capadisli
e632f3be6f Merge branch '0.7.x' into 0.8.x 2009-04-03 21:47:39 +00:00
Zach Copley
d83f6c3269 Add Yatca to notice sources 2009-04-03 14:16:32 -07:00
Sarven Capadisli
798984381f Merge branch '0.7.x' into 0.8.x 2009-04-02 06:44:54 +00:00
Robin Millette
d5032a0277 trac#776 changed db collations from utf8_bin to utf8_general_ci for case insensitive search 2009-03-30 19:47:55 +00:00
Sarven Capadisli
27b45eeb48 Merge branch '0.7.x' into 0.8.x 2009-03-30 15:15:40 +00:00
Evan Prodromou
24ce3928e3 fix sql error in notice source script 2009-03-23 16:37:13 -04:00
Evan Prodromou
8c073a34ce Merge branch '0.7.x' into 0.8.x 2009-03-23 15:55:07 -04:00
Evan Prodromou
92da8a59cb add Mobidentica 2009-03-22 10:51:00 -04:00
Evan Prodromou
3eff673a0f Add Adium to notice sources 2009-03-14 23:25:43 -04:00
Evan Prodromou
b3a0eea3b6 Merge branch '0.7.x' into 0.8.x
Conflicts:

	classes/Notice.php
	lib/action.php
	lib/router.php
	lib/twitter.php
2009-03-12 11:56:23 -04:00
CiaranG
a5f1124830 PostgreSQL - use the specific sequence names required by DB_DataObject, otherwise rebuilding can't work 2009-03-08 15:51:31 +00:00
CiaranG
a4091c878a PostgreSQL - propogated nonce table fix from MySQL version - see bug #1251 or 1179ecd13d 2009-03-07 23:28:59 +00:00
Evan Prodromou
1179ecd13d Fix nonce usage in OAuth store
The OAuth store was failing on getting a request token, because the
token value was forced to be non-null in the DB. Let this value be
null, and use the correct primary key (consumer, timestamp, nonce).
Drop the reference to token table, and don't ever use it.
2009-03-07 12:55:09 -08:00
Evan Prodromou
13c183e2f4 Merge branch '0.7.x' into 0.8.x 2009-03-06 16:17:58 -08:00
CiaranG
3c53e821cc Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x 2009-03-05 16:18:59 +00:00
CiaranG
97bc187e31 PostgreSQL - the ts field in the OAuth nonce table needed to be an integer. (fix submitted by oxygene) 2009-03-05 16:15:29 +00:00
Evan Prodromou
8cc19b90ee Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x 2009-03-04 11:05:58 -08:00
CiaranG
c02a2f1891 PostgreSQL - added defaults for 'created' fields, so they work the same as the MySQL version, and made sure all 'modified' fields are not null 2009-03-04 15:30:17 +00:00
Evan Prodromou
43ef29ba0c all inserts in one statement for foreign services 2009-03-04 05:47:24 -08:00
Evan Prodromou
f53b6470cf add notice source to default install 2009-03-04 05:42:20 -08:00
CiaranG
8408e82f92 PostgreSQL - added new emailnotifyattn field to user table, to match MySQL version 2009-03-03 20:18:26 +00:00
Evan Prodromou
9a2f335853 add notice source to default install 2009-03-02 18:25:10 -08:00
Evan Prodromou
fc44c9a7f4 Merge branch '0.7.x' into 0.8.x 2009-02-28 21:11:16 -08:00
Evan Prodromou
1d610d3c6f don't use semicolons in comments 2009-02-28 20:32:53 -08:00
Evan Prodromou
34a61b40f4 Merge branch '0.7.x' into 0.8.x 2009-02-26 13:22:51 -08:00
Evan Prodromou
478192fa3b add conversation id to notice 2009-02-26 13:22:41 -08:00
Evan Prodromou
affb2f9359 add email notify flag for @-replies 2009-02-16 18:24:43 -05:00
Evan Prodromou
e686ef042b Make ID of SMS Carrier not autoincrement
Since we're doing fixed IDs for SMS Carrier, we change the definition
so it's not auto increment.
2009-02-12 14:16:58 -05:00
Evan Prodromou
654a91cc1c Add fixed IDs to SMS carrier list
Changed the SMS carrier list to use a fixed ID number for each carrier
distributed with the software. We claim IDs > 100000; admins can use
IDs < 100000 for local values. I'd be pretty surprised if there were
more than 100K wireless carriers in the world, but hey.
2009-02-12 14:03:15 -05:00
Evan Prodromou
5118643695 move carrier.sql to sms_carrier.sql 2009-02-12 13:58:05 -05:00
Evan Prodromou
2393fbec60 add some indices for performance 2009-02-09 14:47:23 -05:00
CiaranG
8c8feb59b5 PostgreSQL - database creation script updated to cover 0.7.x features 2009-02-05 22:15:45 +00:00
Ciaran Gultnieks
a4291d64ce PostgreSQL - remaining changes to fix db create script up to laconica 0.6.4 level 2009-01-30 01:11:03 +00:00
Evan Prodromou
a7c85bebd5 Merge branch 'master' of /var/www/mublog
Conflicts:

	actions/api.php
	actions/deletenotice.php
	actions/recoverpassword.php
	actions/remotesubscribe.php
	actions/tag.php
	actions/tagrss.php
	actions/twitapiaccount.php
	actions/twitapiusers.php
	classes/Notice.php
	classes/User.php
	lib/common.php
	lib/language.php
	lib/subs.php
	lib/twitterapi.php
	lib/util.php
	scripts/inbox_users.php
	scripts/update_translations.php

Merged development trunk into laconica head. woohoo!
2009-01-23 08:58:31 +01:00
CiaranG
33c13030e5 PostgreSQL - added the rest of the recently added tables for blocking, notice inboxes, etc. Needs testing 2009-01-14 11:05:15 -05:00