summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2009-06-15User design setting saveZach Copley
2009-06-15Merge branch 'userdesign' of ↵Zach Copley
ssh://zach@dev.controlyourself.ca/mnt/www/design into userdesign * 'userdesign' of ssh://zach@dev.controlyourself.ca/mnt/www/design: Converts user entry in the form of '#1B2' into '#11BB22' for user Updated swatch numbering Conflicts: actions/designsettings.php
2009-06-15User design setting save nowZach Copley
2009-06-16Converts user entry in the form of '#1B2' into '#11BB22' for userSarven Capadisli
design swatches
2009-06-15Updated swatch numberingSarven Capadisli
2009-06-15Small fix to correct the order of defined color prefsZach Copley
2009-06-15Merge branch '0.8.x' into userdesignZach Copley
* 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-15updates to Status_networkEvan Prodromou
2009-06-15makeadmin actionEvan Prodromou
2009-06-15make admins of groupsEvan Prodromou
2009-06-14show aliases when showing a groupEvan Prodromou
2009-06-14Merge branch '0.8.x' of git@gitorious.org:+laconica-developers/laconica/dev ↵Evan Prodromou
into 0.8.x
2009-06-14Merge branch 'groupalias' into 0.8.xEvan Prodromou
2009-06-14Link and distribute notices tagged for a group aliasEvan Prodromou
Correctly link and distribute notices tagged for a group alias. Added a helper function, getForNickname(), to User_group, to make it easier to get a group by its nickname or aliases.
2009-06-14Code for adding and saving group aliasesEvan Prodromou
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-15Styles for group blockSarven Capadisli
2009-06-14add correct li for css magic for block stuffEvan Prodromou
2009-06-14Merge branch '0.8.x' of git@gitorious.org:+laconica-developers/laconica/dev ↵Evan Prodromou
into 0.8.x
2009-06-14typo in profileminilist classEvan Prodromou
2009-06-14return count from showEvan Prodromou
2009-06-14try to get the right class for profileminilistEvan Prodromou
2009-06-14Merge branch '0.8.x' into groupaliasEvan Prodromou
2009-06-14fix perms for classes/statusnet.iniEvan Prodromou
2009-06-14fixup perms for classesEvan Prodromou
2009-06-14Added Group_alias classEvan Prodromou
2009-06-14add a table for group aliasesEvan Prodromou
2009-06-15Merge branch '0.8.x' of git@gitorious.org:laconica/dev into 0.8.xSarven Capadisli
2009-06-15Cross-browser notice_attachSarven Capadisli
2009-06-14Allow users to be unblocked from a groupEvan Prodromou
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-14Merge branch '0.8.x' into groupblockEvan Prodromou
Conflicts: lib/router.php
2009-06-14Merge branch '0.7.x' into 0.8.xEvan Prodromou
2009-06-14Some UI improvements for blocking and unblockingEvan Prodromou
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-14The rest of the things necessary to make group block workEvan Prodromou
Link to the group block form. Hide join button if the current user is blocked.
2009-06-14Make group block workEvan Prodromou
2009-06-14add UI for blocking a user from a groupEvan Prodromou
2009-06-14Merge branch '0.8.x' into groupblockEvan Prodromou
2009-06-14Merge branch '0.8.x' of git@gitorious.org:+laconica-developers/laconica/dev ↵Evan Prodromou
into 0.8.x
2009-06-14base class SubscriptionList for some actionsEvan Prodromou
2009-06-14Break profilelist into a recipeEvan Prodromou
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-14better handling of PEAR errorsEvan Prodromou
2009-06-14Commented all .sql fields for file/url related tables.Robin Millette
2009-06-14Removed another bit of dead (commented out) code.Robin Millette
2009-06-14fix perms on Group_block classesEvan Prodromou
2009-06-14create DB_DataObject classes for group blockEvan Prodromou
2009-06-14added group_block table to databaseEvan Prodromou
2009-06-14Merge branch '0.8.x' of git@gitorious.org:+laconica-developers/laconica/dev ↵Evan Prodromou
into 0.8.x
2009-06-14Merge branch '0.7.x' into 0.8.xEvan Prodromou
2009-06-14Reworked output for design settings pageZach Copley
2009-06-14Removed hanging skin crapolaSarven Capadisli
2009-06-14Merge branch '0.8.x' into userdesignZach Copley
Conflicts: actions/showfavorites.php lib/action.php