Commit Graph

2149 Commits

Author SHA1 Message Date
Evan Prodromou
b4de1d4636 favorites should show owner design 2009-07-02 08:21:41 -04:00
Zach Copley
0e78e1cc52 Show HTML for thumbnails instead of redirecting. Remove dead code. 2009-07-01 16:24:22 -07:00
Evan Prodromou
90557e9147 correctly return count of notices 2009-07-01 14:45:48 -04:00
Evan Prodromou
0057f3da81 show all the notices, not just latest 20 2009-07-01 14:45:09 -04:00
Evan Prodromou
3b6ff92495 don't redirect on local file for ajax action 2009-07-01 13:50:44 -04:00
Dan Moore
fbb7757c4b Cleaning up comments at top of favor.php. 2009-06-30 17:04:49 -07:00
Zach Copley
ed21af0d1d Merge branch 'mgrdcm-review' into 0.7.x
* mgrdcm-review:
  Cleaning up comments at top of favor.php.
2009-06-30 17:02:51 -07:00
Zach Copley
ccbc5c447d Merge commit 'jeff-themovie/small-fixes' into 0.8.x
* commit 'jeff-themovie/small-fixes':
  Fix missing max_id in API search calls
  Fix "Trying to get property of non-object" errors when a user tries to log in using an unknown nickname
  Fix "Trying to get property of non-object" errors when accessing the people search results page
  Fix "Undefined variable: cnt"
  Fix "Trying to get property of non-object" errors in groupeditform.php
  Fix "Undefined property: DisfavorAction::$id"
2009-06-30 16:25:52 -07:00
Zach Copley
b10dba2798 Merge commit 'jeff-themovie/invite-enabled' into 0.8.x
* commit 'jeff-themovie/invite-enabled':
  Adds $config['invite']['enabled'] to enable/disable invites.
2009-06-30 16:10:12 -07:00
Zach Copley
190d45cd05 Merge commit 'jeff-themovie/notice-search-no-results' into 0.8.x
* commit 'jeff-themovie/notice-search-no-results':
  Fixes the notice search RSS feeds / API results for searches that return no matches.
2009-06-30 15:38:14 -07:00
Zach Copley
c2c631d19d Merge commit 'jeff-themovie/group-rss-empty' into 0.8.x
* commit 'jeff-themovie/group-rss-empty':
  Fixes two PHP Warnings ("Invalid argument supplied for foreach() in /var/www/mmmu/lib/rssaction.php") when accessing the RSS feed of a group that has no notices.
2009-06-30 15:12:50 -07:00
Zach Copley
907b5f7b40 Merge commit 'erichelgeson/no-posts-verbage' into 0.8.x
* commit 'erichelgeson/no-posts-verbage':
  Needed the else. Tested logged in/out ; site closed/inviteonly/both
  Verbage of a closed invite only site, it shouldnt ask you to register.
2009-06-30 14:57:19 -07:00
Evan Prodromou
c5ce56b878 calculate date once for SUP 2009-06-30 11:53:50 -04:00
Evan Prodromou
4e6cd42757 conversation code changes 2009-06-30 11:50:16 -04:00
Zach Copley
c01e8c0bd1 Fixed grammar in class comment blocks 2009-06-29 17:04:09 -07:00
Zach Copley
4321e02c7b Delete orphaned background imgs. Design settings code now passes
phpcs.
2009-06-29 16:57:36 -07:00
Zach Copley
d19ffc73c2 Merge branch '0.8.x' into design_reset
* 0.8.x:
  Using max-width:480px for settings_design_background-image image
  Using role for admin indicator. Added margin-left.
2009-06-29 15:38:17 -07:00
Sarven Capadisli
1268be4f82 Using role for admin indicator. Added margin-left. 2009-06-29 22:07:16 +00:00
Zach Copley
135927e42a Allow users and groups to reset their design to system default colors 2009-06-29 14:52:38 -07:00
Evan Prodromou
5b8e40aaa9 admin indicators in groups 2009-06-29 10:29:11 -04:00
Evan Prodromou
d03b8c4276 show section with admins in sidebar of group 2009-06-29 10:22:17 -04:00
Evan Prodromou
70521d55a8 log IP for API auth errors 2009-06-27 07:37:58 -07:00
Zach Copley
96ba25c34b Added readonly flag to FileAction just in case 2009-06-26 18:31:24 -07:00
Jeffery To
612a107e09 Merge branch '0.8.x' into small-fixes 2009-06-26 15:44:31 +08:00
Jeffery To
71dc910a53 Merge branch '0.8.x' into notice-search-no-results 2009-06-26 15:42:37 +08:00
Jeffery To
6328add622 Merge branch '0.8.x' into invite-enabled 2009-06-26 15:31:42 +08:00
Jeffery To
899aad747a Merge branch '0.8.x' into group-rss-empty 2009-06-26 15:30:24 +08:00
Zach Copley
b47a1b3b57 Merge branch '0.8.x' into attachment-fixup
* 0.8.x:
  Added functionality to remove the notice data attachment
  max public page
