Commit Graph

1693 Commits

Author SHA1 Message Date
Adrian Lang
6ab9d6b140 Remove additional output as response to updateprofile.
This output breaks our own response validation and is not part of the OMB spec.
2009-03-08 17:09:09 +01:00
Adrian Lang
4c8c9bb9df Define undefined variable. 2009-03-08 17:06:18 +01:00
CiaranG
2133d5a4e7 PostgreSQL - some more fixes to make queries compatible with both databases. (submitted by oxygene) 2009-03-08 16:16:10 +00:00
Evan Prodromou
f66775658c trying to kill the can't-leave-a-group bug 2009-03-07 17:47:43 -08:00
Evan Prodromou
7d7d78b7f7 you can _so_ leave a group if you're its admin 2009-03-07 17:43:59 -08:00
Evan Prodromou
d014d43c68 Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x 2009-03-07 17:14:55 -08:00
Adrian Lang
f8d1381717 Corrected redirect targets for some group actions. These redirects can occur when the canonical name differs from the passed name. 2009-03-08 01:37:27 +01:00
Evan Prodromou
c21d61840d Let people view friends_timeline of others
Add some code to view others' friends timelines through API.
2009-03-07 14:13:33 -08:00
Evan Prodromou
1a63d7d829 fix case of OAuthUtil method 2009-03-07 13:35:19 -08:00
Evan Prodromou
ba9c589bb2 fix for change in OAuthUtil upstream 2009-03-07 13:32:44 -08:00
Adrian Lang
3383e78063 More api actions which need no auth when called with parameter. 2009-03-07 13:16:54 +00:00
Adrian Lang
162da3cbc5 Correct api method names for rss2 and atom feeds in all.php action. 2009-03-07 12:39:36 +00:00
Zach Copley
ac7170bf6c Atom search results for Twitter-compatible API + phpcs stuff 2009-03-06 21:09:43 -08:00
Evan Prodromou
13c183e2f4 Merge branch '0.7.x' into 0.8.x 2009-03-06 16:17:58 -08:00
Zach Copley
b1f337fe01 First crack at Twitter-like JSON search results for the API 2009-03-06 13:33:47 -08:00
Zach Copley
38b6946349 Stubs for Twitter-compatible API search methods 2009-03-04 18:14:52 -08:00
Zach Copley
77e4fad9fa Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x 2009-03-04 16:21:37 -08:00
Zach Copley
36bb33fb1d Made /api/account/verify_credentials.format return an extended user object. Updates to status and user API objects. 2009-03-04 16:17:40 -08:00
CiaranG
115519a5e7 PostgreSQL - made all 'weight' calculating SQL expressions compatible with both databases, and made some GROUP BY queries more explicit about the fields they are selecting, for the same reason. 2009-03-04 15:32:26 +00:00
Sarven Capadisli
753b699916 Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x 2009-03-04 05:15:41 +00:00
Sarven Capadisli
dcdf47cff2 Avatar crop fix for shrinking/stretching of images when user doesn't
scale it with the Jcrop tool (but hits Crop). This will use the lower
value from width/height.
2009-03-04 05:11:18 +00:00
CiaranG
35677336de Catch bad replyto IDs before saving a new notice to avoid a constraint violation. This happens, for example, when posting for the first time on a fresh install 2009-03-03 21:33:52 +00:00
Evan Prodromou
fc44c9a7f4 Merge branch '0.7.x' into 0.8.x 2009-02-28 21:11:16 -08:00
Evan Prodromou
02ba71b0f1 start conversation action 2009-02-28 15:12:31 -08:00
Adrian Lang
bdb8c12d97 Completely refactored noticesearch list, now using subclassing for highlighting. Fixes #1240 and probably other bugs. 2009-02-27 15:43:38 -08:00
Adrian Lang
d005b37071 Fixes #1241: in-reply-to links were broken due to copy and paste error (Variable name was wrong). 2009-02-27 15:43:10 -08:00
Adrian Lang
210647a56c Fix replyto parameter in newnotice 2009-02-27 15:41:47 -08:00
Adrian Lang
a90a8da5c3 Broadcast profile via OMB after avatar change. 2009-02-27 15:41:23 -08:00
Adrian Lang
d4b6e7266a Correctly handle avatars at updateProfile 2009-02-27 15:39:42 -08:00
Adrian Lang
616fd16bc5 Auth_Yadis_Yadis::PlainHTTPFetcher expects plain arrays, not hashes. 2009-02-27 15:39:28 -08:00
Adrian Lang
89197210cf Fixes #1067: Avatar stretched on authorize remote subscription page. The img tag used a wrong class which had a width: 100% applied. 2009-02-27 15:39:10 -08:00
Evan Prodromou
2bf5b23016 fix notice in register 2009-02-26 13:36:10 -08:00
Evan Prodromou
8c3fe83c64 Make allrss.php work with phpcs 2009-02-23 13:27:22 -08:00
Zach Copley
cab322d21b Ticket #1108 - Added 'social graph' methods to the API 2009-02-22 20:04:47 -08:00
Zach Copley
8e0508dad3 Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x 2009-02-22 17:03:41 -08:00
Zach Copley
cdab8d55a9 Ticket #925 - make verify_credentials return 'Authorized' if no return type specified 2009-02-22 17:01:41 -08:00
Evan Prodromou
3a999af4d9 Change common_local_url() to take 4 arguments
I changed common_local_url() to take an additional optional argument
-- for query parameters. Being persnickety, I made it the third of
four, and moved the last one ($fragment) down a slot. That required
changing a couple of calls.
2009-02-20 17:30:09 -05:00
Evan Prodromou
12636d9fb1 don't use SUP in group rss 2009-02-20 17:14:13 -05:00
Evan Prodromou
4aa9b95f51 use return value of common_check_user() in login.php 2009-02-20 16:58:19 -05:00
Leslie Michael Orchard
9a0e71f9bf Fixing a bunch of undefined variable warnings in OpenID signup process 2009-02-20 16:37:59 -05:00
Evan Prodromou
5ec5a22dc7 make tagother work with router 2009-02-20 10:04:28 -05:00
Evan Prodromou
c0497d28f4 Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x 2009-02-20 09:54:50 -05:00
Evan Prodromou
a0ddbecfbc Merge branch '0.7.x' of evan@dev.controlyourself.ca:/var/www/evan into 0.7.x 2009-02-20 09:54:17 -05:00
Zach Copley
28e1c163e3 Open the /api/laconica/config.format API method so clients can determine whether a site is "private". 2009-02-18 15:33:52 -08:00
Evan Prodromou
d8b6762e6d move peoplesearchresults to its own module 2009-02-18 09:35:59 -05:00
Meitar Moscovitz
4327ae19d4 Fixes ticket:1053; removes spacing between hash and tag on profile page. 2009-02-17 18:37:02 +11:00
Evan Prodromou
b727e8be33 Set @-message notification options in email settings
Set the @-message notification options in email settings.
2009-02-16 18:45:05 -05:00
Evan Prodromou
4ad5d55ecf Add events for filtering and logging new notices 2009-02-13 10:52:26 -05:00
Zach Copley
47e595b092 Merge branch 'queuehandlers' into 0.7.x 2009-02-12 14:41:27 -08:00
Evan Prodromou
3b5fd8fb6b Revert "Code to handle PEAR_Errors raised by DB_DataObject that are bubbling"
This reverts commit 9f035e2847.

