Commit Graph

1608 Commits

Author SHA1 Message Date
Sarven Capadisli 2f693c4c94 Updated swatch numbering 2009-06-15 21:02:12 +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
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
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
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 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