Commit Graph

14322 Commits

Author SHA1 Message Date
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
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 540c545399 Don't replace URLs if 'shortened' version is longer, unless forced 2011-09-26 17:05:35 -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 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
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
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 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
Samantha Doherty 9995d9b5a4 Make addressee groups italic. 2011-09-23 16:42:12 -04:00
Evan Prodromou e3460d9b24 Merge branch 'master' of gitorious.org:statusnet/mainline 2011-09-22 16:31:26 -04:00
Evan Prodromou 8fa816c324 don't use potentially bad Profile values 2011-09-22 16:29:31 -04:00
Zach Copley c2da445699 Use array_merge instead of array_replace (same effect, and array_merge works with PHP versions < 5.3)
fixes http://status.net/open-source/issues/3393
2011-09-22 12:53:31 -07:00
Zach Copley 6f0cb0b23f Merge branch 'site-profile-fixes'
* site-profile-fixes:
  Use array_merge instead of array_replace (same effect, and array_merge works with PHP versions < 5.3)
  Update RTL stylesheet for neo.
2011-09-22 12:52:38 -07:00
Zach Copley 4c91dc4546 Use array_merge instead of array_replace (same effect, and array_merge works with PHP versions < 5.3)
fixes http://status.net/open-source/issues/3393
2011-09-22 12:51:24 -07:00
Samantha Doherty 2287f29c57 Update RTL stylesheet for neo. 2011-09-22 12:50:40 -07:00
Samantha Doherty f65fa42e15 Update RTL stylesheet for neo. 2011-09-22 09:27:36 -04:00
Samantha Doherty b15aea653d Improved browser compatibility for various gradients. 2011-09-22 09:27:15 -04:00
Samantha Doherty 39cf27c0e9 A little more IE style cleanup. 2011-09-22 09:26:03 -04:00
Samantha Doherty bcb0709401 Only load theme-specific IE stylesheets if they exist. 2011-09-22 09:22:08 -04:00
Samantha Doherty 5711655d7b Quick update of theme README file. 2011-09-22 09:19:46 -04:00
Evan Prodromou d214d4533c don't cause an error on non-user profile in api 2011-09-21 17:15:55 -04:00
Evan Prodromou 642901f4ae No such path 'index', so redirect to home timeline 2011-09-21 16:33:10 -04:00
Evan Prodromou d594c83a5a Merge commit 'refs/merge-requests/159' of git://gitorious.org/statusnet/mainline into merge-requests/159 2011-09-21 16:31:38 -04:00
Evan Prodromou 59043dca7f Merge commit 'refs/merge-requests/164' of git://gitorious.org/statusnet/mainline into merge-requests/164
Conflicts:
	classes/Avatar.php

I ignored the code in Avatar; it's a different patch.
2011-09-21 15:39:44 -04:00
Evan Prodromou 7d64d8c78c Merge commit 'refs/merge-requests/165' of git://gitorious.org/statusnet/mainline into merge-requests/165
Conflicts:
	lib/noticelist.php
2011-09-21 15:33:52 -04:00
Evan Prodromou 12588b1cf7 Merge commit 'refs/merge-requests/166' of git://gitorious.org/statusnet/mainline into merge-requests/166 2011-09-21 15:24:17 -04:00
Evan Prodromou ad726a15de Use an event to signal that IM settings are available
Rather than enumerating available classes, define an event that sets a
flag indicating that there's an IM plugin available. Implemented in
implugin.php, so all IM plugins that use that class should
work. Others can hook the event, too.
2011-09-21 15:15:59 -04:00
Evan Prodromou c48cdc7d50 Merge commit 'refs/merge-requests/169' of git://gitorious.org/statusnet/mainline into merge-requests/169 2011-09-21 15:09:05 -04:00