GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity
4,982 Commits 8 Branches 4 Tags
Commit Graph

1987 Commits

Author SHA1 Message Date
Evan Prodromou
4dad3191f6 Merge branch 'groupalias' into 0.8.x 2009-06-14 23:48:24 -07:00
Evan Prodromou
1b6b00a6d0 Link and distribute notices tagged for a group alias 
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-14 23:43:47 -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
c0f3204a10 Merge branch '0.8.x' of git@gitorious.org:+laconica-developers/laconica/dev into 0.8.x 2009-06-14 22:09:59 -07:00
Evan Prodromou
7097804eeb typo in profileminilist class 2009-06-14 22:09:17 -07:00
Evan Prodromou
bef643352d return count from show 2009-06-14 22:09:04 -07:00
Evan Prodromou
ee8dd62038 try to get the right class for profileminilist 2009-06-14 22:07:27 -07:00
Sarven Capadisli
8dd5871d4f Merge branch '0.8.x' of git@gitorious.org:laconica/dev into 0.8.x 2009-06-15 03:26:32 +00:00
Sarven Capadisli
0bc9b2e730 Cross-browser notice_attach 2009-06-15 03:21:15 +00: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
daf2e7ef47 Merge branch '0.8.x' of git@gitorious.org:+laconica-developers/laconica/dev into 0.8.x 2009-06-14 14:54:20 -07:00
Evan Prodromou
b6ef8e735b base class SubscriptionList for some actions 2009-06-14 14:53:42 -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
Robin Millette
7c772e1d63 Removed another bit of dead (commented out) code. 2009-06-14 15:48:46 -04:00
Zach Copley
946d016df2 Reworked output for design settings page 2009-06-14 02:03:50 -07: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
Sarven Capadisli
77c94c44a6 Removed hanging skin crapola 2009-06-14 05:57:59 +00: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
89d0583b91 Fixes Ticket #1607 - empty 'page-notice' definition lists were 
being output in a bunch of places.
 2009-06-12 17:06:42 -07:00
Zach Copley
fc6154fe4d Add a method to check for registered event handlers 2009-06-12 16:56:43 -07:00
Sarven Capadisli
8524990512 http://laconi.ca/trac/ticket/1367 
Thanks to Toby Inkster for the patch.
 2009-06-12 16:18:58 +00:00
Sarven Capadisli
4532babb6f http://laconi.ca/trac/ticket/1370 
Thanks to Toby Inkster for the patch.
 2009-06-12 16:15:30 +00:00
Sarven Capadisli
392c8d4a96 http://laconi.ca/trac/ticket/863 
Thanks to Toby Inkster for the patch.
 2009-06-12 16:13:45 +00:00
Sarven Capadisli
1627fe8f33 http://laconi.ca/trac/ticket/1368 Site is the space that Container 
sits in.
Thanks to Toby Inkster for the patch.
 2009-06-12 15:42:53 +00:00
Sarven Capadisli
e2476307ba Updated Creative Commons namespace to current. 
Thanks to Toby Inkster for the patch.
 2009-06-12 15:41:45 +00:00
Jeffery To
53f31a247e Fix missing max_id in API search calls 2009-06-12 20:03:18 +08:00
Jeffery To
e2b20bd1e6 Fix "Trying to get property of non-object" errors when a user tries to log in using an unknown nickname 2009-06-12 19:58:30 +08:00
Jeffery To
cfea2b0c4e Fix "Trying to get property of non-object" errors when accessing the people search results page 2009-06-12 19:55:41 +08:00
Jeffery To
216ada5cc4 Fix "Trying to get property of non-object" errors in groupeditform.php 2009-06-12 19:48:26 +08:00
Zach Copley
8064397588 Ticket #1611 and a bunch of code cleanup 2009-06-12 01:31:22 -07:00
Robin Millette
ba6beaa310 Merge branch '0.8.x' of git@gitorious.org:+laconica-developers/laconica/dev into 0.8.x 2009-06-10 14:18:41 -04:00
Robin Millette
e120cb1a53 Uploaded content now displays in overlay (and removed var_dump crap) 2009-06-10 14:17:46 -04:00
Evan Prodromou
5469e46ef5 merge error in util.php 2009-06-10 09:14:48 -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
ed627bb4bd Merge branch '0.8.x' of git@gitorious.org:+laconica-developers/laconica/dev into 0.8.x 2009-06-09 21:48:56 -07:00
Robin Millette
207750e757 Merge branch '0.8.x' of git@gitorious.org:+laconica-developers/laconica/dev into 0.8.x 2009-06-09 15:19:19 -04:00
Robin Millette
27af3c67a2 Improve file upload and attachment interface. 2009-06-09 15:18:12 -04:00
Sarven Capadisli
3aebd847e7 Added title and minor CSS cleanup to notice attach 2009-06-09 17:34:33 +00: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
Evan Prodromou
2c81d8db76 don't send smses to sender 2009-06-05 10:07:26 -07:00
Sarven Capadisli
b708b81065 Init notice_data-attach UI for form_notice 2009-06-05 00:00:04 -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