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

387 Commits

Author SHA1 Message Date
Brion Vibber
b26eccf33c Merge branch '0.9.x' into 1.0.x 2010-10-28 16:26:34 -07:00
Zach Copley
307c819089 Merge commit 'refs/merge-requests/2223' of git://gitorious.org/statusnet/mainline into integration 2010-10-25 14:35:56 -07:00
Michele macno Azzolari
0243cea82b Updated mustard description and link 2010-10-25 23:08:29 +02:00
Brion Vibber
ca489631db Merge branch '0.9.x' into 1.0.x 
Conflicts:
	actions/subscriptions.php
	lib/router.php
	lib/xmppmanager.php
	lib/xmppoutqueuehandler.php
 2010-10-25 13:08:57 -07:00
Zach Copley
e56385a7bb Use a new table (oauth_token_association) to associate authorized 
request tokins with OAuth client applications and profiles.
 2010-10-20 17:21:04 -07:00
Zach Copley
3d6a0f730d Revert DB change for OAuth. Change compound key for oauth_application_user 
back to (profile_id, application_id). I think we can get away without
a DB change by only issuing one anonymous access token per user.
 2010-10-20 11:41:04 -07:00
Zach Copley
e8b6d7c946 Add support for an anonymous OAuth consumer. Note: this requires a 
small DB tweak.  Oauth_application_user needs to have the primary
compound key: (profile_id, application_id, token).

http://status.net/open-source/issues/2761

This should also make it possible to have multiple access tokens
per application.

http://status.net/open-source/issues/2788
 2010-10-19 20:54:53 -07:00
Brion Vibber
59119482ca Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 1.0.x 
Conflicts:
	actions/hostmeta.php
	actions/imsettings.php
	classes/User.php
	lib/adminpanelaction.php
	lib/channel.php
	lib/default.php
	lib/router.php
	lib/util.php
 2010-10-04 12:54:36 -07:00
Brion Vibber
b98abc3ae7 Ticket #2725 - add StatusNet Mobile & platform variants to default notice sources lists. 
To add just these to an existing table:

INSERT INTO notice_source
    (code, name, url, created)
VALUES
    ('StatusNet Mobile', 'StatusNet Mobile', 'http://status.net/mobile', now()),
    ('StatusNet iPhone', 'iPhone', 'http://status.net/iphone', now()),
    ('StatusNet Android', 'Android', 'http://status.net/android', now()),
    ('StatusNet Blackberry', 'Blackberry', 'http://status.net/blackberry', now());
 2010-09-16 12:36:18 -07:00
Brion Vibber
0cfaae48a3 Merge branch '0.9.x' into 1.0.x 2010-08-16 16:56:27 -07:00
Brenda Wallace
a50feb3d47 Merge remote branch 'shiny/0.9.x' into 0.9.x 2010-08-16 14:51:31 +12:00
Brenda Wallace
640e7e7c43 Merge commit 'origin/0.9.x' into 0.9.x 2010-08-16 02:52:23 +00:00
Brenda Wallace
9c97e33d35 removed the notice.location column from postgres def -- snuck in on a git commit by Patrick G 2010-08-16 14:47:18 +12:00
Evan Prodromou
9f0715a993 Merge branch '0.9.x' into 1.0.x 2010-08-03 16:05:03 -07:00
James Walker
4853b1e2a0 SQL script to update status_network table 2010-07-28 11:50:04 -04:00
James Walker
a6b1feb08c leaving tags column in (for now) 2010-07-28 11:43:47 -04:00
James Walker
7065450f03 normalizing tags for status_network 2010-07-20 17:34:58 -07:00
Brion Vibber
83c2e0b379 Merge branch 'master' into 0.9.x 2010-06-28 15:13:39 -04:00
Zach Copley
d87b3f3d2e Add notice source for StatusNet Desktop 2010-06-28 12:02:08 -07:00
Brion Vibber
004200f958 Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 1.0.x 2010-06-11 12:09:55 -07:00
Brion Vibber
7f3b3620af Merge branch 'testing' of gitorious.org:statusnet/mainline into 0.9.x 2010-06-11 12:05:53 -07:00
Brion Vibber
b1a68e15b7 Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 1.0.x 
Conflicts:
	lib/default.php
	lib/util.php
	plugins/UrlShortener/UrlShortenerPlugin.php (has been removed?)
 2010-06-10 15:37:06 -07:00
Brion Vibber
d88b208edc Merge branch 'testing' of gitorious.org:statusnet/mainline into 0.9.x 
Conflicts:
	plugins/OpenID/openid.php
 2010-06-07 10:19:40 -07:00
