gnu-social

History

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

accesstoken.php

uiredesign + phpdocs

2009-01-22 05:24:32 +00:00

all.php

First pass at with-friends; doesn't pass phpcs

2009-01-19 13:27:45 +00:00

allrss.php

small bugfix, it's prepare() not initialize()

2009-01-23 04:03:04 +00:00

api.php

Merge branch 'master' of /var/www/mublog

2009-01-23 08:58:31 +01:00

avatarbynickname.php

uiredesign + phpdocs

2009-01-22 05:28:09 +00:00

avatarsettings.php

Missing closing li

2009-01-23 06:14:56 +00:00

block.php

uiredesign

2009-01-23 04:29:21 +00:00

confirmaddress.php

update commitaddress

2009-01-18 18:41:41 +00:00

deletenotice.php

Converted DeleteAction and DeletenoticeAction to new uiredesign zeitgeist

2009-01-20 22:20:17 -08:00

disfavor.php

uiredesign + phpdocs

2009-01-22 09:39:53 +00:00

doc.php

Added some CSS classes for styling doc pages differently

2009-01-22 04:26:15 +00:00

editgroup.php

fixed a few bugs and logic problems in groups

2009-01-22 08:01:40 +00:00

emailsettings.php

Renamed form_datas to form_data

2009-01-19 03:09:13 +00:00

facebookhome.php

trac750 fix href for theme stylesheet

2009-01-23 07:09:00 +00:00

facebookinvite.php

trac750 Facebook app proper integrated into new uiredesign

2009-01-23 03:16:03 +00:00

facebooklogin.php

trac750 fix href for theme stylesheet

2009-01-23 07:09:00 +00:00

facebookremove.php

Merge branch 'master' of /var/www/trunk

2009-01-19 13:35:17 +00:00

facebooksettings.php

trac750 small fix to FBJS redirect

2009-01-23 06:02:41 +00:00

favor.php

uiredesign + phpdocs

2009-01-22 09:39:53 +00:00

favorited.php

Use cached query results for favorited. Might cause pagination issues.

2009-01-22 19:14:18 +01:00

favoritesrss.php

uiredesign + phpdocs

2009-01-22 15:20:58 +00:00

featured.php

Mark featured users as readonly

2009-01-19 18:09:59 +00:00

finishaddopenid.php

Make the OpenID settings work with new framework

2009-01-16 20:25:46 +00:00

finishopenidlogin.php

Update finishopenidlogin

2009-01-23 00:30:57 +01:00

finishremotesubscribe.php

Convert use of common_server_error and common_user_error to methods on Action

2009-01-15 23:03:38 +00:00

foaf.php

Updated foaf file

2009-01-22 23:08:30 +00:00

groupbyid.php

Add group by id for group permalinks

2009-01-21 02:55:55 -05:00

grouplogo.php

Upload logos for groups

2009-01-23 08:15:29 +01:00

groupmembers.php

Show members of a group

2009-01-21 09:52:21 -05:00

groups.php

Anonymous notice

2009-01-23 03:47:32 +00:00

imsettings.php

Renamed form_datas to form_data

2009-01-19 03:09:13 +00:00

inbox.php

Converted direct messaging actions to new uiredesign

2009-01-20 17:49:47 -08:00

invite.php

Add attributes for invite

2009-01-22 22:59:18 +00:00

joingroup.php

Fix error in prepare() for checking group membership

2009-01-22 01:53:44 -05:00

leavegroup.php

fixed a few bugs and logic problems in groups

2009-01-22 08:01:40 +00:00

Renamed form_datas to form_data

2009-01-19 03:09:13 +00:00

logout.php

uiredesign + phpdocs

2009-01-20 20:55:16 +00:00

microsummary.php

uiredesign + phpdocs.

2009-01-20 21:05:55 +00:00

newgroup.php

fixed a few bugs and logic problems in groups

2009-01-22 08:01:40 +00:00

newmessage.php

Converted direct messaging actions to new uiredesign

2009-01-20 17:49:47 -08:00

newnotice.php

Make newnotice work

2009-01-18 17:06:38 +00:00

noticesearch.php

uiredesign

2009-01-23 01:22:17 +00:00

noticesearchrss.php

uiredesign

2009-01-23 03:32:06 +00:00

nudge.php

Moved nudge response from util.php to nudge.php

2009-01-22 06:33:38 +00:00

openidlogin.php

First steps to getting OpenID working again

2009-01-22 23:17:08 +00:00

openidsettings.php

Renamed form_datas to form_data

2009-01-19 03:09:13 +00:00

opensearch.php

uiredesign + phpdocs

2009-01-22 05:20:29 +00:00

othersettings.php

Renamed form_datas to form_data

2009-01-19 03:09:13 +00:00

outbox.php

Converted direct messaging actions to new uiredesign

2009-01-20 17:49:47 -08:00

passwordsettings.php

