aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of https://github.com/friendica/redjeroenpraat2014-04-1714-78/+114
|\
| * saved search adjustmentsfriendica2014-04-162-13/+9
| * a few more alignment issuesfriendica2014-04-163-13/+16
| * clean up the group selector on the connedit pagefriendica2014-04-161-1/+4
| * Lots of positional changes on sidebar menus - reduce indented marginsfriendica2014-04-1610-59/+351
| |\
| | * Merge https://github.com/friendica/red into pending_mergefriendica2014-04-164-39/+313
| | |\
| | | * Doc - missing closing tagThomas Willingham2014-04-171-1/+1
| | | * Merge pull request #415 from encyclomundi/masterThomas Willingham2014-04-171-0/+4
| | | |\
| | | | * added "network" as another user group for davfsCharles2014-04-161-0/+4
| | | |/
| | * | bug fixes after widget cleanupfriendica2014-04-162-3/+3
| | * | button cleanup directory pagefriendica2014-04-163-14/+18
| | * | rev updatefriendica2014-04-161-1/+1
| * | | fixing widgetsfriendica2014-04-165-34/+32
| * | | this makes conversations look a lot betterfriendica2014-04-161-1/+8
| * | | first cut - straighten out the marginsfriendica2014-04-161-1/+8
| |/ /
* | / Dark schema: fixed code view, ACL window and previewjeroenpraat2014-04-164-9/+58
| |/ |/|
* | Doco - Add some troubleshooting for 0 byte files in Davfs2Thomas Willingham2014-04-161-1/+20
* | Merge pull request #414 from jeroenpraat/patch-2RedMatrix2014-04-163-38/+289
|\ \ | |/ |/|
| * Needed for large update dark schema and minor fixes default.jeroenpraat2014-04-151-18/+98
| * Needed for large update dark schema.jeroenpraat2014-04-151-4/+107
| * Large update dark schemajeroenpraat2014-04-151-16/+84
* | The comment submit button seems to have drifted into some strange placefriendica2014-04-151-1/+1
* | Merge https://github.com/friendica/red into pending_mergefriendica2014-04-152-10/+2
|\|
| * minor css fixmarijus2014-04-152-10/+2
* | tag anyonefriendica2014-04-154-23/+41
|/
* 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
|\
| * 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
* | | | | | 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