Commit Graph

55 Commits

Author SHA1 Message Date
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
Siebrand Mazeland
4b4894b121 Many i18n/L10n updates and lots of descriptions for translators added. 2010-10-20 00:35:39 +02:00
Craig Andrews
1a62d1b493 Use presence of IM plugins to decide if "IM" options should be available 2010-06-16 16:00:54 -04:00
Sarven Capadisli
9fe12be41e Using unique @for, @id pair for jabber and sms options in subscriptions 2010-03-24 21:34:53 +01:00
Sarven Capadisli
8ccc9e2c38 Added before and after event hooks for subscriptions content 2010-02-22 17:03:28 +01:00
Siebrand Mazeland
b0aea3f9c1 * L10n updates: consistent puctuation
* i18n updates: number parameters if more than one are being used
2010-01-10 01:45:58 +01:00
Brion Vibber
c89b10ffe4 Code style cleanup: dropped some unnecessary =& reference assignments where they're used only out of habit for PHP 4-style object semantics 2009-12-03 12:58:48 -08:00
Sarven Capadisli
277b464054 Created autofocus method to give focus to an element (primarily a form
control) on page onload.

Updated some of the pages to use autofocus.
2009-09-03 19:42:50 +00:00
Evan Prodromou
df86aa7214 define LACONICA and accept LACONICA for backwards compatibility 2009-08-26 10:41:36 -04:00
Evan Prodromou
865b716f09 change LACONICA to STATUSNET 2009-08-25 18:42:34 -04:00
Evan Prodromou
ae883ceb9b change controlyourself.ca to status.net 2009-08-25 18:19:04 -04:00
Evan Prodromou
d35b2d3f3c change laconi.ca to status.net 2009-08-25 18:16:46 -04:00
Evan Prodromou
c8b8f07af1 change Laconica and Control Yourself to StatusNet in PHP files 2009-08-25 18:12:20 -04:00
Jeffery To
c261a645a1 Hide subscription controls for disabled services (IM, SMS) 2009-08-07 01:34:36 +08:00
Evan Prodromou
f73d93fa7a only show subscription controls to owner 2009-07-03 01:26:21 -04:00
Evan Prodromou
c2dae24701 Break profilelist into a recipe
Expanded the ProfileList class so it worked more like a recipe. This
helps to get rid of a lot of special cases and simplifies the code. It
also makes it possible to do things like group block.
2009-06-14 14:52:26 -07:00
Robin Millette
4b54a418f3 trac#1215, 1216, 1217 and 1219: subscribers/subscriptions people tagclouds 2009-04-18 19:08:33 +00:00
Meitar Moscovitz
6cdc2ff444 Fixes ticket:1409; correct typo 'subcription' to 'subscription' in HTML and CSS. 2009-04-09 13:52:39 -04:00
Robin Millette
ddb59f72db text bugfix to guide text in subscription list. 2009-04-08 01:13:37 +00:00
Robin Millette
68ed6be71f added filler/guide text to subscription list. 2009-04-08 01:05:17 +00:00
Evan Prodromou
b6fbb9462c proper pagination for subs and members 2009-01-29 08:37:40 -05:00
Evan Prodromou
d6879bfe0c Debug some of the subscriptions+tags problems 2009-01-22 22:38:10 +00:00
sarven
ead1384650 .profile form.form_subscriptions_edit style 2009-01-22 16:57:37 +00:00
Evan Prodromou
01e7859a81 Remove common code from Subscriptions, make tags link visible 2009-01-22 17:12:23 +01:00
Evan Prodromou
a30d405328 Update subscriptions action 2009-01-22 16:12:00 +01:00
Evan Prodromou
eaa81d25fa Convert all actions to use new UI functions
I did a massive search-and-replace to get all the action subclasses to
use the new output function (common_element() -> $this->element(), etc.)

There's still a lot to do, but it's a first step
2009-01-15 22:57:15 +00:00
Evan Prodromou
b264c03d32 move opening brace of class declaration to next line
Another gigantor PEAR coding standards patch. Here, I've moved the
opening curly bracket on a class statement to the following line.

darcs-hash:20081223194923-84dde-77a93de314caadbcb5b70bf346a4648be77a864e.gz
2008-12-23 14:49:23 -05:00
Evan Prodromou
04ef1ba8ee change function headers to K&R style
Another huge change, for PEAR code standards compliance. Function
headers have to be in K&R style (opening brace on its own line),
instead of having the opening brace on the same line as the function
and parameters. So, a little perl magic found all the function
definitions and move the opening brace to the next line (properly
indented... usually).

darcs-hash:20081223193323-84dde-a28e36ecc66672c783c2842d12fc11043c13ab28.gz
2008-12-23 14:33:23 -05:00
Evan Prodromou
edbc0c665c replace all tabs with four spaces
The PEAR coding standards decree: no tabs, but indent by four spaces.
I've done a global search-and-replace on all tabs, replacing them by
four spaces. This is a huge change, but it will go a long way to
getting us towards phpcs-compliance. And that means better code
readability, and that means more participation.

