Commit Graph

5932 Commits

Author SHA1 Message Date
Craig Andrews
c93b9b9523 Merge commit 'refs/merge-requests/1815' of git://gitorious.org/statusnet/mainline into 0.9.x 2009-10-23 11:15:25 -04:00
Zach Copley
1b4f9f2c09 Merge branch '0.9.x' into facebook-app-plugin 2009-10-22 21:12:51 +00:00
Evan Prodromou
9608cc6143 Merge branch '0.9.x' into location 2009-10-22 16:23:42 -04:00
Evan Prodromou
e73631f614 Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x 2009-10-22 16:21:05 -04:00
Evan Prodromou
65c45986c6 HTTPResponse has default empty headers 2009-10-22 16:20:56 -04:00
Evan Prodromou
de4b2098d1 results of json parsing are objects not arrays 2009-10-22 16:20:31 -04:00
Evan Prodromou
69357c4916 error in order of arguments to array_key_exists in location.php 2009-10-22 16:19:56 -04:00
Evan Prodromou
8828bc485f beginning of a test for location services 2009-10-22 16:19:25 -04:00
Evan Prodromou
9c983c3830 extract Geonames stuff to a plugin 2009-10-22 15:44:36 -04:00
Brion Vibber
c6d1039901 Add some doc comments to QueueHandler 2009-10-22 10:11:04 -07:00
Evan Prodromou
7b227fd1c0 start getting locations from remote services 2009-10-21 22:47:19 -04:00
Evan Prodromou
b6b245dc0b start of a location class 2009-10-21 22:43:41 -04:00
Evan Prodromou
b7a4437e79 flip x flag on generated files 2009-10-21 22:43:41 -04:00
Evan Prodromou
6fc5c934ed statusnet.ini update 2009-10-21 22:43:41 -04:00
Evan Prodromou
2ed073f295 new data structures for location 2009-10-21 22:43:40 -04:00
Evan Prodromou
3b3d861b93 Revert "lat,lon -> lat,long"
This reverts commit 61d948cffee0aff4fd7853421ec0849458ea34c9.
2009-10-21 22:43:40 -04:00
Evan Prodromou
61826169de lat,lon -> lat,long 2009-10-21 22:43:40 -04:00
Evan Prodromou
671732ade7 add a couple of location namespaces 2009-10-21 22:43:40 -04:00
Evan Prodromou
3d772d24e7 add location-related tables and columns 2009-10-21 22:43:40 -04:00
Evan Prodromou
4e639b8769 Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x 2009-10-21 22:41:42 -04:00
Evan Prodromou
0df85711d6 reformat default.php 2009-10-21 22:41:23 -04:00
Zach Copley
ec92cab6ff Removed Facebook stuff from the StatusNet README and wrote a new README
for the Facebook plugin.
2009-10-21 17:53:23 -07:00
Zach Copley
6a2185a26b Make paths and class loading work right 2009-10-21 22:02:10 +00:00
Zach Copley
3e5c8f28c3 Fix references 2009-10-21 17:29:54 +00:00
Zach Copley
6199d31acc Remove facebook broadcast from unqueuemanager. That's now
added by an event.
2009-10-21 01:18:36 +00:00
Zach Copley
aa58e8a738 Combine Facebook and Facebook Connect plugins into one big plugin 2009-10-21 01:17:31 +00:00
Zach Copley
d07c9d8750 Gather all the Facebook stuff together in one place 2009-10-21 01:07:03 +00:00
Zach Copley
78e5a5980a Extract out Facebook app stuff into a plugin 2009-10-20 16:32:30 -07:00
Zach Copley
5e536a6614 Remove Twitter bridge stuff. The relevant info has been moved to
/plugins/TwitterBridge/README
2009-10-20 06:11:40 +00:00
Zach Copley
09dfb08a39 Merge branch '0.9.x' into TwitterBridgePlugin 2009-10-20 06:06:10 +00:00
Zach Copley
7539e26951 - Make Twitter bridge work with unqueuemanager
- Add README
2009-10-20 06:05:35 +00:00
Zach Copley
19b870c439 Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x 2009-10-20 00:53:08 +00:00
Zach Copley
9cdd77625e Less intrusive, more reliable way for FB Connect plugin to modify the
primary nav in order to show FB mini-avatar and have the logout link
logout of FB as well as StatusNet.
2009-10-20 00:49:11 +00:00
Evan Prodromou
f7a3b30f5b Revert "Revert "fixed up some invalid comment syntax - this is ANSI SQL""
This reverts commit c0eca0e59b.
2009-10-19 18:15:40 -04:00
Evan Prodromou
eb273da532 Revert "Revert "upgrade script for postgres""
This reverts commit d72748eb8e.

Conflicts:

	db/08to09_pg.sql
2009-10-19 18:13:41 -04:00
Evan Prodromou
fc61b71625 merge from testing 2009-10-19 18:12:00 -04:00
Evan Prodromou
d72748eb8e Revert "upgrade script for postgres"
This reverts commit d46f2ee350.
2009-10-19 18:07:36 -04:00
Evan Prodromou
689b3ae73d Revert "added missing parts to postgres update, and the config+user_role tables to both upgrade scripts"
This reverts commit e9edb803bc.
2009-10-19 18:07:19 -04:00
Evan Prodromou
c0eca0e59b Revert "fixed up some invalid comment syntax - this is ANSI SQL"
This reverts commit 6704ddddf2.
2009-10-19 18:07:03 -04:00
Evan Prodromou
728a146ec0 new codename for 0.8.2 2009-10-19 17:30:08 -04:00
Evan Prodromou
fe1ae3a47e Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing 2009-10-19 17:00:36 -04:00
Evan Prodromou
035d4cf86e Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x 2009-10-19 15:36:26 -04:00
Eric Helgeson
9d0e37c4e8 Utilize NICKNAME_FMT constant when creating at replies 2009-10-19 13:11:55 -04:00
Eric Helgeson
acf2b19463 Ignoring Sent from my* line in mail (iPhone/Pre) 2009-10-19 12:52:25 -04:00
Brion Vibber
ce4ed6cca5 Merge branch 'i18n-work' into i18n-0.9.x 2009-10-19 09:34:37 -07:00
Brion Vibber
dfc1be67bb Merge branch '0.9.x' into i18n-0.9.x 2009-10-19 09:26:40 -07:00
Brion Vibber
39598582d9 Merge branch 'i18n-work' into i18n-0.9.x 2009-10-19 09:25:05 -07:00
Sarven Capadisli
d18f4a35ed Better alignment 2009-10-19 14:47:08 +00:00
Brion Vibber
e54d3e024e Merge branch 'i18n-work' of git@gitorious.org:~brion/statusnet/brion-fixes into i18n-work 2009-10-19 13:58:07 +00:00
Brion Vibber
b76aa87f49 Merge branch '0.8.x' of git@gitorious.org:statusnet/mainline into i18n-work 2009-10-19 13:56:18 +00:00