It's a lot of complicated stuff, and the global handler probably does
fine.
2009-02-12 16:05:37 -05:00
Evan Prodromou
b09eb06dae Revert "Just discovered the PEAR_Error handling function in index.php. Duh."
This reverts commit 616bdd43a9.

Kind of a long hard way to deal with a simple situation, so I'd prefer
to just use the global handler.
2009-02-12 16:04:43 -05:00
Zach Copley
986068d6e7 Merge branch '0.7.x' into queuehandlers 2009-02-11 23:07:49 -08:00
Zach Copley
616bdd43a9 Just discovered the PEAR_Error handling function in index.php. Duh.
Renamed the Action functions to throw an exception like it. I still
think it probably makes sense to have the callback defined in both
places for finer control.
2009-02-11 22:08:20 -08:00
Zach Copley
9f035e2847 Code to handle PEAR_Errors raised by DB_DataObject that are bubbling
up, but are actually expected and can safely be ignored.
2009-02-11 21:41:56 -08:00
Zach Copley
7155cf813d Move/reorg Twitter broadcast code to lib/twitter.php in prep for
making a twitterqueuehandler.
2009-02-11 17:46:53 -08:00
Sarven Capadisli
012288bdf6 Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x 2009-02-11 16:53:01 +00:00
Sarven Capadisli
fc293545be Minor. Changed from @class location to label 2009-02-11 16:50:07 +00:00
Evan Prodromou
22b10399aa Unify feeds definition in actions
I got a little sick of trying to keep the export data and <head> links
synched in actions, so I made a common method, getFeeds(), which gets
the feeds for both. It returns an array of Feed objects, which know
about what their mime type is, title, location, all that jazz.

I changed the FeedList class so it handles the new Feed objects
instead of the old array of data.

I changed all the actions that show feeds (I think...) so that they
now use getFeeds() for all their feed needs.
2009-02-11 11:37:50 -05:00
Evan Prodromou
ad65c447d5 fix Atom link, add Atom and RSS 2.0 to <head> 2009-02-11 10:35:15 -05:00
Meitar Moscovitz
2fb8c58c84 Merge branch 'dev-0.7.x' into link-rel-paginate 2009-02-12 02:27:13 +11:00
Evan Prodromou
27e23f2dd3 Merge branch 'sgmurphy-clone/0.7.x' into 0.7.x 2009-02-11 10:11:26 -05:00
Evan Prodromou
26b0bc3aab Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x 2009-02-11 09:54:23 -05:00
Evan Prodromou
1a7337f2fd Moved /doc/ to /doc-src/
Moved the doc/ dir to /doc-src/ so that the actual
markdown files aren't substituted for the docs.
2009-02-10 22:33:57 -05:00
Robin Millette
7763f804ca trac #233 Explicitely show we have an rss feed for notice searches. 2009-02-10 22:04:47 +00:00
Meitar Moscovitz
b240a17194 Beginning to refactor document relationship links to reduce common code.
My attempts here are to mimic the `pagination()` method shared by
actions. I'm tentatively adding the `$count` property to actions so that
we can query the number of notices ''being displayed'' per page prior to
calling the actual `pagination()` method itself, since document
relationship `<link>` elements need to be output inside of `showHead()`,
before `showContent()`, which is where `pagination()` is, gets called.
2009-02-10 20:25:44 +11:00
Meitar Moscovitz
3585012380 Merge branch 'dev-0.7.x' into link-rel-paginate 2009-02-10 18:28:12 +11:00
Sean Murphy
d8ed013612 Merge commit 'upstream/0.7.x' into 0.7.x 2009-02-09 20:18:27 -05:00
Sean Murphy
55fcc150fe Fixed #1025: Delete avatar option. 2009-02-09 20:17:56 -05:00
Evan Prodromou
47a5d2b7f0 Fixed remote subscribe avatar problems
Had some Avatar file-copying issues; seem to be fixed.
2009-02-09 23:13:11 +00:00
Meitar Moscovitz
8cb3035b89 Merge branch 'dev-0.7.x' into link-rel-paginate 2009-02-10 05:05:04 +11:00
Evan Prodromou
c87a0c3f58 Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x 2009-02-09 12:09:44 -05:00
Evan Prodromou
9b7c57d094 whitespace and formatting in showstream.php 2009-02-09 12:07:21 -05:00
Evan Prodromou
73b8de7c4c Merge branch 'sgmurphy-clone/0.7.x' into 0.7.x 2009-02-09 12:03:45 -05:00
Robin Millette
43888b5239 trac #1160 fix dropdown xmloutput function for the selected attribute and fix newmessage auto-selected dropdown. 2009-02-09 15:35:38 +00:00
Zach Copley
c604fa8d37 Ticket #1094 Facebook app invites page was failing if no friends had added the app yet 2009-02-08 23:07:56 +00:00
Zach Copley
00fda7ae5f Minor update to the way Facebook app handles listing of friends you've invited. 2009-02-08 21:58:25 +00:00
Zach Copley
dec0461d5f Trac #1159: Fix peopletag pagination. Also phpcs cleanup. 2009-02-08 13:25:48 -08:00
Meitar Moscovitz
6e2f045837 Add machine-readable pagination using HTML4.01 <link rel="next">, etc.
These extra `<link>` elements only appear on pages where pagination
makes sense. They trigger functionality in some user agents, such as
Opera's Navigation Bar for more easily navigating forward and backwards
across a paged set of notices, messages, or group lists, etc.
2009-02-09 00:02:51 +11:00
Robin Millette
c2905085c1 trac #1155 ++ replace strlen with mb_strlen for all utf8 strings. 2009-02-07 19:33:18 +00:00
Sean Murphy
a3d5e00f64 Merge commit 'upstream/0.7.x' into 0.7.x
Conflicts:

	actions/showstream.php