form_password markup and style

2009-01-21 19:56:18 +00:00

peoplesearch.php

uiredesign

2009-01-23 01:00:57 +00:00

peopletag.php

Convert use of common_server_error and common_user_error to methods on Action

2009-01-15 23:03:38 +00:00

postnotice.php

Convert use of common_server_error and common_user_error to methods on Action

2009-01-15 23:03:38 +00:00

profilesettings.php

Renamed form_datas to form_data

2009-01-19 03:09:13 +00:00

public.php

Anonymous notice

2009-01-23 03:47:32 +00:00

publicrss.php

uiredesign + phpdocs

2009-01-22 05:11:19 +00:00

publictagcloud.php

Public tagcloud and tag cloud styles

2009-01-21 18:35:45 +00:00

publicxrds.php

uiredesign + phpdocs

2009-01-22 15:37:58 +00:00

recoverpassword.php

Updated recoverpassword

2009-01-23 01:00:01 +01:00

Added some CSS classes for styling doc pages differently

2009-01-22 04:26:15 +00:00

remotesubscribe.php

Cleanup

2009-01-23 05:23:28 +00:00

replies.php

Adapt replies to new framework

2009-01-17 23:17:57 +00:00

repliesrss.php

uiredesign

2009-01-23 04:07:52 +00:00

requesttoken.php

uiredesign + phpdocs

2009-01-22 09:54:08 +00:00

showfavorites.php

Favorites is readonly

2009-01-19 18:10:20 +00:00

showgroup.php

anon_notice

2009-01-23 04:10:40 +00:00

showmessage.php

Converted ShowmessageAction to work with new uiredesign

2009-01-20 19:16:52 -08:00

shownotice.php

make avatar bigger on single notice pages

2009-01-23 05:11:04 +00:00

showstream.php

Cleanup

2009-01-23 05:23:28 +00:00

smssettings.php

Renamed form_datas to form_data

2009-01-19 03:09:13 +00:00

subedit.php

Some whitespace edits in subedit, and tested that it works

2009-01-23 02:04:13 +01:00

subscribe.php

(Un)subscribe AJAX forms

2009-01-21 04:08:05 +00:00

subscribers.php

Debug some of the subscriptions+tags problems

2009-01-22 22:38:10 +00:00

subscriptions.php

Debug some of the subscriptions+tags problems

2009-01-22 22:38:10 +00:00

sup.php

Updated sup

2009-01-23 00:36:24 +01:00

tag.php

Update tag to use new framework

2009-01-19 18:21:14 +00:00

tagother.php

tag user profile and form markup and style

2009-01-23 01:20:20 +00:00

tagrss.php

Convert use of common_server_error and common_user_error to methods on Action

2009-01-15 23:03:38 +00:00

twitapiaccount.php

Merge branch 'master' of /var/www/mublog

2009-01-23 08:58:31 +01:00

twitapiblocks.php

Convert use of common_server_error and common_user_error to methods on Action

2009-01-15 23:03:38 +00:00

twitapidirect_messages.php

Convert use of common_server_error and common_user_error to methods on Action

2009-01-15 23:03:38 +00:00

twitapifavorites.php

Convert use of common_server_error and common_user_error to methods on Action

2009-01-15 23:03:38 +00:00

twitapifriendships.php

Convert use of common_server_error and common_user_error to methods on Action

2009-01-15 23:03:38 +00:00

twitapihelp.php

Convert use of common_server_error and common_user_error to methods on Action

2009-01-15 23:03:38 +00:00

twitapilaconica.php

Convert use of common_server_error and common_user_error to methods on Action

2009-01-15 23:03:38 +00:00

twitapinotifications.php

Convert use of common_server_error and common_user_error to methods on Action

2009-01-15 23:03:38 +00:00

twitapistatuses.php

Convert use of common_server_error and common_user_error to methods on Action

2009-01-15 23:03:38 +00:00

twitapiusers.php

Merge branch 'master' of /var/www/mublog

2009-01-23 08:58:31 +01:00

twittersettings.php

Renamed form_datas to form_data

2009-01-19 03:09:13 +00:00

unblock.php

uiredesign

2009-01-23 04:29:21 +00:00

unsubscribe.php

(Un)subscribe AJAX forms

2009-01-21 04:08:05 +00:00

updateprofile.php

Convert use of common_server_error and common_user_error to methods on Action

2009-01-15 23:03:38 +00:00

userauthorization.php

Fix over-zealous un-underscoring in userauthorization

2009-01-23 01:41:00 +01:00

userbyid.php

uiredesign + phpdocs

2009-01-21 00:07:15 +00:00

usergroups.php

Don't double-define GROUPS_PER_PAGE

2009-01-23 02:57:48 +01:00

userrss.php

uiredesign

2009-01-23 04:10:49 +00:00

xrds.php

Fix start/stop xml in xrds

2009-01-23 01:39:25 +01:00