2009-06-25 15:44:17 -07:00
Zach Copley
37796a8dc6 Make shorturls in notice content point to AttachmentAction urls 2009-06-25 15:42:17 -07:00
Evan Prodromou
b53b6b8769 Merge branch '0.8.x' of git@gitorious.org:+laconica-developers/laconica/dev into 0.8.x 2009-06-25 14:02:41 -07:00
Zach Copley
03d31911e1 FileAction redirections weren't being added (e.g.: /notice/$notice_id/file) 2009-06-25 13:51:29 -07:00
Evan Prodromou
a7cdf32df5 max public page 2009-06-25 13:23:59 -07:00
Evan Prodromou
638905c270 avoid getting duplicate errors on upload 2009-06-25 11:10:34 -07:00
Evan Prodromou
4d56bc6a0a streamline the file action 2009-06-25 11:08:32 -07:00
Evan Prodromou
3ca9e85ce4 update conversations to use newer query format 2009-06-25 09:43:30 -07:00
Brenda Wallace
bd9824c8d5 added missing conversation column to group by 2009-06-25 22:35:41 +12:00
Zach Copley
e3c5d1664f Take out noisy debugging statement 2009-06-24 16:10:28 -07:00
Zach Copley
98f518b9af fix bug in which design background could accidentally get removed 2009-06-24 00:00:36 -07:00
Zach Copley
57903bf2ac Make gateway notices available to the auth user in the API 2009-06-23 15:53:49 -07:00
Zach Copley
f04a54ed2f Merge branch '0.8.x' of git@gitorious.org:laconica/dev into 0.8.x
* '0.8.x' of git@gitorious.org:laconica/dev: (61 commits)
  Using default theme design values (it was previously set to identica
  Updated default colour theme and IE6 colours for transparent values
  chmod +x delete_status_network.sh
  rm -Rf, not rmdir
  script to delete a status network
  chmod allsites.php
  script to show all sites on a network
  use different name for connection and database
  use /etc/laconica/setup.cfg instead of local file
  other base directories
  On XHR notice post, calls NoticeAttachment to trigger thumbnail and
  oembed and thumbnail don't need sequences
  add innodb by default to status networks
  pwgen not pwdgen
  make pwgen command configurable
  a little sql script to drop full-text index and use innodb for profile and notice
  remove common_debug from newnotice
  append uploads to content rather than showing them double
  use a subclass for single notice items to show attachments
  make file command configurable
  ...
2009-06-23 14:29:46 -07:00
Zach Copley
31325f0995 Stop Twitter gateway notices from leaking via user faves pages 2009-06-23 13:51:23 -07:00
Jeffery To
280f8faab4 Merge branch '0.8.x' into small-fixes
Conflicts:
	lib/peoplesearchresults.php
	lib/profilelist.php
2009-06-24 01:25:55 +08:00
Jeffery To
65f784120b Merge branch '0.8.x' into notice-search-no-results 2009-06-24 01:18:35 +08:00
Evan Prodromou
e261a97150 remove common_debug from newnotice 2009-06-23 07:48:33 -07:00
Evan Prodromou
a21a9f26c5 append uploads to content rather than showing them double 2009-06-23 07:29:43 -07:00
Evan Prodromou
e2becdb251 use a subclass for single notice items to show attachments 2009-06-23 07:25:18 -07:00
Evan Prodromou
7bcaa858af make file command configurable 2009-06-23 05:35:20 -07:00
Zach Copley
d9bebfd651 Attachment upload server and path now configurable 2009-06-22 22:48:31 +00:00
Evan Prodromou
aec6456c91 Update copyright dates in files modified in 2009 2009-06-20 16:12:55 -07:00
Evan Prodromou
793a6a1155 change Controlez-Vous to Control Yourself 2009-06-20 16:00:04 -07:00
Evan Prodromou
3f54840b51 Only show twitter msgs in your own inbox 2009-06-18 11:45:48 -07:00
Evan Prodromou
3a0c6d6c6d Merge branch '0.8.x' of git@gitorious.org:+laconica-developers/laconica/dev into 0.8.x 2009-06-18 07:45:06 -07:00
Zach Copley
3f032bc36e Left out some new user and group theming file in the previous commit 2009-06-18 02:16:39 -07:00
Zach Copley
57274d21ba Group theming. 2009-06-18 02:01:06 -07:00
Evan Prodromou
ba3a484a65 order notices in a conversation 2009-06-18 00:12:53 -07:00
Zach Copley
6c7bdf9df6 Merge branch 'userdesign' into 0.8.x
* userdesign: (56 commits)
  Fix for background image repetition for various page heights
  Removed height:100% for better background image repetition
  A little more specific selector for notice reply
  Have user favorites page show user's design
  Placed a check to make sure there is a reply button in a notice before
  Make MailboxAction read only
  Remove stale reference to deprecated personal.php
  Uppercase hex color values
  Default to image being on, no tile after upload
  Fix sidebar color bug default design
  Update background image settings to use bitflags
  It was accidently removed
  Dynamically tile background image  and turn background image on or off
  Show a background img in settings form
  IE7/8 CSS update for user design
  Enable tiling of background imgs for Designs
  Added background image tile flag to Design
  Init styles for tile and image use on/off for user design settings
  Added form option to tile background image and to turn it on and off
  Add background dir
  ...
2009-06-17 18:49:25 -07:00
Zach Copley
06240450ef Have user favorites page show user's design 2009-06-17 18:05:12 -07:00
Evan Prodromou
420e8994f8 Merge branch '0.8.x' of git@gitorious.org:+laconica-developers/laconica/dev into taggedprofile 2009-06-17 15:05:24 -07:00
Evan Prodromou
07f5797f2f Make the personal tag streams actually work 2009-06-17 15:04:57 -07:00
Zach Copley
164588ef0f Merge branch '0.8.x' into userdesign 2009-06-17 21:40:52 +00:00
Zach Copley
8992e8fa7a Ticket 1612 - make destory (and create) favorites work via API 2009-06-17 14:34:04 -07:00
Evan Prodromou
2fbd141361 correct arguments for ProfileList 2009-06-17 08:21:53 -07:00
Zach Copley
ac3cccefb5 Default to image being on, no tile after upload 2009-06-17 03:02:43 -07:00
Zach Copley
2866d00517 Fix sidebar color bug default design 2009-06-17 02:58:35 -07:00
Zach Copley
76cbeff33c Update background image settings to use bitflags 2009-06-17 02:35:51 -07:00
Sarven Capadisli
4c640aace9 Updated markup yes/no form actions to be consistent with the rest of the site 2009-06-17 08:14:01 +00:00
Sarven Capadisli
7148ea86df Dynamically tile background image and turn background image on or off
in user design
2009-06-17 06:23:57 +00:00
Zach Copley
a0618b0e33 Show a background img in settings form 2009-06-16 22:57:28 -07:00
Zach Copley
3d6e30d205 Merge branch '0.8.x' into userdesign
* 0.8.x:
  Moved url handling to its proper place, from newnotice to Notice.php
  Removed more dead code.
  Brought back borders for content, navigation, aside_primary but
  Minor margin value change
  More contrast for tabs
  UI updates:
2009-06-16 22:24:11 -07:00
Zach Copley
d1ae3176b6 Enable tiling of background imgs for Designs 2009-06-16 22:18:25 -07:00
Sarven Capadisli
bea2fa1506 Added form option to tile background image and to turn it on and off 2009-06-17 04:09:30 +00:00
Robin Millette
befbfc9c73 Moved url handling to its proper place, from newnotice to Notice.php 2009-06-16 23:10:17 -04:00
Zach Copley
bc1f877f6e Design settings now save and displays backgrounds 2009-06-16 19:17:37 -07:00
Robin Millette
54697e5298 Removed more dead code. 2009-06-16 19:38:27 -04:00
Eric Helgeson
4450f3352c Needed the else. Tested logged in/out ; site closed/inviteonly/both 2009-06-16 17:18:48 -05:00
Zach Copley
6d5d0b3472 Update wasn't ever getting called 2009-06-16 00:56:32 -07:00
Zach Copley
44343986c3 Merge branch '0.8.x' into userdesign
* 0.8.x:
  a little better query handling in redirect code
  a little better query handling in redirect code
  forgot some functions aren't available at status time
  redirect on non-canonical server name
  don't show create-a-group link if not logged in
  allow a configured base for cache keys
  Missing call to getProfile() caused verify_credentials to fail.
  change mods for setup script
  Script to set up new status networks
  strncmp -> strcasecmp
  Return network from network setup function
  Configurable avatar directory
2009-06-15 21:24:22 -07:00
Sarven Capadisli
2c7f0534ca Typo/lowercased WebColor to webcolor in required_once 2009-06-16 04:03:08 +00:00
Zach Copley
94fec28610 User design setting save 2009-06-15 20:29:30 -07:00
Zach Copley
20d9350877 User design setting save now 2009-06-15 20:21:33 -07:00
Evan Prodromou
fbed704f3b don't show create-a-group link if not logged in 2009-06-15 16:22:08 -07:00
Zach Copley
12cd87cd7b Missing call to getProfile() caused verify_credentials to fail. 2009-06-15 22:50:14 +00:00
Zach Copley
807d84d448 Small fix to correct the order of defined color prefs 2009-06-15 12:57:08 -07:00
Zach Copley
92f095f589 Merge branch '0.8.x' into userdesign
* 0.8.x: (32 commits)
  updates to Status_network
  makeadmin action
  make admins of groups
  show aliases when showing a group
  Link and distribute notices tagged for a group alias
  Code for adding and saving group aliases
  Styles for group block
  add correct li for css magic for block stuff
  typo in profileminilist class
  return count from show
  try to get the right class for profileminilist
  fix perms for classes/statusnet.ini
  fixup perms for classes
  Added Group_alias class
  add a table for group aliases
  Cross-browser notice_attach
  Allow users to be unblocked from a group
  Some UI improvements for blocking and unblocking
  The rest of the things necessary to make group block work
  Make group block work
  ...

Conflicts:
	db/laconica.sql
	lib/common.php
2009-06-15 11:50:08 -07:00
Evan Prodromou
528ceec3fe makeadmin action 2009-06-15 05:44:36 -07:00
Evan Prodromou
2b8a767770 make admins of groups 2009-06-15 00:59:15 -07:00
Evan Prodromou
dda4493af7 show aliases when showing a group 2009-06-14 23:51:38 -07:00
Evan Prodromou
4dad3191f6 Merge branch 'groupalias' into 0.8.x 2009-06-14 23:48:24 -07:00
Evan Prodromou
ecbd7718d5 Code for adding and saving group aliases
Added code to add and save group aliases. Like tags, aliases are
free-texted in to the group admin page. configurable max number of
aliases, default is three.
2009-06-14 23:37:24 -07:00
Evan Prodromou
2f3c4f8812 add correct li for css magic for block stuff 2009-06-14 22:16:24 -07:00
Evan Prodromou
f8da15bf41 Allow users to be unblocked from a group
List users who are blocked from joining a group. Add a form to let
them be unblocked. Add an action that removes the block. Includes
changes to group and groupblock classes.
2009-06-14 16:17:44 -07:00
Evan Prodromou
bd26a80d45 Merge branch '0.8.x' into groupblock
Conflicts:
	lib/router.php
2009-06-14 15:59:35 -07:00
Evan Prodromou
c2ba727d61 Merge branch '0.7.x' into 0.8.x 2009-06-14 15:58:19 -07:00
Evan Prodromou
203a5aba67 Some UI improvements for blocking and unblocking
Add unblock to the router table, so unblocking will work at all.

Block form and unblock form return to subscribers list, not
subscriptions list, by default.

showstream action sends its parameters to block and unblock forms to
better return to the right page.
2009-06-14 15:54:22 -07:00
Evan Prodromou
1c87532912 The rest of the things necessary to make group block work
Link to the group block form. Hide join button if the current user is
blocked.
2009-06-14 15:47:39 -07:00
Evan Prodromou
d3a0c524cc Make group block work 2009-06-14 15:40:42 -07:00
Evan Prodromou
b6dee88e5d add UI for blocking a user from a group 2009-06-14 15:08:00 -07: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
Zach Copley
946d016df2 Reworked output for design settings page 2009-06-14 02:03:50 -07:00
Jeffery To
43680ed0c2 Fixes two PHP Warnings ("Invalid argument supplied for foreach() in /var/www/mmmu/lib/rssaction.php") when accessing the RSS feed of a group that has no notices. 2009-06-14 17:03:22 +08:00
Jeffery To
f7d488d4b2 Fixes the notice search RSS feeds / API results for searches that return no matches.
If a user does a notice search that should return no matching notices, the RSS feed / API results for that search currently returns all notices instead of no notices. This fixes it so that an empty list is returned instead.
2009-06-14 16:39:31 +08:00
Jeffery To
6d308f6ffe Adds $config['invite']['enabled'] to enable/disable invites.
The invite function may not applicable for private and/or closed installs. This adds a configuration option to enable/disable invites (defaulting to enabled), hides the "Invite" nav item when necessary, and adds a check to actions/invite.php.

Note that I haven't tried the Facebook application so I didn't add any checks to actions/facebookinvite.php.
2009-06-14 16:17:22 +08:00
Jeffery To
bb3361467c Merge branch '0.8.x' into small-fixes 2009-06-14 15:45:58 +08:00
Zach Copley
d0eb2058a5 Merge branch '0.8.x' into userdesign
Conflicts:

	actions/showfavorites.php
	lib/action.php
2009-06-14 00:23:48 +00:00
Zach Copley
c594d99167 Child notices should have thier own ID on their LIs, not the parent's 2009-06-12 19:02:13 -07:00
Zach Copley
79fa050125 Remove useless method 2009-06-12 17:05:31 -07:00
Eric Helgeson
acff6d4bfd Verbage of a closed invite only site, it shouldnt ask you to register. 2009-06-12 16:43:40 -05:00
Sarven Capadisli
4c61f98cd0 Takes care of http://laconi.ca/trac/ticket/1372 and a minor part of
http://laconi.ca/trac/ticket/1367

One of the bugs was to replace foaf:knows with the weaker
sioc:follows. This is done, but foaf:knows is also retained when the
subscription is bidirectional.

Primary topic of the file is an Agent rather than a Person.

rdfs:comment replaced by bio:olb which is a fairly popular RDF
property for one-line biographies

rdf:about attribute to the <OnlineAccount> elements in a manner
consistent with the RSS 1.0 feed.

Changed the OnlineAccount's homepage property to an accountProfilePage
property. Will be added to FOAF spec soon (already widely used).

Added a <weblog> property from the Agent to their profile page.

Thanks to Toby Inkster for the patch.
http://buzzword.org.uk/2009/laconica-0.7.3-foafsioc.patch
2009-06-12 17:24:18 +00:00
Jeffery To
53f31a247e Fix missing max_id in API search calls 2009-06-12 20:03:18 +08:00
Jeffery To
1b76df4b6a Fix "Undefined variable: cnt" 2009-06-12 19:49:33 +08:00
Jeffery To
3a59199040 Fix "Undefined property: DisfavorAction::$id" 2009-06-12 19:38:04 +08:00
Zach Copley
8064397588 Ticket #1611 and a bunch of code cleanup 2009-06-12 01:31:22 -07:00
Evan Prodromou
c0853e3040 Merge branch '0.7.x' into 0.8.x 2009-06-10 09:09:57 -07:00
Evan Prodromou
f4a1cd75ab Remove FIXME-marked Opera links until they actually work 2009-06-10 08:47:46 -07:00
Evan Prodromou
4df1ea49ec Merge branch '0.8.x' into userdesign
Conflicts:
	actions/designsettings.php
2009-06-09 21:51:24 -07:00
Evan Prodromou
adfb79a9bb Merge branch '0.7.x' into 0.8.x
Conflicts:
	classes/Notice.php
	classes/Profile.php
	lib/common.php
	lib/util.php
	scripts/getvaliddaemons.php
	scripts/stopdaemons.sh
2009-06-08 11:55:32 -07:00
Evan Prodromou
038cd8ac25 Merge branch '0.7.x' of git@gitorious.org:+laconica-developers/laconica/dev into 0.7.x 2009-06-06 09:55:17 -07:00
Dan Moore
40e05a3e86 Bringing users/show in line with Twitter as far as specifying user. 2009-06-05 12:53:17 -04:00
Dan Moore
0b6994516c Cleaning up comments at top of favor.php. 2009-06-05 01:01:25 -04:00
Dan Moore
6658e2a2ee Handle the ways Twitter accepts passing the user in the query string. 2009-06-04 17:57:03 -04:00
Robin Millette
fe38827a76 Remove js that crept back in, added another error string. 2009-06-01 17:40:53 -04:00
Robin Millette
683b835c3e Attachments popups for supported files are now embedded with the object xhtml tag. 2009-06-01 14:02:59 -04:00
Robin Millette
f8dae2bbc9 Refactored some attachment code and fixed upload bug in interface. 2009-05-31 21:03:55 -04:00
Robin Millette
ebeb5f744c Merge branch '0.8.x' of git@gitorious.org:+laconica-developers/laconica/dev into upload
Conflicts:

	js/util.js
	lib/attachmentlist.php
2009-05-31 17:12:04 -04:00
Robin Millette
3e0c291810 Added configurable options for attachments: supported mimetypes and quotas for uploads. 2009-05-31 16:42:29 -04:00
Evan Prodromou
4ec1c33307 correct last-modified date for shownotice.php 2009-05-30 21:45:11 -04:00
Sarven Capadisli
36fe5a85b2 Using lowercase for form action 'post' 2009-05-30 19:47:05 +00:00
Sarven Capadisli
08b98a3d4d Typo in label @for 2009-05-30 19:45:34 +00:00
Zach Copley
791f5defaf Ticket #1572 - Implement Twitter's account/rate_limit_status API method
We don't have a rate limit (yet) but some clients check this method.
This dummy implementation always says the auth user has 100 requests
left.
2009-05-29 20:23:32 -07:00
Zach Copley
78f8b91a13 Ticket #1568 - API should return full user objects 2009-05-29 19:23:53 -07:00
Zach Copley
425f9d703c Ticket #1567 - Change max_id to return notices <= ID instead of < ID 2009-05-29 16:54:24 -07:00
Zach Copley
eb76a3bbb3 Ticket #1567 - API: Change before_id parameter to max_id 2009-05-29 16:32:55 -07:00
Sarven Capadisli
b8de793556 Changed ul to ol and added xoxo for notice lists. 2009-05-29 02:38:38 +00:00
Zach Copley
8e8853a714 Warning log msg when http basic auth fails 2009-05-28 16:54:37 -07:00
Zach Copley
5e53a97a41 Warning log msg when http basic auth fails 2009-05-28 16:18:58 -07:00
Evan Prodromou
b3628b7844 start using design object 2009-05-27 14:49:20 -04:00
Robin Millette
ed1e1d9f44 Handles local aliases (redirection) for file uploads attached to notices. 2009-05-27 03:47:45 -04:00
Robin Millette
37423b12d7 Merge branch '0.8.x' of git@gitorious.org:+laconica-developers/laconica/dev into upload 2009-05-26 23:46:37 -04:00
Evan Prodromou
648d967226 Merge branch '0.8.x' into userdesign
Conflicts:
	lib/attachmentlist.php
	lib/noticelist.php
2009-05-26 23:24:01 -04:00
Robin Millette
af700ea277 Let's you upload a file with a notice and have it shown with other attachments. 2009-05-26 21:20:04 -04:00
Zach Copley
1034bd67b0 Fixed warning on Facebook app settings page 2009-05-26 23:59:12 +00:00
Zach Copley
69a656af22 Some adjustments to allow the Facebook app work with Laconica 0.8 2009-05-26 23:21:10 +00:00
Zach Copley
0664be924f Removed silly "dented:" status prefix from Facebook App 2009-05-26 21:36:45 +00:00
Zach Copley
0a4ce0ef99 Ticket #1196 - Fixed: Warning on invite tab in Facebook App 2009-05-26 21:36:31 +00:00
Zach Copley
b2c28faf52 Removed silly "dented:" status prefix from Facebook App 2009-05-26 21:14:42 +00:00
Zach Copley
5f2cf2553c Ticket #1196 - Fixed: Warning on invite tab in Facebook App 2009-05-26 02:23:19 +00:00
Sarven Capadisli
4edb1c6e0c Merge branch '0.8.x' of git@gitorious.org:+laconica-developers/laconica/dev into 0.8.x 2009-05-25 17:31:48 -04:00
Sarven Capadisli
3877324fd8 Updated JS to show/hide attachment thumbnails with timers. Minor
markup changes.
2009-05-25 17:30:57 -04:00
Robin Millette
a598dcccba Really removing the old files, thanks git! 2009-05-25 19:58:31 +00:00
Sarven Capadisli
959dce823f Merge branch '0.8.x' of git@gitorious.org:+laconica-developers/laconica/dev into 0.8.x 2009-05-25 15:53:49 -04:00
Sarven Capadisli
01dad57298 Markup cleanup for attachments 2009-05-25 15:53:19 -04:00
Robin Millette
64d0767654 Removed more cruft from old attachment/attachements pages 2009-05-25 19:42:03 +00:00
Robin Millette
0b96ca3d59 Oups, forget the attachment_thumbnail.php action file 2009-05-25 13:13:38 -04:00
Robin Millette
b5ac6e31f2 Rearranged attachment info to only appear on each applicable notice page and thru an ajax popup. 2009-05-24 04:43:34 -04:00
Evan Prodromou
6335c9cf59 make invite use the current user's design 2009-05-23 23:42:19 -04:00
Evan Prodromou
9c2f04afc6 make some of the actions show the user's design 2009-05-23 23:35:04 -04:00
Evan Prodromou
3a44885b7f reformat designsettings.php 2009-05-22 20:50:08 -04:00
Evan Prodromou
f25990cf8e Merge branch '0.8.x' of git@gitorious.org:laconica/dev into 0.8.x 2009-05-21 12:40:52 -04:00
Evan Prodromou
966f1c6169 Merge branch 'conversationtree' into 0.8.x 2009-05-21 11:43:28 -04:00
Evan Prodromou
62711ae2ba show conversation as a hierarchical list 2009-05-21 11:43:09 -04:00
Sarven Capadisli
56a8a255ff Changed No/Yes and Reset/Save locations. They are now a little more
usable by first offering the option to undo and than do.
2009-05-21 00:12:48 +00:00
Sarven Capadisli
b561962b59 Color picker reset: Resetting form values will also dynamically update
the page colors back to their original.
2009-05-20 23:11:35 +00:00
Sarven Capadisli
0c442e459e Added reset button
Rearranged swatch layout
Added background image upload input file
2009-05-19 17:05:30 +00:00
Robin Millette
f5606b6aa3 Added RSS for personal tags 2009-05-18 18:18:08 -04:00
Robin Millette
57860b4d8a Merge branch '0.8.x' of git@gitorious.org:~evan/laconica/dev into 0.8.x 2009-05-18 17:20:11 -04:00
Robin Millette
0271859c24 Added personal tag page: http://example.com/MY_NICK/tag/A_TAG 2009-05-18 17:18:57 -04:00
Sarven Capadisli
806200379d Dynamic color updates to page elements when user picks a color.
Using JSON to create swatches in HTML output.
2009-05-18 20:10:46 +00:00
Robin Millette
5897dfa4c3 Refactored new sections code to proper classes and added notice link to links in notice sections. 2009-05-17 22:06:08 -04:00
Zach Copley
811cef1008 Merge branch '0.8.x' into fbconnect 2009-05-15 23:17:57 +00:00
Zach Copley
41f6c9d8cf Added event handlers to logout action 2009-05-15 21:41:41 +00:00
Robin Millette
fecb8c706d Attachments and their list now provide "ajax" view. Also added a few sidebars relating tags and attachments. 2009-05-15 15:04:58 -04:00
Evan Prodromou
4ac7a4054e conversation tree interface 2009-05-15 13:55:49 -04:00
Robin Millette
3b7ee5a5f9 rewrote short url stuff to handle new file/url classes (redirections, oembed, mimetypes, etc.) 2009-05-13 14:27:32 -04:00
Robin Millette
d010d811ba db stuff for URLs: redirections, oembed, etc. 2009-05-11 13:45:00 -04:00
Sarven Capadisli
9a566c51cd Merge branch '0.7.x' into 0.8.x 2009-05-10 23:13:22 +00:00
Zach Copley
11e0db8c2c Twitter friends sync now does 25 users at a time and uses last_friendsync field to prioritize 2009-05-07 18:22:14 -07:00
Zach Copley
fbf23ae0ee Only show import friends timeline option if bidirectional bridge enabled 2009-05-07 14:41:53 -07:00
Sarven Capadisli
c8fd3c5765 Merge branch '0.7.x' into 0.8.x 2009-05-01 17:03:51 +00:00
Evan Prodromou
19a2194704 Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x 2009-05-01 07:13:19 -04:00
Ori Avtalion
c5e72e248f Several whitespace fixes 2009-05-01 07:12:13 -04:00
Ori Avtalion
9cac6413a3 Add s to user favorite notices 2009-05-01 07:11:28 -04:00
Sarven Capadisli
d30df07908 Merge branch '0.7.x' into 0.8.x
Resolved Conflicts:
	lib/queuehandler.php
	lib/util.php
	theme/base/css/display.css
2009-05-01 00:16:25 +00:00
CiaranG
b79fef3074 Fixed remote subscription, broken in fc6cedd222 2009-04-29 23:43:42 +01:00
Zach Copley
8295402fb3 Added 'mentions' the the list of API methods requiring bare auth 2009-04-29 13:16:52 -07:00
Zach Copley
e85cddba45 Ticket #1428 - Changed replies API method to "mentions". 2009-04-28 23:31:00 -07:00
Zach Copley
54795f2c41 Merge branch 'twitter-import' into 0.8.x 2009-04-24 14:29:56 -07:00
Zach Copley
06746f3fac Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x 2009-04-23 02:19:12 +00:00
Zach Copley
c4941e9043 Added ajax responses 2009-04-23 02:17:59 +00:00
Robin Millette
fe3241183e fix join a group link from user homepage when he hasn't posted anything yet 2009-04-23 01:03:17 +00:00
Adrian Lang
0dd90461cd Merge branch '0.7.x' of git://gitorious.org/laconica/mgrdcm-twitapibools into review/master 2009-04-20 13:09:05 +02:00
Robin Millette
39c0e3a9ef fix 0.7.x 0.8.x merge conflict in register.php 2009-04-18 21:14:31 +00:00
Dan Moore
48846c3805 Fixing spaces/tabs. 2009-04-18 15:54:23 -04:00
Dan Moore
b764c3be78 This should change the JSON representation of the booleans 'following' and 'notifications', but unlike the previous change, I was unable to test this. 2009-04-18 15:42:44 -04:00
Dan Moore
90fb7be99a Bringing the presentation of boolean variables (favorited, truncated, profile_background_tile) and the result from friendships/exist in JSON results from the Twitter Compatible API in line with what the real Twitter API does.
Currently, laconica returns text strings enclosed in quotes instead of bare Javascript booleans.  This change fixes that.

See http://laconi.ca/trac/ticket/1326 for one open issue related to this.
2009-04-18 15:33:36 -04:00
Robin Millette
eec323b5b7 Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x 2009-04-18 19:08:48 +00:00
Robin Millette
4b54a418f3 trac#1215, 1216, 1217 and 1219: subscribers/subscriptions people tagclouds 2009-04-18 19:08:33 +00:00
Evan Prodromou
e8382b1292 incorrect variable access 2009-04-17 13:03:33 -07:00
Evan Prodromou
231c61a7eb store invite code in session so openidfinish can find it 2009-04-17 12:52:26 -07:00
Robin Millette
e5094c3359 fix merge conflict 0.7.x 0.8.x in util.php and register.php. 2009-04-17 17:04:05 +00:00
Sarven Capadisli
34d904b180 Ticket 1404. Showing the link to the members list page. 2009-04-17 01:11:38 +00:00
Zach Copley
6848e93cd5 Merge branch '0.8.x' into twitter-import 2009-04-16 15:00:58 -07:00
Robin Millette
362cac0a96 Add a few events (hooks): RegistrationTry, RegistrationForData, ProfileFormData and ProfileSaveForm. 2009-04-16 17:34:19 +00:00
Evan Prodromou
55d7bb4701 Merge branch '0.7.x' into 0.8.x 2009-04-15 11:35:43 -04:00
Evan Prodromou
5ff8d8d447 Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x
Conflicts:
	actions/public.php
2009-04-15 10:25:26 -04:00
Adrian Lang
8439477201 Add escaping of /. 2009-04-15 13:29:52 +02:00
Fil
e8fc34e75c Use preg_quote to fix http://laconi.ca/trac/ticket/1342 2009-04-15 10:35:15 +02:00
Adrian Lang
99f4367d03 Merge branch 'link-rel-paginate' of git://gitorious.org/laconica/meitar. Fixed wrong call of common_local_url.
These changes add opera-readable prev/next relations.
2009-04-15 09:38:19 +02:00
Adrian Lang
fc6cedd222 Make OMB work if the configured domain name does not exclusively contain lower case letters.
If the configured domain is mixed-case OAuth throws invalidsignature errors. The current URL is part of the signated parts; since the consumer does not pass the current URL, the service has to get it itself and add it to the other OAuth params for signature rebuilding. OAuth.php uses $_SERVER for this, however, the domain is lcased in $_SERVER. Hence we pass the complete current URL as generated by common_local_url to OAuthRequest.
2009-04-15 09:18:43 +02:00
Sarven Capadisli
3cc94cc0bc Merge branch '0.7.x' into 0.8.x 2009-04-14 23:35:06 +00:00
Sarven Capadisli
64e4b8a20f Updated remaining files and styles for style separation for themes 2009-04-14 23:32:09 +00:00
Robin Millette
533a463879 Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x 2009-04-14 23:03:31 +00:00
Robin Millette
2039466495 trac#1223 Show most popular notices per tag in the tag page sidebar. 2009-04-14 23:03:19 +00:00
Evan Prodromou
41b247ac1a Merge branch '0.7.x' into 0.8.x 2009-04-14 14:29:51 -04:00
Zach Copley
ad5dd9030b Add option to Twitter settings for importing Friends Timeline 2009-04-13 19:19:26 -07:00
Evan Prodromou
4c9be4d566 typo in api.php 2009-04-13 15:52:15 -04:00
Evan Prodromou
3a0c59052a Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x 2009-04-13 15:51:12 -04:00
Evan Prodromou
e9e75fc9d5 isReadOnly() now takes arguments
Add an array of arguments to isReadOnly() method of actions, to let
them change their results depending on what actions are called.
Primarily used by the 'api' action. Ideally in the future that will be
multiple actions. But this might still be useful.
2009-04-13 15:49:26 -04:00
Sarven Capadisli
ed3d68435f Using farbtastic jQuery plugin to select design colours. 2009-04-13 05:39:23 +00:00
Sarven Capadisli
4a8c23fe32 Updated path for jCrop 2009-04-13 03:49:37 +00:00
Sarven Capadisli
2341f99224 Merge branch '0.7.x' into 0.8.x 2009-04-12 21:50:57 +00:00
Sarven Capadisli
7a00dc749d Updated styles for the Authrization subscription form inputs 2009-04-12 21:50:14 +00:00
Sarven Capadisli
6cfa587385 Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x 2009-04-12 21:41:20 +00:00
Sarven Capadisli
e9e7671d5f Updated markup for entity_profile on Authorize subscription page. 2009-04-12 21:40:29 +00:00
Sarven Capadisli
a9461356b8 Created Design page for users to customize the way their profile pages
look by changing the background image and picking a colour palette for
text.
2009-04-12 20:30:14 +00:00
Evan Prodromou
f934cf2ac0 Update XML generation and list of actions in public XRDS
Updated the XML generation calls and list of actions in the public
XRDS document.
2009-04-12 15:34:38 -04:00
Evan Prodromou
925ac16e1f tag stream is read-only 2009-04-10 22:47:40 -04:00
Sarven Capadisli
c9c5ec0e4b Merge branch '0.7.x' into 0.8.x 2009-04-10 17:39:56 +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
Sarven Capadisli
dcee7f2f62 Merge branch '0.7.x' into 0.8.x 2009-04-08 22:58:21 +00:00
Sarven Capadisli
03a4a4bebf Merge branch '0.8.x' of git@gitorious.org:laconica/dev into 0.8.x 2009-04-08 22:55:34 +00:00
Sarven Capadisli
e5657ca4bb Merge branch '0.7.x' into 0.8.x 2009-04-08 22:55:13 +00:00
CiaranG
85873b1f2b Merge branch 'master' of git://gitorious.org/laconica/br3nda into review/master 2009-04-08 22:11:58 +01:00
Evan Prodromou
579332aa24 don't use count() to check for empty page 2009-04-07 23:57:45 -04:00
Evan Prodromou
58dfad5757 Merge branch 'adrianlang-827' of git://gitorious.org/laconica/adrianlang-clone into 0.7.x 2009-04-07 22:29:48 -04:00
Robin Millette
afebef50e4 showemptListMessage -> showEmptyListMessage method name cleanup. 2009-04-08 01:20:50 +00:00
Robin Millette
5c87616778 added filler/guide text to user groups list. 2009-04-08 01:19:23 +00:00
Robin Millette
ddb59f72db text bugfix to guide text in subscription list. 2009-04-08 01:13:37 +00:00
Robin Millette
3fb6c8218a added filler/guide text to subscribers list. 2009-04-08 01:12:43 +00:00
Robin Millette
68ed6be71f added filler/guide text to subscription list. 2009-04-08 01:05:17 +00:00
Robin Millette
b20815e8e2 added missing word to user favorites guide. 2009-04-08 00:16:53 +00:00
Robin Millette
cc50031658 added filler/guide text to user favorites. 2009-04-08 00:15:05 +00:00
Sarven Capadisli
a839daad2e HTML br is not needed. Using 'clear' in CSS instead. 2009-04-07 23:45:22 +00:00
Robin Millette
79b1e3a488 added filler/guide text to user replies timeline. 2009-04-07 23:25:12 +00:00
Robin Millette
d704b3fa8e added filler/guide text to user timeline. 2009-04-07 23:14:02 +00:00
Robin Millette
c79bad0601 fixed filler/guide text on personal timeline to take memcached into account. 2009-04-07 22:16:09 +00:00
Evan Prodromou
50b32227d1 Add subscribers, subscriptions, groups to personal page
We show stats, subscriptions info on the personal page in the sidebar.
Pushed code from showstream.php into a common parent class for
personal and profile.
2009-04-07 17:47:08 -04:00
Evan Prodromou
4e3e4fcfff Merge branch '0.7.x' into 0.8.x 2009-04-07 17:14:23 -04:00
Sarven Capadisli
05b04b7970 Changed text "noone" to "no one". 2009-04-07 21:12:11 +00:00
Sarven Capadisli
a6e950b7a1 Renamed 'blankfiller' to 'guide'. 2009-04-07 21:09:27 +00:00
Robin Millette
640ae10935 added filler text to personal timeline. 2009-04-07 16:11:03 +00:00
Robin Millette
17fb51f747 added filler text to notice and group search, suggesting other search options. 2009-04-07 03:26:33 +00:00
Robin Millette
9ad8307b7e external search now depends on site.server. 2009-04-06 05:04:11 +00:00
Robin Millette
84d2aa7df4 refactored search suggestions and added forgotten sprintf. 2009-04-06 01:14:59 +00:00
Robin Millette
1ee24a2aaf added filler text to people search, suggesting other search options. 2009-04-05 23:11:40 +00:00
Sarven Capadisli
e21844c7e4 Merge branch '0.8.x' of git@gitorious.org:laconica/dev into 0.8.x 2009-04-03 21:48:23 +00:00
Sarven Capadisli
e632f3be6f Merge branch '0.7.x' into 0.8.x 2009-04-03 21:47:39 +00:00
Robin Millette
8f969f8f98 Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x 2009-04-03 20:37:35 +00:00
Robin Millette
439d521c86 Tiny change to the public tag cloud dealing with empty page. 2009-04-03 20:37:29 +00:00
Robin Millette
9698247722 Added filler text to popular page for when it's empty, encouraging user to add favorites and/or register. 2009-04-03 20:35:18 +00:00
Robin Millette
e1fec6db2f Simplified code for empty public timeline. 2009-04-03 20:34:27 +00:00
Evan Prodromou
fa3ca0548f fix output of conversation 2009-04-03 16:12:33 -04:00
Evan Prodromou
68ae282198 Merge branch '0.7.x' into 0.8.x 2009-04-03 15:36:16 -04:00
Evan Prodromou
81c72956a6 Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x 2009-04-03 15:31:07 -04:00
Robin Millette
4d4e6ead9c added filler text to public tagcloud for when it's empty, encouraging user to post and/or register. 2009-04-03 19:16:35 +00:00
Evan Prodromou
5eacffcb3a try to reduce memory usage in FOAF output 2009-04-03 14:18:29 -04:00
Evan Prodromou
5f79653acb redirect FOAF file on non-canonical nickname 2009-04-03 14:00:52 -04:00
Evan Prodromou
d68ac2e1d3 Merge branch '0.7.x' into 0.8.x 2009-04-03 12:47:25 -04:00
Evan Prodromou
26194cd1d6 i18n for legend in remote sub form 2009-04-02 06:10:32 -04:00
Sarven Capadisli
798984381f Merge branch '0.7.x' into 0.8.x 2009-04-02 06:44:54 +00:00
Evan Prodromou
e28c4689ce add sup with arguments 2009-04-01 18:29:10 -04:00
Evan Prodromou
c172cbafaa Try to do intelligent redirect codes
After fixing the redirect code output, there are a lot of weirdnesses
with e.g. form handling. Try to add explicit redirect codes where
needed -- principly when handling a POST.
2009-04-01 15:30:59 -04:00
Robin Millette
3861e348a4 added filler text to public timeline for when it's empty, encouraging user to post and/or register. 2009-03-30 21:07:48 +00:00
Sarven Capadisli
27b45eeb48 Merge branch '0.7.x' into 0.8.x 2009-03-30 15:15:40 +00:00
Evan Prodromou
7b02d9d2e1 Merge branch 'master' into 0.7.x 2009-03-30 11:11:33 -04:00
Evan Prodromou
650a86d79a add fullname to title and h1 for groups 2009-03-30 10:28:44 -04:00
Evan Prodromou
ce212c3903 full name in title and h1 of the personal profile 2009-03-30 09:58:49 -04:00
Evan Prodromou
73fbf65800 full name in title and h1 of the personal profile 2009-03-30 09:58:28 -04:00
Evan Prodromou
2becd5849d Merge branch 'master' into 0.7.x
Conflicts:
	lib/router.php
2009-03-25 12:56:52 -04:00
Evan Prodromou
1116526f08 fixed pagination variable problem 2009-03-25 12:32:46 -04:00
Evan Prodromou
8c073a34ce Merge branch '0.7.x' into 0.8.x 2009-03-23 15:55:07 -04:00
Sarven Capadisli
fadae96a74 Password recover and change form markup updated. 2009-03-22 20:21:32 +00:00
CiaranG
a9a71297f4 Use correct page information for notice search. See ticket #1333 2009-03-20 22:02:35 +00:00
CiaranG
b4c273113c A couple more 'Join Now' messages that need disabling when the site is closed or invite only 2009-03-19 21:55:03 +00:00
CiaranG
0e1186dfd0 Get rid of 'Join now...' message if site is closed or invite only. See ticket #1335 2009-03-19 18:08:49 +00:00
Evan Prodromou
8f64c247fd redirect to original URL or URI for remote notices 2009-03-19 11:38:25 -04:00
Evan Prodromou
3d8a8aa03c redirect to original URL or URI for remote notices 2009-03-19 11:36:24 -04:00
Evan Prodromou
d1b2a9d708 Somewhat better behaviour with mixed caps in search
Deal somewhat better with mixed caps in people and notice search.
2009-03-19 11:01:58 -04:00
Brenda Wallace
18c8a55ba6 use common_database_tablename instead of repeating that if structure everywhere 2009-03-17 10:36:12 +13:00
Brenda Wallace
c2e529c72b quoted the users table 2009-03-17 10:27:29 +13:00
Evan Prodromou
b3a0eea3b6 Merge branch '0.7.x' into 0.8.x
Conflicts:

	classes/Notice.php
	lib/action.php
	lib/router.php
	lib/twitter.php
2009-03-12 11:56:23 -04:00
CiaranG
c08e4d904e PostgreSQL - a few more query compatibility issues (submitted by oxygene) 2009-03-11 23:46:23 +00:00
Adrian Lang
2cbb67c21e Define undefined variable. 2009-03-11 10:40:24 +01:00
Adrian Lang
6367def2d8 Remove OAuthRequest as storage from userauthorization.
Since we are not really handling a fullblown OAuth request (No signature, nonce, consumer) we should not use this class, rather store the plain param array in the session.
2009-03-11 10:33:26 +01:00
Adrian Lang
df7565ddcc Remove second OAuth request validation. 2009-03-11 10:32:12 +01:00
Adrian Lang
24713499a9 Fixes #827: Laconica expects full OAuth message for user auth request.
When a user subscribes to a remote profile, he is redirected to his own service to confirm the request. This authorization request is specified in http://oauth.net/core/1.0#auth_step2. According to the standard, it does not have to pass consumer_key, nonce, timestamp or signature. The only specified parameters are oauth_token and oauth_callback, both optional.
2009-03-11 10:30:30 +01:00
Adrian Lang
1ba3ac9ee3 Make OMB work if the configured domain name does not exclusively contain lower case letters.
If the configured domain is mixed-case OAuth throws invalidsignature errors. The current URL is part of the signated parts; since the consumer does not pass the current URL, the service has to get it itself and add it to the other OAuth params for signature rebuilding. OAuth.php uses $_SERVER for this, however, the domain is lcased in $_SERVER. Hence we pass the complete current URL as generated by common_local_url to OAuthRequest.
2009-03-11 10:27:54 +01:00
Adrian Lang
72338b8c26 Merge branch '0.7.x' of http://git.gitorious.org/laconica/erichelgeson-clone into review/0.7.x 2009-03-11 10:07:41 +01:00
Zach Copley
622cc150d8 Fix xml:lang attr 2009-03-10 18:30:58 -07:00
Zach Copley
1e29cbd691 Make search API Atom feeds more valid 2009-03-10 18:17:20 -07:00
Zach Copley
a989c58c11 Fix tag URIs in Atom feeds for search thru the API 2009-03-10 17:20:43 -07:00
Zach Copley
df07786f28 Allow unauthenticated users to view /api/statuses/replies/id.format
(they can already see @replies via friends_timeline anyway).
2009-03-10 16:48:14 -07:00
Zach Copley
91980c73a7 Updates to the API to improve Atom feeds 2009-03-10 16:15:57 -07:00
Eric Helgeson
c6cd87c106 Changed all $config[][] calls to common_config() 2009-03-09 20:01:35 -05:00
CiaranG
945bbf00dc PostgreSQL - a couple more GROUP BY queries that needed to be explicit 2009-03-09 20:24:56 +00:00
Adrian Lang
f87ef9b72b Fixes #1277: Typo in variable name in actions/twitapidirect_messages.php. 2009-03-09 09:45:40 +01:00
Adrian Lang
fbe794e44d Improve handling of null values in profile parameters.
This commit fixes two issues:
- Allowing remote users to clear profile parameters via OMB.
- Improved handling of profile parameters which evaluate to
  false ('0' for example)
2009-03-09 08:06:31 +01:00
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