Evan Prodromou
82770601e2
Remove config.php.sample
...
This file is really, really out-of-date. We've got admin panels, and
we've got a long document (CONFIGURE) on how to do this. Using
config.php.sample as a starting point is a bad idea.
2011-09-28 16:11:12 -04:00
Evan Prodromou
c70c7db1c5
Remove unique key on file_thumbnail.url
...
We're getting "DB error: already exists" on thumbnails coming from
embed.ly. We don't need this to be unique, so let's avoid that.
2011-09-28 15:48:20 -04:00
Evan Prodromou
a18d3facf8
Merge branch '1.0.x' into 1.1.x
2011-09-28 12:24:39 -04:00
Scott Sweeny
94b524d6dc
plugins/MobileProfile/MobileProfilePlugin.php: add 'maemo' to recognized devices
2011-09-27 23:54:42 -04:00
Zach Copley
8ca9f33f45
Merge branch 'testing' of gitorious.org:statusnet/mainline into testing
2011-09-27 16:59:43 +00:00
Zach Copley
cd30c94096
Move check for valid access token to the right place
2011-09-27 16:59:10 +00:00
Evan Prodromou
baeb84ebb3
Remove unsupported hcard action from xrd
2011-09-27 11:49:38 -04:00
Evan Prodromou
23e02ea76a
Merge branch '1.0.x' into testing
2011-09-27 11:45:24 -04:00
Evan Prodromou
9f954eddc5
remove unsupported hcard action
2011-09-27 11:43:41 -04:00
Evan Prodromou
9143d4f384
Merge branch '1.0.x' into testing
2011-09-27 11:33:13 -04:00
Evan Prodromou
3a267aa549
Merge remote-tracking branch 'origin/testing' into testing
2011-09-27 11:33:01 -04:00
Evan Prodromou
3063caea83
Incorrect constant for theme warning
2011-09-27 11:32:20 -04:00
Evan Prodromou
5ccae1313c
Query errors in Profile_tag
2011-09-27 11:32:05 -04:00
Evan Prodromou
8b35e69b34
setup schemaversion first so we don't get errors on upgrade
2011-09-27 11:27:14 -04:00
Evan Prodromou
841c71f37d
Add profile lists for all tags on upgrade
2011-09-27 11:16:14 -04:00
Evan Prodromou
5eddfd1eab
remove unlinked publicpeopletagcloud
2011-09-27 10:55:10 -04:00
Evan Prodromou
88c00facc8
fix getOtherTags() to not use joinAdd()
2011-09-27 10:51:02 -04:00
Evan Prodromou
707f90d012
missed an AND
2011-09-27 10:47:13 -04:00
Evan Prodromou
ce044c40fb
rewrite Profile_tag::getTagsArray() so it doesn't use joinAdd()
2011-09-27 09:42:34 -04:00
Zach Copley
ec53e68cf2
Merge branch 'testing' of gitorious.org:statusnet/mainline into testing
2011-09-27 04:33:00 +00:00
Zach Copley
000e5c0c01
Do a better job of saving the original avatar from Facebook
2011-09-27 04:31:41 +00:00
Zach Copley
3b28f226c7
Facebook bridge back in business with new JS-SDK and OAuth 2.0 flow.
...
Might be better to rewrite the login mechanism to use server side flow
now that Facebook provides it.
2011-09-27 04:09:47 +00:00
Evan Prodromou
8c710ad2c1
Merge commit 'refs/merge-requests/158' of git://gitorious.org/statusnet/mainline into merge-requests/158
...
Conflicts:
classes/Profile_list.php
lib/peopletagnoticestream.php
2011-09-26 17:11:49 -04:00
Evan Prodromou
a9f83008b8
Merge branch '1.0.x' into testing
2011-09-26 17:06:14 -04:00
Evan Prodromou
540c545399
Don't replace URLs if 'shortened' version is longer, unless forced
2011-09-26 17:05:35 -04:00
Evan Prodromou
b816d24dcc
Merge branch '1.0.x' into testing
2011-09-26 16:16:08 -04:00
Evan Prodromou
a1fd6e0fa4
Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x
2011-09-26 16:15:52 -04:00
Evan Prodromou
2678b937b1
fix problem with missing list subscribers
2011-09-26 16:15:38 -04:00
Brion Vibber
1b25b75b53
Use older-style top reply form when replying from old-school conversation tree view (labeled with .old-school class on one of its parent nodes).
2011-09-26 12:54:33 -07:00
Evan Prodromou
7a756f39fd
Merge branch '1.0.x' into testing
2011-09-26 15:07:09 -04:00
Evan Prodromou
a19b194a31
Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x
2011-09-26 15:06:49 -04:00
Evan Prodromou
e1ac3ad868
missing \n in ja translation
2011-09-26 15:04:49 -04:00
Samantha Doherty
70355c0edd
Updated RTL.css for neo
2011-09-26 15:01:12 -04:00
Evan Prodromou
eb711321c3
Merge branch '1.0.x' into testing
2011-09-26 14:10:43 -04:00
Samantha Doherty
76821df931
Whoops quick fix fornewschool conversations.
2011-09-26 08:41:40 -04:00
Samantha Doherty
800c7a616b
A little style for oldschool conversation layout.
2011-09-26 08:27:04 -04:00
Samantha Doherty
b0ee583270
Tiny layout fix for QnA.
2011-09-26 08:26:38 -04:00
Zach Copley
634fb64c11
Facebook bridge mostly working again with new OAuth 2.0 flow
2011-09-26 05:32:19 +00:00
Siebrand Mazeland
c9c8c9ffdc
Remove punctuation in e-mail subject. Spotted by OsamaK.
2011-09-26 00:10:34 +02:00
Siebrand Mazeland
e7dac240ef
Localisation updates from http://translatewiki.net .
2011-09-26 00:01:00 +02:00
Evan Prodromou
a844c423a9
Merge branch '1.0.x' into testing
2011-09-24 10:18:09 -04:00
Evan Prodromou
379b3f5384
Merge branch 'streammode' into 1.0.x
2011-09-24 10:17:17 -04:00
Evan Prodromou
8e04dce947
Old-school settings page
...
A page to set or remove old-school settings.
2011-09-24 10:14:45 -04:00
Evan Prodromou
ea1a11a087
site-wide option to enable old-school settings
2011-09-24 09:46:13 -04:00
Evan Prodromou
ae0b4d49c7
optional conversation tree view
2011-09-24 09:29:12 -04:00
Evan Prodromou
61a3ccf2bf
users can choose to just see nicknames in streams
2011-09-24 07:19:52 -04:00
Evan Prodromou
ddc121c085
New table for all old-school UI prefs
2011-09-24 07:12:34 -04:00
Evan Prodromou
02a30cf47c
start using stream mode prefs instead of separate parameter
2011-09-23 17:50:38 -04:00
Evan Prodromou
66c97a1a1e
switch between conversation and stream for public and group
2011-09-23 17:28:54 -04:00
Evan Prodromou
dba9d71abd
Support mode in all
2011-09-23 17:18:21 -04:00