2009-02-07 11:02:10 -05:00
Sean Murphy
d6245dca63 Fixed #1048: Edit avatar link on profile page. 2009-02-06 18:36:34 -05:00
Evan Prodromou
26053c1868 Make adding and removing an incoming email in SMS settings
Fixes Bug#1036.
2009-02-06 15:22:48 -05:00
Meitar Moscovitz
8ec312043f Add a link to the group search page from a user's own group list.
I've seen a request or two pop up for this on the Laconica group on
Identica, and I'd personally like there to be a link to the search
page from my own groups listing, as I often find myself looking for
one and end up at my browser's address bar.
2009-02-07 04:03:25 +11:00
Evan Prodromou
bb2cb65c2a Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x 2009-02-06 03:56:15 -05:00
Evan Prodromou
fc094e0cf4 fix formatting of new Avatar:: calls 2009-02-06 03:55:53 -05:00
Evan Prodromou
343cd6f205 Move common_avatar_* functions to Avatar
Moved the common_avatar_* functions to the Avatar class. Typically
either as methods on the object or as static methods. Replaced all the
uses of the functions in other modules.
2009-02-06 03:55:48 -05:00
Sarven Capadisli
a6cf3a2fb3 Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x 2009-02-06 06:28:14 +00:00
Sarven Capadisli
ac23321a40 Added primary and secondary form actions. Fixed markup for
form_notice_delete
2009-02-06 06:27:04 +00:00
Zach Copley
d51be320ca Removed debugging statements I accidentally left in deletenotice.php 2009-02-05 16:21:23 -08:00
Zach Copley
ab82978b2d Trac #894 and #1013 - fixed bad redirects after delete notice 2009-02-05 16:16:10 -08:00
Evan Prodromou
8775e79e35 Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x 2009-02-05 16:35:19 -05:00
Evan Prodromou
444c794480 Don't show stretchy-box on avatar if not cropping 2009-02-05 16:34:38 -05:00
Evan Prodromou
99d520b351 Two different functions for file size
Made two different functions for file size in ImageFile; one uses the
other.

