aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * 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
* | | | | | only show forum tags on contact autocomplete, not in the ACL selectorfriendica2014-04-131-1/+1
* | | | | | minor alignment issuesfriendica2014-04-133-7/+14
|/ / / / /
* | | | | 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
| * | | Bring BBCode to profilesThomas Willingham2014-04-111-15/+15
| * | | Don't explicitly deny our strongest features existence.Thomas Willingham2014-04-111-3/+0
* | | | Merge pull request #404 from git-marijus/masterRedMatrix2014-04-1213-160/+123
|\ \ \ \
| * | | | bootstrapify aclselectormarijus2014-04-1113-160/+123
| |/ / /
* | | | Merge https://github.com/friendica/red into pending_mergefriendica2014-04-112-1083/+1218
|\| | |
| * | | Merge pull request #403 from tuscanhobbit/masterPaolo T2014-04-112-1083/+1218
| |\ \ \
| | * | | IT: strings updatedPaolo Tacconi2014-04-112-1083/+1218
| | * | | Merge pull request #2 from friendica/masterPaolo T2014-03-15299-11985/+14694
| | |\ \ \
* | | | | | soft revert 9bb7811 until we can look at it more closely.friendica2014-04-113-1159/+1237
* | | | | | doc updatefriendica2014-04-1122-62/+92
|/ / / / /
* | | | | add the message-id to delivery reports. This _could_ allow an enterprising de...friendica2014-04-101-14/+14
* | | | | Merge https://github.com/friendica/red into pending_mergefriendica2014-04-103-3/+32
|\ \ \ \ \
| * \ \ \ \ Merge pull request #402 from sasiflo/masterRedMatrix2014-04-113-3/+32
| |\ \ \ \ \
| | * | | | | Added some more details about why browser-valid SSL certificates must besasiflo2014-04-103-3/+32
* | | | | | | push notes widget updates to channel clones on focusout (final save). Don't d...friendica2014-04-102-3/+13
|/ / / / / /