darcs-hash:20081223191907-84dde-21e8efe210e6d5d54e935a22d0cee5c7bbfc007d.gz
2008-12-23 14:19:07 -05:00
Evan Prodromou
fd13272206 don't show form if subscription can't be found (weirdly)
darcs-hash:20081212055713-84dde-1b2aa99861ee0ab7c63a48152a5590b4d2f360d9.gz
2008-12-12 00:57:13 -05:00
Evan Prodromou
3210cd69cc set jabber and sms flags on subscriptions
darcs-hash:20081210024416-5ed1f-ec3b22136883f66c49473a10e09c06b6b9573a22.gz
2008-12-09 21:44:16 -05:00
Evan Prodromou
9b4df5056f add block form to subscribers list and profile page
I added a small form for blocking users to profiles in the profile
list, and also to the profile page.

I also added an action to handle the results of blocking someone.

This required some changes to the profile list class (so I could
add the block form), so I made them. And the gallery class lets its
subclasses return a subclass of ProfileList for their profile list.

darcs-hash:20081208055511-5ed1f-e2e09986bd3b9cbb6a00a0c6b94f49ea78b7bdab.gz
2008-12-08 00:55:11 -05:00
Evan Prodromou
aab4228b53 display subscriptions/subscribers as a list
darcs-hash:20081120113839-84dde-169dceadab4d365c81282e8a68a744b7c1aa6a94.gz
2008-11-20 06:38:39 -05:00
Evan Prodromou
ab1f2ff9d0 every user is subscribed to themselves
darcs-hash:20080722144154-84dde-80beabad9a681f2e12edb34ceb4ac249f4ce6705.gz
2008-07-22 10:41:54 -04:00
Mike Cochrane
87b494f1eb Convert _t() to _() for gettext.
darcs-hash:20080708094531-533db-83399a46e6ec4c0fcc6249b0235961f969d1ae73.gz
2008-07-08 05:45:31 -04:00
Evan Prodromou
f341780e1f more subscriptions/subscribers changes
Showstream now shows subscriptions in reverse chron order, like the
other pages.

Added a callback method to figure out who the _other_ guy is in a
subscription.

Changed gallery page to be a UL of images.

darcs-hash:20080618172444-84dde-b886f6f8170370ae1aaf2e7f996aff288a471145.gz
2008-06-18 13:24:44 -04:00
Evan Prodromou
aeaf75138c factor out similarities in subscriptions and subscribers
darcs-hash:20080618171313-84dde-3389db1f5110d3f47cd5a4ef17f6a7fc0fcf3b44.gz
2008-06-18 13:13:13 -04:00
Evan Prodromou
b87ba90732 better pagination and no rows in subscriptions and subscribed
darcs-hash:20080618165041-84dde-d98bebb8e74286993c582710ae385d5d7ef1b3fb.gz
2008-06-18 12:50:41 -04:00
Evan Prodromou
56de872740 move instructions up to the "whats up" area
darcs-hash:20080618035739-84dde-a562cffe186780d5f03cf53798ea249b2bda9fb1.gz
2008-06-17 23:57:39 -04:00
Evan Prodromou
7743348d24 set proper row sizes
darcs-hash:20080601020132-84dde-8559905f735c05e7274babc6a23440317cc4e587.gz
2008-05-31 22:01:32 -04:00
Evan Prodromou
ba5a3d476b get the correct data for subscribers/subscriptions
darcs-hash:20080521193452-84dde-a1553941833cf3f11c53a6f493ad2dae975cc168.gz
2008-05-21 15:34:52 -04:00
Evan Prodromou
4b96241acf define undefined, order subs
darcs-hash:20080521192912-84dde-4bea2a463bfb357b5688e0f8faccac622770ac95.gz
2008-05-21 15:29:12 -04:00
Evan Prodromou
0f0d50f06a off-by-one error in subscriptions
darcs-hash:20080521190640-84dde-04fc00048b044474488e7774053674231c96e355.gz
2008-05-21 15:06:40 -04:00
Evan Prodromou
9933e1e341 fixup default avatar urls by using common function
darcs-hash:20080521155448-84dde-0e71fe5dccea49162911f80c65cd1e2a46043b14.gz
2008-05-21 11:54:48 -04:00
Evan Prodromou
289c44141d default avatar
darcs-hash:20080521115727-84dde-73b58873e08c936139bd63cffab0c30883c9f8a5.gz
2008-05-21 07:57:27 -04:00
Evan Prodromou
52600ce0b0 trim whitespace
darcs-hash:20080520191412-84dde-a607dbe848279639630edd1ab4616d05cc2318d1.gz
2008-05-20 15:14:12 -04:00
Evan Prodromou
f614bb5bf2 add alt to all images
darcs-hash:20080520134631-84dde-249574ec7e16108cf47f3001c2bc726bdc6f8751.gz
2008-05-20 09:46:31 -04:00
Evan Prodromou
82b80b2f75 add header and footer to subscriptions
darcs-hash:20080518013747-84dde-e3e4f2bcd562f86e7c5460bc1bdbda8a1417dd31.gz
2008-05-17 21:37:47 -04:00
Evan Prodromou
2b8a19e5dd sub
darcs-hash:20080518013312-84dde-382047d577719dd4f0fd39768546b6bb43b1933c.gz
2008-05-17 21:33:12 -04:00
Evan Prodromou
b3c102ec6a fix table name in subscriptions.php
darcs-hash:20080518012850-84dde-31e2c255b661dc71201756b20763ab817df44d05.gz
2008-05-17 21:28:50 -04:00