Also, use sprintf() for gettext msgs.
2009-02-05 16:32:58 -05:00
Sarven Capadisli
02eecb4f07 Minor markup consistency 2009-02-05 21:26:06 +00:00
Evan Prodromou
383e6c730d Merge branch '0.7.x' of git://gitorious.org/laconica/sgmurphy-clone into sgmurphy-clone/0.7.x 2009-02-05 16:02:19 -05:00
Sean Murphy
d4bdb2dc19 Better fix for displaying max file size. 2009-02-05 15:01:44 -05:00
Sean Murphy
746a5d7507 Fixed #905: Presenting image size limit to user. 2009-02-05 14:11:50 -05:00
Robin Millette
9febe8ce39 trac #1142 fix tag rss 2009-02-05 18:10:47 +00:00
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
Adrian Lang
68a3139d0b Fix #81: Profile and personal shows „you“ instead of username when looking at own profile / personal. While doing so I fixed a wrong gettext usage were the result was not sprintf'd, but concat'd. 2009-02-05 11:53:32 -05:00
Evan Prodromou
43feee783b Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x 2009-02-05 11:47:47 -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
4ced74dc91 Fixed #1140; Login form session token not set. 2009-02-05 10:17:19 -05:00
Sarven Capadisli
e5b075b912 Matching Facebook app UI to identi.ca. Fixed tabs, add to profile,
widths, font-size, and some HTML markup.
2009-02-05 04:54:42 +00:00
Sean Murphy
7e975b17c5 Fixed #1134; Consolidated image scaling functions. 2009-02-04 19:32:15 -05:00
Zach Copley
68152dcf3a Facebook app - reorganized some stuff; better HTML output 2009-02-04 22:54:07 +00:00
Evan Prodromou
a97f8f6a43 merge from dev/0.7.x 2009-02-04 15:40:36 -05:00
Evan Prodromou
2bd52059db take out redundant code from login 2009-02-04 15:38:26 -05:00
Zach Copley
df41b1307f Removed erroneous comments referring to old common_notice_form() func 2009-02-04 11:55:22 -08: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
92c6034b25 Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x 2009-02-04 07:26:14 -05:00
Evan Prodromou
355d438cee Merge branch '0.7.x' of git://gitorious.org/laconica/meitar into meitar/0.7.x 2009-02-04 07:25:36 -05:00
Zach Copley
c16ddd6775 trac1095 Profile page had bad alternate links for RSS and Atom feeds 2009-02-03 16:31:41 -08:00
Sarven Capadisli
32b1bb381a Fixed ajaxErrorMsg(). Using startHTML() instead of common_start_html() 2009-02-03 21:46:09 +00:00
Evan Prodromou
aafb73755e Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x 2009-02-03 15:13:06 -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
Zach Copley
dcf18e9694 trac1104 Destroy method was dying because it was still calling deprecated common_dequeue_notice() func 2009-02-03 11:23:30 -08:00
Meitar Moscovitz
01b6aca078 Fix PHP warnings when user avatar crop controls aren'tn touched. 2009-02-04 03:34:17 +11:00
Evan Prodromou
ab16bb876b Merge branch 'master' of git@gitorious.org:laconica/dev into 0.7.x 2009-02-02 16:46:51 -05:00
Robin Millette
3f0eb90128 removed extraneous argument in startHTML calls 2009-02-02 20:47:57 +00:00
Sarven Capadisli
5f004c0158 Added "Edit" entity_action.
Updated theme files.
2009-02-02 16:33:47 +00:00
Sarven Capadisli
55c99d0018 Using startXML() instead of deprecated common_start_xml() 2009-02-01 23:43:07 +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
Zach Copley
153208aaa6 trac750 Add footer to Facebook app's login page 2009-01-30 00:07:56 +00:00
Zach Copley
733b3543d0 Put license text inside label to align it with "Remember me" label above it. Improve sentence. 2009-01-29 13:18:10 -08:00
Meitar Moscovitz
5543cd21c6 Fix problems when crop controls not touched 2009-01-29 14:56:22 -05:00
Evan Prodromou
440d7d17b0 wrong tags in tagother 2009-01-29 08:49:19 -05:00
Evan Prodromou
746880e49e Merge branch 'master' of evan@dev.controlyourself.ca:/var/www/trunk 2009-01-29 08:37:51 -05:00
Evan Prodromou
b6fbb9462c proper pagination for subs and members 2009-01-29 08:37:40 -05:00
Zach Copley
c7d06519f0 trac750 update Facebook status when posting to Identi.ca from Facebook 2009-01-29 05:58:27 +00:00
Evan Prodromou
de47c827b7 better upload of group logos 2009-01-28 23:00:01 -05:00
Meitar Moscovitz
e37e9c2084 Fix password settings 2009-01-28 08:55:03 -05:00
Zach Copley
745f733469 Make favorites RSS actually work (uiredesign) 2009-01-27 15:27:04 -08:00
Zach Copley
4a176eadcb Have "Current verified Twitter account" to use the right CSS class: form_note 2009-01-27 14:51:13 -08:00
Zach Copley
a5a1e15cba trac975 - Fixed title for Twitter settings page (thanks meitar) 2009-01-27 14:35:25 -08:00
Sarven Capadisli
f9403ae99a Keeping HTML consistent throughout the site. 2009-01-27 06:21:36 +00:00
Sarven Capadisli
e20c3e2b7c Entered CC3.0 anchor text 2009-01-27 02:37:41 +00:00
Zach Copley
1c60afb940 trac750 140 character countdown for FB app 2009-01-27 01:55:36 +00:00
Evan Prodromou
7953192aa0 fix profile in block form 2009-01-26 17:15:32 +01:00
Evan Prodromou
91e63866fb move block form 2009-01-26 17:14:08 +01:00
Evan Prodromou
8d95151f7a fix license link in registration page 2009-01-26 16:57:39 +01:00
Evan Prodromou
f3db32d151 Fix direct addressing of messages 2009-01-26 15:45:54 +01:00
Adrian Lang
a80a536e41 Fix canonical tags in notice and in URLs 2009-01-26 15:03:38 +01:00
Evan Prodromou
12b9d4346f Warn not-logged-in users when they try to send a message 2009-01-26 14:29:31 +01:00
Adrian Lang
d2521786f0 Cancel -> Reject in remote subscribe 2009-01-26 14:20:19 +01:00
Evan Prodromou
0e9cdf5859 Merge branch 'master' of evan@dev.controlyourself.ca:/var/www/trunk 2009-01-26 14:14:49 +01:00
Evan Prodromou
3e0e7ddb2c Make the newmessage page better with new framework 2009-01-26 14:05:59 +01:00
Evan Prodromou
80e04a8d9f Show a new message form on message/new 2009-01-26 13:46:04 +01:00
Zach Copley
55a4fac6a6 trac750 Better permissions workflow and styling hooks 2009-01-26 06:31:25 +00:00
Robin Millette
89a668344f added group rss action 2009-01-25 19:16:19 +00:00
Evan Prodromou
f06d5eff10 Merge branch 'master' of evan@dev.controlyourself.ca:/var/www/trunk 2009-01-25 18:07:55 +01:00
Zach Copley
688d38b101 Fixed broken SQL for people tags view 2009-01-25 02:03:49 -08: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
1f4edd70cb whitespace in deletenotice.php 2009-01-24 19:12:47 +01:00
Evan Prodromou
4c9f3297f2 fix title on replies 2009-01-24 18:28:47 +01:00
Zach Copley
40928cd27a Wow, let's try this once more. peopletag.php should be converted to new uiredesign now 2009-01-24 03:21:39 -08:00
Zach Copley
25de8fa06d Okay, let's try that again. uiconversion of peopletag.php 2009-01-24 03:06:46 -08:00
Zach Copley
7a45489f09 converted peopletag.php to new uiredesign; css still looks bad 2009-01-24 02:44:32 -08:00
Evan Prodromou
a611408dca Revert "try to fix groups with a new qry"
This reverts commit 8f19855cd0.
2009-01-24 11:05:38 +01:00
Evan Prodromou
8f19855cd0 try to fix groups with a new qry 2009-01-24 10:53:28 +01:00
sarven
8e4f985e45 Minor 2009-01-24 03:45:44 +00:00
sarven
08030196ca new group markup in usergroups matching groups 2009-01-24 03:23:40 +00:00
sarven
0cdaf3e155 Invitation markup and style 2009-01-24 03:18:34 +00:00
sarven
4980f654a8 Notice search markup and style 2009-01-24 03:14:27 +00:00
sarven
18eb40c988 Search form markup and style 2009-01-24 00:58:12 +00:00
sarven
7fa5e22438 Twitter settings styles 2009-01-23 11:42:38 +00:00
sarven
1e5ad33f72 Matching it to avatar layout 2009-01-23 10:47:11 +00:00
Evan Prodromou
11cb85820d Merge branch 'master' of evan@dev.controlyourself.ca:/var/www/trunk 2009-01-23 10:37:27 +01:00
Evan Prodromou
e566b8929b These aren't readonly 2009-01-23 10:37:04 +01:00
Evan Prodromou
32c9c03cdc remove top posters from public 2009-01-23 10:36:16 +01:00
Zach Copley
0ef33663ce Merge branch 'master' of ssh://zach@dev.controlyourself.ca/var/www/trunk 2009-01-23 01:20:00 -08:00
Zach Copley
b13374faa5 Bring the Twitter compatible API inline with new uiredesign stuff 2009-01-23 01:19:19 -08:00
Robin Millette
4c7f3faf92 mark nudge action read-only 2009-01-23 09:15:57 +00:00
Robin Millette
0f6bc2190a mark a bunch of actions read-only 2009-01-23 09:15:15 +00:00
Evan Prodromou
25ff381486 Merge branch 'master' of evan@dev.controlyourself.ca:/var/www/trunk 2009-01-23 09:52:46 +01:00
sarven
0aa2cb35f1 Merge branch 'master' of ../trunk 2009-01-23 08:52:24 +00:00
sarven
6c9bbdb561 openid markup and style 2009-01-23 08:52:04 +00:00
Evan Prodromou
daf32e43cd usergroups is read only 2009-01-23 09:51:10 +01:00
Evan Prodromou
cdd2032540 groups are readonly 2009-01-23 09:49:38 +01:00
Evan Prodromou
5f89b88650 showstream is readonly 2009-01-23 09:45:48 +01:00
Evan Prodromou
9c5ab86d0e Merge branch 'master' of evan@dev.controlyourself.ca:/var/www/trunk 2009-01-23 09:43:41 +01:00
Zach Copley
1305ecf4bd Merge branch 'master' of /var/www/trunk 2009-01-23 08:43:34 +00:00
Zach Copley
76cf3cc3d0 trac750 Fixed bad url that made the 'skip' step when adding status_update permission fail 2009-01-23 08:42:40 +00:00
Evan Prodromou
ad929011a3 public is readonly 2009-01-23 09:42:23 +01:00
Evan Prodromou
4e5be119d3 Merge branch 'master' of evan@dev.controlyourself.ca:/var/www/trunk 2009-01-23 09:17:51 +01:00
Zach Copley
85321cede0 Fix for Twitter bridge bug introduced by uiredesign merge 2009-01-23 00:11:05 -08:00
Evan Prodromou
e7d5310a2f Merge branch 'master' of evan@dev.controlyourself.ca:/var/www/trunk 2009-01-23 09:01:06 +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
Robin Millette
aa100884fb Merge branch 'master' of /var/www/trunk 2009-01-23 07:51:02 +00:00
Robin Millette
965d4db265 Group search 2009-01-23 07:50:55 +00:00
Evan Prodromou
750ed7899f Merge branch 'master' of evan@dev.controlyourself.ca:/var/www/trunk 2009-01-23 08:15:59 +01:00
Evan Prodromou
50ec1cc26e Upload logos for groups 2009-01-23 08:15:29 +01:00
Zach Copley
78bf361291 trac750 fix href for theme stylesheet 2009-01-23 07:09:00 +00:00
sarven
c97980b145 Missing closing li 2009-01-23 06:14:56 +00:00
Zach Copley
94b926be65 trac750 small fix to FBJS redirect 2009-01-23 06:02:41 +00:00
Zach Copley
3af566d1ec Merge branch 'master' of /var/www/trunk 2009-01-23 05:59:35 +00:00
Robin Millette
171d89aab7 Merge branch 'master' of /var/www/trunk 2009-01-23 05:57:15 +00:00
Robin Millette
fbd1cf4dfa use new error actions classes to display error 2009-01-23 05:57:08 +00:00
Evan Prodromou
277a6e984c Merge branch 'master' of evan@dev.controlyourself.ca:/var/www/trunk 2009-01-23 06:47:43 +01:00
Zach Copley
36d55526d3 trac750 fix for crash when a user logs in and hasn't already posted a notice 2009-01-23 05:47:34 +00:00
Zach Copley
df25b5f5f5 Merge branch 'master' of /var/www/trunk 2009-01-23 05:37:45 +00:00
Zach Copley
240231a8bd trac750 linked in stylesheets for login and permissions prompt screens 2009-01-23 05:37:21 +00:00
sarven
d98f8c646a Merge branch 'master' of ../trunk 2009-01-23 05:24:00 +00:00
sarven
500ed2f5eb Cleanup 2009-01-23 05:23:28 +00:00
Evan Prodromou
9dc5d8d0f6 Made avatar upload a two-stage process; first upload, then crop 2009-01-23 06:16:55 +01:00
Robin Millette
c628bbb192 make avatar bigger on single notice pages 2009-01-23 05:11:04 +00:00
Robin Millette
998e6044e5 uiredesign 2009-01-23 04:29:21 +00:00
Robin Millette
e59b8c8758 Merge branch 'master' of /var/www/trunk 2009-01-23 04:10:57 +00:00
Robin Millette
4c58e6b312 uiredesign 2009-01-23 04:10:49 +00:00
sarven
112dd08c62 anon_notice 2009-01-23 04:10:40 +00:00
Robin Millette
3f328256bd uiredesign 2009-01-23 04:07:52 +00:00
Robin Millette
11b99b8144 Merge branch 'master' of /var/www/trunk 2009-01-23 04:03:11 +00:00
Robin Millette
1e1a24d8c1 small bugfix, it's prepare() not initialize() 2009-01-23 04:03:04 +00:00
sarven
961c5af3ce Anonymous notice 2009-01-23 03:47:32 +00:00
Robin Millette
c8b606f17e Merge branch 'master' of /var/www/trunk 2009-01-23 03:32:12 +00:00
Robin Millette
63c5e34bed uiredesign 2009-01-23 03:32:06 +00:00
Evan Prodromou
13bd15b0b5 p -> div for markup wrapper 2009-01-23 04:31:50 +01:00
Evan Prodromou
ed09eece28 Merge branch 'master' of evan@dev.controlyourself.ca:/var/www/trunk 2009-01-23 04:21:08 +01:00
Evan Prodromou
3c8f41deb0 Anonymous message for group page 2009-01-23 04:19:03 +01:00
Zach Copley
12d923df11 Merge branch 'master' of /var/www/trunk 2009-01-23 03:16:31 +00:00
Zach Copley
adf77944e8 trac750 Facebook app proper integrated into new uiredesign 2009-01-23 03:16:03 +00:00
Evan Prodromou
b09a58e8dc Add anonymous message for user pages 2009-01-23 04:15:03 +01:00
Evan Prodromou
59e386db45 Add an anonymous message for the public page 2009-01-23 04:06:03 +01:00
Evan Prodromou
ae0f2009d5 Groups list by members 2009-01-23 03:07:03 +01:00
Evan Prodromou
6949cefa7f add groups-by-posts section 2009-01-23 03:03:17 +01:00
Evan Prodromou
8942e3a445 Add an action to show the list of the latest groups 2009-01-23 03:00:51 +01:00
Evan Prodromou
b9b6e491f4 Don't double-define GROUPS_PER_PAGE 2009-01-23 02:57:48 +01:00
Evan Prodromou
0ae4dff237 Merge branch 'master' of evan@dev.controlyourself.ca:/var/www/trunk 2009-01-23 02:25:32 +01:00
Evan Prodromou
673ec133d2 Add a link to add a new group to user groups list 2009-01-23 02:25:09 +01:00
Robin Millette
56622ef804 Merge branch 'master' of /var/www/trunk 2009-01-23 01:22:25 +00:00
Robin Millette
bee32a6cb0 uiredesign 2009-01-23 01:22:17 +00:00
sarven
0711d45ef3 Merge branch 'master' of ../trunk 2009-01-23 01:20:48 +00:00
sarven
135f00c51b tag user profile and form markup and style 2009-01-23 01:20:20 +00:00
Evan Prodromou
9a4333f5f3 Merge branch 'master' of evan@dev.controlyourself.ca:/var/www/trunk 2009-01-23 02:06:45 +01:00
Evan Prodromou
7bbbd433e8 Some whitespace edits in subedit, and tested that it works 2009-01-23 02:04:13 +01:00
Robin Millette
8a65c5175c Merge branch 'master' of /var/www/trunk 2009-01-23 01:01:01 +00:00
Robin Millette
4a4efc3b0a uiredesign 2009-01-23 01:00:57 +00:00
Evan Prodromou
1132e66f84 Fix over-zealous un-underscoring in userauthorization 2009-01-23 01:41:00 +01:00
Evan Prodromou
120ed87e72 Fix start/stop xml in xrds 2009-01-23 01:39:25 +01:00
Evan Prodromou
8228dc7ed5 Merge branch 'master' of evan@dev.controlyourself.ca:/var/www/trunk 2009-01-23 01:35:39 +01:00
Evan Prodromou
0ecfd7a7ec Update userauthorization, strip out a lot of debug stuff 2009-01-23 01:35:05 +01:00
sarven
1200e005b1 Merge branch 'master' of ../trunk 2009-01-23 00:20:23 +00:00
sarven
2935e8c7ce Minor markup fix 2009-01-23 00:20:05 +00:00
Evan Prodromou
c21a2445aa Update remotesubscribe for new system 2009-01-23 01:16:36 +01:00
Evan Prodromou
482dcf625a Updated recoverpassword 2009-01-23 01:00:01 +01:00
Evan Prodromou
c0d7ce8a3c Updated sup 2009-01-23 00:36:24 +01:00
Evan Prodromou
cc5808cc28 Update finishopenidlogin 2009-01-23 00:30:57 +01:00
Evan Prodromou
4fe5bd9cf1 First steps to getting OpenID working again 2009-01-22 23:17:08 +00:00
Evan Prodromou
88891f8ebd Updated foaf file 2009-01-22 23:08:30 +00:00
Evan Prodromou
4d0ff70109 Add attributes for invite 2009-01-22 22:59:18 +00:00
Evan Prodromou
2fe16b39ba Add local nav to invite 2009-01-22 22:53:05 +00:00
Evan Prodromou
03ce6aee2e convert invite 2009-01-22 22:51:37 +00:00
Evan Prodromou
d6879bfe0c Debug some of the subscriptions+tags problems 2009-01-22 22:38:10 +00:00
Evan Prodromou
04d498784f convert tagother action 2009-01-22 22:02:39 +00:00
Evan Prodromou
10241a6d83 Added featured users to public timeline 2009-01-22 21:42:34 +00:00
Evan Prodromou
058f9fa1eb Add group tag cloud to group 2009-01-22 21:15:21 +00:00
Evan Prodromou
4e7192579a Add personal tag cloud 2009-01-22 20:46:37 +00:00
Evan Prodromou
248fd763bd Add groups by notice to public 2009-01-22 20:17:32 +00:00
Evan Prodromou
b6dad052bd Add a popular notices section to the public page 2009-01-22 19:48:35 +00:00
Evan Prodromou
e9b3e4e7a8 Merge branch 'master' of evan@dev.controlyourself.ca:/var/www/trunk 2009-01-22 20:10:42 +01:00
Evan Prodromou
94d3a4b22c Add top posters section to public page 2009-01-22 20:08:16 +01:00
Evan Prodromou
55037403c5 Use cached query results for favorited. Might cause pagination issues. 2009-01-22 19:14:18 +01:00
sarven
ead1384650 .profile form.form_subscriptions_edit style 2009-01-22 16:57:37 +00:00
Evan Prodromou
318b81c027 Merge branch 'master' of evan@dev.controlyourself.ca:/var/www/trunk 2009-01-22 17:19:54 +01:00
Evan Prodromou
0df954aa89 Make subscribers work 2009-01-22 17:19:27 +01:00
Evan Prodromou
01e7859a81 Remove common code from Subscriptions, make tags link visible 2009-01-22 17:12:23 +01:00
Evan Prodromou
30dac77caa add nav menu to usergroups 2009-01-22 17:06:38 +01:00
Robin Millette
3db0778914 uiredesign + phpdocs 2009-01-22 15:37:58 +00:00
Robin Millette
b39d4788b9 uiredesign + phpdocs 2009-01-22 15:37:35 +00:00
Robin Millette
dfb21679e2 uiredesign + phpdocs 2009-01-22 15:30:58 +00:00
Robin Millette
cb2e374bc2 uiredesign + phpdocs 2009-01-22 15:20:58 +00:00
Evan Prodromou
a30d405328 Update subscriptions action 2009-01-22 16:12:00 +01:00
Evan Prodromou
a2a2dd88b5 Merge branch 'master' of evan@dev.controlyourself.ca:/var/www/trunk 2009-01-22 12:35:25 +01:00
Evan Prodromou
6a3204d08e Extract image management code to a helper function 2009-01-22 12:35:09 +01:00
Zach Copley
8990aaebb4 New HTTP error message classes for uiredesign 2009-01-22 03:13:11 -08:00
Robin Millette
914b097910 uiredesign + phpdocs 2009-01-22 09:54:08 +00:00
Robin Millette
a1cb64679b uiredesign + phpdocs 2009-01-22 09:39:53 +00:00
Robin Millette
f871f52624 Merge branch 'master' of /var/www/trunk 2009-01-22 08:02:40 +00:00
Robin Millette
e272adb321 fixed a few bugs and logic problems in groups 2009-01-22 08:01:40 +00:00
Evan Prodromou
904d04993c Fix error in prepare() for checking group membership 2009-01-22 01:53:44 -05:00
Evan Prodromou
0a81b94a92 Doc comment in showgroup 2009-01-22 01:50:39 -05:00
sarven
a330bdac62 Moved nudge response from util.php to nudge.php
Adjusted some CSS
2009-01-22 06:33:38 +00:00
Robin Millette
c20d0612bf uiredesign + phpdocs 2009-01-22 06:02:23 +00:00
Robin Millette
c474209f35 uiredesign + phpdocs 2009-01-22 05:28:09 +00:00
Robin Millette
2272b4ab1d uiredesign + phpdocs 2009-01-22 05:24:32 +00:00
Robin Millette
c31e77e4bc uiredesign + phpdocs 2009-01-22 05:20:29 +00:00
Robin Millette
05754da7bc uiredesign + phpdocs 2009-01-22 05:14:06 +00:00
Robin Millette
02cbcc1b0f uiredesign + phpdocs 2009-01-22 05:11:19 +00:00
Robin Millette
f06c5f7873 Merge branch 'master' of /var/www/trunk 2009-01-22 05:08:28 +00:00
Robin Millette
e38f6165b6 uiredesign + phpdocs 2009-01-22 05:08:18 +00:00
Zach Copley
570a7c64b1 Merge branch 'master' of /var/www/trunk 2009-01-22 04:26:57 +00:00
Zach Copley
1a941d03fd Added some CSS classes for styling doc pages differently 2009-01-22 04:26:15 +00:00
sarven
07b52e19be Minor cleanup for future groups_related 2009-01-22 00:12:16 +00:00
sarven
a57f12b06c selector name cleanup 2009-01-22 00:04:13 +00:00
sarven
d72706ce9d Changed to @class entity_profile from @id user_profile. 2009-01-21 23:33:52 +00:00
sarven
4b42c35269 General markup and style cleanup 2009-01-21 22:44:27 +00:00
sarven
41f74218f2 Profile avatar settings 2009-01-21 20:33:37 +00:00
sarven
ac1cc954ae form_password markup and style 2009-01-21 19:56:18 +00:00
sarven
0b0f25ce93 Public tagcloud and tag cloud styles 2009-01-21 18:35:45 +00:00
Evan Prodromou
3260106537 list of groups to profile page 2009-01-21 13:33:06 -05:00
Evan Prodromou
f980089dd4 change showgroup to use profileminillist 2009-01-21 13:12:26 -05:00
Evan Prodromou
ed9cb94ff3 fix sub/unsub buttons, profileminilist for sections 2009-01-21 13:03:33 -05:00
Evan Prodromou
26bc168c93 An action for showing groups a user is in 2009-01-21 12:19:47 -05:00
Evan Prodromou
0824bb2e1d Merge branch 'master' into groups 2009-01-21 11:52:06 -05:00
Evan Prodromou
4491e82762 Add actions for joining or leaving a group, and fixup JS to match 2009-01-21 11:47:23 -05:00
Evan Prodromou
dcf973ab46 fix edit group prepare, check for admin 2009-01-21 10:20:13 -05:00
Evan Prodromou
57a9e33b3c Add members mini-icons to group page 2009-01-21 10:15:48 -05:00
Evan Prodromou
79db73d4ac remove admin link from group page 2009-01-21 09:57:58 -05:00
Evan Prodromou
1499a5e048 Add tabset to group and admin tabs 2009-01-21 09:55:44 -05:00
Evan Prodromou
5d162aeaef Show members of a group 2009-01-21 09:52:21 -05:00
Evan Prodromou
7076cda746 add edit group action 2009-01-21 09:06:40 -05:00
Evan Prodromou
9dafcce015 add new group action 2009-01-21 09:06:18 -05:00
Evan Prodromou
056649c331 Mark showgroup as readonly action 2009-01-21 09:04:54 -05:00
Evan Prodromou
a7ea08b73a Add group by id for group permalinks 2009-01-21 02:55:55 -05:00
Evan Prodromou
ee4e87f318 Move showgroup action to Group category 2009-01-21 02:55:37 -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
sarven
92e2f3babc Added @title to user_action inputs and anchor and form legends 2009-01-21 07:14:43 +00:00
sarven
27b627c094 Made user_actions styles more consistent 2009-01-21 06:54:17 +00:00
sarven
f90bd303af Merge branch 'master' of ../trunk 2009-01-21 06:32:49 +00:00
sarven
6c78421298 Moved common_profile_new_message_nudge() to showstream.php 2009-01-21 06:31:53 +00:00
Zach Copley
047c87d1cc Converted DeleteAction and DeletenoticeAction to new uiredesign zeitgeist 2009-01-20 22:20:17 -08:00
sarven
f76b565c16 Merge branch 'master' of ../trunk 2009-01-21 05:26:56 +00:00
sarven
db4993970e (Un)subscribe AJAX forms 2009-01-21 04:08:05 +00:00
Evan Prodromou
724abe9ea9 Remove "finishimmediate" action 2009-01-21 03:59:47 +00:00
Evan Prodromou
afde3c62d8 Remove deleteprofile.php 2009-01-21 03:59:30 +00:00
Zach Copley
d6da9779f7 Merge branch 'master' of ssh://zach@dev.controlyourself.ca/var/www/trunk 2009-01-20 19:18:02 -08:00
Zach Copley
61850ceb55 Converted ShowmessageAction to work with new uiredesign 2009-01-20 19:16:52 -08:00
sarven
e9b9795eeb (dis)favor form method call fix 2009-01-21 02:52:16 +00:00
Zach Copley
624ca93c9d Converted direct messaging actions to new uiredesign 2009-01-20 17:49:47 -08:00
sarven
f51984175a Matching markup for tags 2009-01-21 01:22:08 +00:00
Robin Millette
560374e170 uiredesign + phpdocs 2009-01-21 00:07:15 +00:00
Robin Millette
592403cdc3 uiredesign + phpdocs 2009-01-21 00:06:56 +00:00
sarven
1ab0de3ddd If user has fn, then it will not link to their own profile with @class
'fn'. Only put @class 'fn' on the anchor if there is no fn.
2009-01-20 23:50:52 +00:00
sarven
bb4a6a514b user_actions form markup and styling 2009-01-20 22:36:57 +00:00
Robin Millette
1cf469e244 uiredesign + phpdocs 2009-01-20 21:31:56 +00:00
Robin Millette
cadad55379 uiredesign + phpdocs 2009-01-20 21:21:00 +00:00
Robin Millette
6e6d651b25 uiredesign + phpdocs. 2009-01-20 21:05:55 +00:00
Robin Millette
4471f62bc5 uiredesign + phpdocs 2009-01-20 20:55:16 +00:00
Robin Millette
1526432842 tiny phpdoc fixes 2009-01-20 20:44:03 +00:00
Robin Millette
5abdf8aae1 Merge branch 'master' of /var/www/trunk 2009-01-20 20:38:05 +00:00
Robin Millette
f93575bd46 uiredesign and phpdocs 2009-01-20 20:29:31 +00:00
sarven
96dc058bfa Using nickname only for uid 2009-01-20 05:58:35 +00:00
sarven
27308afe85 Added mark_hash for content (i.e., to indicate tags with the
character '#')
2009-01-20 05:11:45 +00:00
sarven
918bd84c0d Removed extra div 2009-01-20 05:06:46 +00:00
sarven
7f60558cbb User subscriptions markup 2009-01-20 05:04:41 +00:00
sarven
ec1249d3ad User statistics markup 2009-01-20 04:57:15 +00:00
sarven
8e8c580586 showPageTitle() and showPageNoticeBlock()
and using url on nickname instead of fullname
2009-01-19 23:19:05 +00:00
sarven
774fc5378b user_profile markup 2009-01-19 22:40:21 +00:00
Evan Prodromou
0b9cda03d5 Merge branch 'master' of /var/www/trunk 2009-01-19 18:22:03 +00:00