Commit Graph

314 Commits

Author SHA1 Message Date
Evan Prodromou 7ea136ee1b Merge branch '0.7.x' of git://gitorious.org/laconica/sgmurphy-clone into sgmurphy-clone/0.7.x
Conflicts:

	actions/avatarsettings.php
2009-02-05 12:04:06 -05:00
Evan Prodromou 7ad3ff4a2c Allow re-authentication with OpenID
"Rememberme" logins aren't allowed to make changes to an account
(since cookie-stealing is too easy). Users have to re-authenticate.
Previously, it was impossible to do so without having a username and
password; this change lets you do it with OpenID, too.
2009-02-05 11:46:17 -05:00
Sean Murphy 7e975b17c5 Fixed #1134; Consolidated image scaling functions. 2009-02-04 19:32:15 -05:00
Sean Murphy 5c880bc6cc Fix for #1057; group logo transparecy (and pixilation) 2009-02-04 14:44:12 -05:00
Evan Prodromou 2d063650ef Make WebChannel and AjaxWebChannel work
These command-output channels were using the old common_element_*
functions. They now take an $out constructor parameter, and use that
for output.

The WebChannel has pretty remedial output; it would be nice if it
output a real formatted page.
2009-02-04 07:59:30 -05:00
Evan Prodromou 15b96f78ab Revert "Fixed direct messaging: AjaxWebChannel is now using Action's methods."
This reverts commit 0f2c43bd04.

Making Channel a subclass of Action for no other reason than to let
the AjaxWebChannel do some output is the really, really wrong way to
do this. A Channel is not an Action.

I'll change AjaxWebChannel so it takes an Action as a constructor
paramater and uses that Action for its output. We do this for most
Widget subclasses and it makes sense here, too.
2009-02-04 07:33:10 -05:00
Evan Prodromou 0356953cf8 Merge branch 'master' of evan@dev.controlyourself.ca:/var/www/trunk into 0.7.x 2009-02-03 15:12:55 -05:00
Sarven Capadisli 0f2c43bd04 Fixed direct messaging: AjaxWebChannel is now using Action's methods. 2009-02-02 18:53:15 +00:00
Adrian Lang 2f37539967 Fixes #1088: Show number of group members. Unlike the bugreport requested, the stats are displayed similar to userstream stats in a section in the sidebar. Additionaly, I removed a redundant notnull if check in ShowgroupAction->showMembers, fixed a SQL error in User_group->getMembers when no limit is passed, removed return value storing of void function and added an usage of Profile->getBestName. 2009-02-01 22:24:54 +01:00
Ciaran Gultnieks 53274a6d93 PostgreSQL - code changes to avoid problems where user table is referenced in ad-hoc queries 2009-01-30 01:12:58 +00:00
Evan Prodromou 2d6a9b4fbe whitespace in User_group 2009-01-28 22:57:29 -05:00
Adrian Lang a80a536e41 Fix canonical tags in notice and in URLs 2009-01-26 15:03:38 +01:00
Evan Prodromou 0d34cd24ab Update notice deletion
Changed the errors in notice deletion so it now works. Also,
consistently delete records from related tables that refer
to the notice.
2009-01-24 19:38:40 +01:00
Evan Prodromou a7c85bebd5 Merge branch 'master' of /var/www/mublog
Conflicts:

	actions/api.php
	actions/deletenotice.php
	actions/recoverpassword.php
	actions/remotesubscribe.php
	actions/tag.php
	actions/tagrss.php
	actions/twitapiaccount.php
	actions/twitapiusers.php
	classes/Notice.php
	classes/User.php
	lib/common.php
	lib/language.php
	lib/subs.php
	lib/twitterapi.php
	lib/util.php
	scripts/inbox_users.php
	scripts/update_translations.php