Zach Copley
02c68ff523 Add gNewBook to notice sources 2010-06-04 13:16:47 -07:00
Zach Copley
83b976f7ea Added DarterosStatus to notice sources 2010-05-31 15:48:24 -07:00
Brenda Wallace
cc25ec1755 added the inbox table to postgres upgrade script 2010-05-27 15:07:13 +12:00
Brenda Wallace
af4fd32742 added the inbox table to postgres upgrade script 2010-05-27 03:06:42 +00:00
Brenda Wallace
11398190f0 added user_location_prefs to upgrade script 2010-05-27 15:02:01 +12:00
Brenda Wallace
eed0facc87 added user_location_prefs to upgrade script 2010-05-27 03:00:58 +00:00
Brenda Wallace
f429c1aaa0 the sent column wasn't being populated, needed default 2010-05-25 16:25:35 +12:00
Brenda Wallace
bfef918482 queue_item in _pg now matches mysql 2010-05-22 20:52:53 +12:00
Brenda Wallace
249c820559 migration of data in queue_item to new table 2010-05-22 20:50:30 +12:00
Brenda Wallace
f4d0f721c8 fixed up comment syntax 2010-05-22 20:09:51 +12:00
Brenda Wallace
d7d49942f7 Merge commit 'mainline/0.9.x' into 0.9.x 2010-05-22 20:06:18 +12:00
Brenda Wallace
fa4a2d3485 added verifier and verified_callback to postgres schema and update script 2010-05-22 20:04:46 +12:00
Zach Copley
cef2ded9e7 Add TweetDeck to notice sources 2010-05-21 10:31:00 -07:00
Zach Copley
afd81a540a Add TweetDeck to notice sources 2010-05-21 10:30:32 -07:00
Zach Copley
bbfd6eff0c Add TweetDeck to notice sources 2010-05-21 10:29:43 -07:00
Brenda Wallace
8395925247 added comsumer_secret to consumer table on postgres 2010-05-21 21:09:40 +12:00
Brenda Wallace
069a38e624 add comsumer_secret column to consumer 2010-05-21 21:04:57 +12:00
Brion Vibber
c4203be9a4 Merge branch '0.9.x' into 1.0.x 2010-05-19 12:52:23 -07:00
Patrick Georgi
a968cc6999 updated database for postgres 2010-05-17 13:47:27 +12:00
Zach Copley
f803c1fbfe Add Emacs Identica-mode to notice sources 2010-05-04 12:43:30 -07:00
Zach Copley
68eaa2e12a Add Emacs Identica-mode to notice sources 2010-05-04 12:43:04 -07:00
Zach Copley
9d2c3d45bc Add Emacs Identica-mode to notice sources 2010-05-04 12:31:55 -07:00
Evan Prodromou
14adb7cc41 Give users more control over URL shortening 
Users and administrators can set how long an URL can be before it's
shortened, and how long a notice can be before all its URLs are
shortened. They can also turn off shortening altogether.

Squashed commit of the following:

commit d136b39011
Author: Evan Prodromou <evan@status.net>
Date:   Mon Apr 26 02:39:00 2010 -0400

    use site and user settings to determine when to shorten URLs

commit 1e1c851ff3
Author: Evan Prodromou <evan@status.net>
Date:   Mon Apr 26 02:38:40 2010 -0400

    add a method to force shortening URLs

commit 4d29ca0b91
Author: Evan Prodromou <evan@status.net>
Date:   Mon Apr 26 02:37:41 2010 -0400

    static method for getting best URL shortening service

commit a9c6a3bace
Author: Evan Prodromou <evan@status.net>
Date:   Mon Apr 26 02:37:11 2010 -0400

    allow 0 in numeric entries in othersettings

commit 767ff2f7ec
Author: Evan Prodromou <evan@status.net>
Date:   Mon Apr 26 02:36:46 2010 -0400

    allow 0 or blank string in inputs

commit 1e21af42a6
Author: Evan Prodromou <evan@status.net>
Date:   Mon Apr 26 02:01:11 2010 -0400

    add more URL-shortening options to othersettings

commit 869a6be0f5
Author: Evan Prodromou <evan@status.net>
Date:   Sat Apr 24 14:22:51 2010 -0400

    move url shortener superclass to lib from plugin

commit 9c0c9863d5
Author: Evan Prodromou <evan@status.net>
Date:   Sat Apr 24 14:20:28 2010 -0400

    documentation and whitespace on UrlShortenerPlugin

commit 7a1dd5798f
Author: Evan Prodromou <evan@status.net>
Date:   Sat Apr 24 14:05:46 2010 -0400

    add defaults for URL shortening

commit d259c37ad2
Author: Evan Prodromou <evan@status.net>
Date:   Sat Apr 24 13:40:10 2010 -0400

    Add User_urlshortener_prefs

    Add a table for URL shortener prefs, a corresponding class, and the
    correct mumbo-jumbo in statusnet.ini to make everything work.
 2010-04-26 02:40:36 -04:00
Brion Vibber
64b5ea2e62 Use InnoDB and UTF-8 options when creating user_im_prefs table, to match others 2010-03-24 14:18:06 -07:00
Craig Andrews
714d920fae Merge branch '0.9.x' into 1.0.x 
Conflicts:
	classes/statusnet.ini
	db/statusnet.sql
	lib/jabber.php
	lib/xmppmanager.php
 2010-03-08 17:22:23 -05:00
Brion Vibber
af04973e9e Roll up some missing items from 08to09.sql; now hits all changed tables/columns/keys in core. 
Added partial data conversions:
user_groups -> local_user: ids, names filled out; mainpage, uri left null
notice -> conversation: stub entry added to push the autoincrement past existing notice items
 2010-03-04 08:49:04 -08:00
Ciaran Gultnieks
3d2bf5ce20 Create new field in consumer table in 08to09.sql 2010-03-04 08:33:07 -08:00