aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merging in conflictsirius2014-04-1619-94/+129
|\
| * minor css fixmarijus2014-04-152-10/+2
| * better mapping of visible connectionsfriendica2014-04-143-23/+17
| * Merge https://github.com/friendica/red into pending_mergefriendica2014-04-142-3/+5
| |\
| | * fixes rconnect button for bs-default schememarijus2014-04-141-3/+3
| | * a small fix for bs-default schememarijus2014-04-141-0/+2
| * | Better handling of restricted /channel and /profile permissions. We will show...friendica2014-04-143-20/+27
| |/
| * directory: make "connect" more prominent, but this ultimately needs more them...friendica2014-04-143-3/+3
| * until we can figure out how to allow commenting on the discover page without ...friendica2014-04-131-0/+7
| * profperm: abook_profile was being handled by profile id rather than profile_g...friendica2014-04-131-7/+7
| * Often somebody will join the matrix with a dodgy cert and we'll sort that out...friendica2014-04-132-12/+26
| * Merge https://github.com/friendica/red into pending_mergefriendica2014-04-13200-291/+588
| |\
| * | only show forum tags on contact autocomplete, not in the ACL selectorfriendica2014-04-131-1/+1
| * | minor alignment issuesfriendica2014-04-133-7/+14
* | | Added hackish support for permissions-sync between profile and profile-picturessirius2014-04-142-4/+41
| |/ |/|
* | Merge pull request #411 from beardy-unixer/masterThomas Willingham2014-04-131-6/+0
|\ \
| * | Tony has been near the Git again.Thomas Willingham2014-04-131-6/+0
|/ /
* | Merge pull request #407 from tonybaldwin/masterRedMatrix2014-04-132-0/+7
|\ \
| * | added breaks after added bbcode spoiler linetony baldwin2014-04-121-1/+1
| * | added spoiler tag to bbcode help doctony baldwin2014-04-121-0/+1
| * | Merge remote-tracking branch 'upstream/master'tony baldwin2014-04-12326-15932/+20842
| |\ \
| * \ \ Merge remote-tracking branch 'upstream/master'Tony Baldwin2014-03-09393-13322/+24226
| |\ \ \
| * | | | took the padding out of bbcode.phpTony Baldwin2014-03-091-8/+8
| * | | | added padding around images floated right and leftTony Baldwin2014-03-091-9/+16
| * | | | reimplementing navbar colours that were undone by git-marjustony baldwin2014-02-202-4/+1
* | | | | Merge pull request #408 from beardy-unixer/masterRedMatrix2014-04-13199-291/+587
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Update sabreThomas Willingham2014-04-12199-291/+587
* | | | | remove extra tag loggingfriendica2014-04-121-1/+1
* | | | | don't match quote remnantsfriendica2014-04-121-1/+5
* | | | | let normal hashtags be quoted strings alsofriendica2014-04-122-2/+21
* | | | | major cleanup of handle_tag()friendica2014-04-121-10/+48
* | | | | Merge branch 'master' into prvtagfriendica2014-04-122-13/+16
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Merge https://github.com/friendica/red into pending_mergefriendica2014-04-121-13/+13
| |\ \ \ \
| | * | | | Ooops, replaced too manyThomas Willingham2014-04-121-2/+2
| | * | | | Revert to prepare_text, use bbcode only for withThomas Willingham2014-04-121-15/+15
| * | | | | we seem to have lost any install text mentioning that subdirs and alternate p...friendica2014-04-121-0/+3
| |/ / / /
* | | | | handle new tag declarationsfriendica2014-04-121-1/+1
* | | | | add forum mode to tag handlingfriendica2014-04-121-2/+9
* | | | | this is looking better, call the forum version of a tag "foobar network", bes...friendica2014-04-122-9/+6
* | | | | use icons for identificationfriendica2014-04-112-3/+8
* | | | | not quite right but I need to check it in so I can switch branchesfriendica2014-04-111-2/+2
* | | | | the auto-complete partfriendica2014-04-111-1/+14
* | | | | no this is the way to do itfriendica2014-04-111-2/+2
* | | | | Use @+ to tag a forum and also restrict the post to the forum, this leaves @!...friendica2014-04-111-2/+2
|/ / / /
* | | | via Mario: default channel permissions not working on channel pagefriendica2014-04-111-6/+11
* | | | make sure we can find that functionfriendica2014-04-111-0/+1
* | | | we also need a loop breakerfriendica2014-04-111-0/+6
* | | | Merge pull request #405 from beardy-unixer/masterRedMatrix2014-04-124-21/+18
|\| | |
| * | | Never set background or color unless you set both. If this is neededThomas Willingham2014-04-111-1/+0
| * | | Don't count deleted channels when figuring out where to send a user on login.Thomas Willingham2014-04-111-2/+3
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-23 23:26:58 +0000