Merged development trunk into laconica head. woohoo!
2009-01-23 08:58:31 +01:00
Evan Prodromou 50ec1cc26e Upload logos for groups 2009-01-23 08:15:29 +01:00
Evan Prodromou 6b884d9f86 Remove require_once for Memcached_DBObject from new classes 2009-01-23 02:54:38 +00:00
Evan Prodromou d6879bfe0c Debug some of the subscriptions+tags problems 2009-01-22 22:38:10 +00:00
Evan Prodromou 96bcfa4981 Was accidentally not saving cached items (doh!) 2009-01-22 20:51:05 +00:00
Evan Prodromou 0642b6aa63 Fixed bug in caching of queries 2009-01-22 20:16:19 +00:00
Evan Prodromou dde1c00ce7 Return $inst, not $cls, if no cache in Memcached_DataObject 2009-01-22 19:54:05 +00:00
Evan Prodromou 8c79646e53 Add a method the memcached_object that lets it cache query results 2009-01-22 19:13:26 +01:00
Evan Prodromou e2869fcf0a Move NoticeWrapper to a generalized ArrayWrapper class
We need to use array wrappers for other kinds of queries, so
I generalized the NoticeWrapper and tested it in the Notice class.
2009-01-22 18:48:52 +01:00
Evan Prodromou 2f043b74e7 Move common_save_replies to Notice class 2009-01-22 01:53:27 -05:00
Evan Prodromou 17fc0b7880 Add the right inbox source for group notices 2009-01-21 22:40:42 -05:00
Evan Prodromou fca1ccc351 First pass at delivery of group messages
A first pass at the delivery of group messages.
2009-01-21 21:53:02 -05:00
Evan Prodromou fc90dd44b7 Add pkey query to Group_member 2009-01-21 21:52:33 -05:00
Evan Prodromou 30dadb1ad5 Fix include for group inbox class 2009-01-21 14:21:14 -05:00
Evan Prodromou 8516ccfb9d move membership/adminship tests to profile 2009-01-21 13:57:18 -05:00
Evan Prodromou 00f6f4fb67 user subscriptions methods 2009-01-21 13:00:30 -05:00
Evan Prodromou 64f5c542df Add group and groups to list of forbidden user names 2009-01-21 12:21:16 -05:00
Evan Prodromou fb6e9dda8e A method on User for getting groups 2009-01-21 12:19:23 -05:00
Evan Prodromou 7fec4ad33b Method for user groups to get a list of members 2009-01-21 09:51:55 -05:00
Evan Prodromou 26652e92f2 First pass at a group home page
This is the first pass at a group home page.
2009-01-21 02:22:10 -05:00
Evan Prodromou 4873277b58 Wrap notice-saving code in a transaction 2009-01-20 08:19:32 -05:00
Evan Prodromou af2fb7dff2 Don't override ORDER for inboxes; it messes up caching 2009-01-19 22:51:03 -05:00
Evan Prodromou 3285e0979d Move add to notice inboxes before cache clearing in hopes they will be
updated
2009-01-19 22:21:16 -05:00
Evan Prodromou bd056218f9 Generate new DB_DataObject classes for group tables 2009-01-13 00:35:41 -05:00
Evan Prodromou 02877224b2 Merge branch 'master' into devel
Conflicts:

	classes/CommandInterpreter.php
	lib/twitter.php
	lib/util.php
2009-01-06 17:09:39 -05:00
Evan Prodromou d3b1c1af16 add 'dm' as a synonym for 'd' command
darcs-hash:20081231032227-84dde-671346360e569522d5384663d4b808e329d4cf0c.gz
2008-12-30 22:22:27 -05:00
Zach Copley 5e061d2060 Some fixups of patches not already migrated to trunk to bring inline with PEAR coding stds
darcs-hash:20081225144601-7b5ce-4846f3d036c36037836d15ed672c10ba33f9f84c.gz
2008-12-25 09:46:01 -05:00
Sarven Capadisli 946eee4256 Direct message XHR response fix for IE and minor tweaks
darcs-hash:20081216071818-efd22-d2e59bb60a236538452be356f38d0974f35f0107.gz
2008-12-16 02:18:18 -05:00
Zach Copley 6b51941056 Actually crop your avatar when hitting 'crop' button on profile
darcs-hash:20081212043018-7b5ce-bc83b66e19007aa0a04fbb40053217ef92c44779.gz
2008-12-11 23:30:18 -05:00
Evan Prodromou c65bc1731f more places where required since param skipped for Notice::getStreamDirect
darcs-hash:20081211195259-5ed1f-c52136c07bdad5521184bd1990313030a8e1e831.gz
2008-12-11 14:52:59 -05:00
Evan Prodromou 0f70d496c9 missing argument
darcs-hash:20081211171353-84dde-31b2858e361f62e13ca8ca8784b1aac4209ef04c.gz
2008-12-11 12:13:53 -05:00
Evan Prodromou 35bc21d3bb whitespace conflicts in User.php
darcs-hash:20081211163434-5ed1f-38d9bf093db72d27837cbfe76d46fd518adc3bb6.gz
2008-12-11 11:34:34 -05:00
Evan Prodromou e85835d0d3 resolve whitespace changes in Notice.php
darcs-hash:20081211163150-5ed1f-10ff4c4863145909c1d541e39dc4bf69d945cfd7.gz
2008-12-11 11:31:50 -05:00
Zach Copley e0fbf02bbf trac750 configurable sync flags for Facebook app (noticesync, replysync)
darcs-hash:20090105040212-7b5ce-37f6195649dc673241e4566a93183b13e428d98f.gz
2009-01-04 23:02:12 -05:00
Zach Copley fd6f9b9d76 trac750 Automatically update linked Facebook users' statuses
darcs-hash:20090105010407-7b5ce-559da13720b18e3c570e730326f5e5ef2b2dc1ab.gz
2009-01-04 20:04:07 -05: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 7ad2f2a371 TRUE
More PEAR coding standards global changes. Here, I've changed all
instances of TRUE to true and FALSE to false.

darcs-hash:20081223194428-84dde-cb1a1e6f679acd68e864545c4d4dd8752d6a6257.gz
2008-12-23 14:44:28 -05:00