aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge https://github.com/friendica/red into pending_mergefriendica2014-04-184-9/+10
|\
| * Merge branch 'master' of https://github.com/friendica/redThomas Willingham2014-04-182-2/+5
| |\
| | * This should fix the preview allignment permantly.jeroenpraat2014-04-182-2/+5
| * | We know why third party zids didn't work now, so don't use hackyThomas Willingham2014-04-182-5/+2
| |/
| * Little fix and previous fix on a different placejeroenpraat2014-04-181-3/+4
* | move create a new collection below the actual collection list again. failed e...friendica2014-04-1812-888/+898
|/
* more optimisations for discovery mode of zotfeedfriendica2014-04-171-2/+6
* Merge https://github.com/friendica/red into pending_mergefriendica2014-04-173-3/+32
|\
| * tiny fix hover preview buttonjeroenpraat2014-04-171-0/+4
| * Last 3 dropdown menus fixed for dark schema. Dark schema completed (by now).jeroenpraat2014-04-173-3/+28
* | improve zotfeed for discover channel so it will send updates to posts you've ...friendica2014-04-173-17/+16
|/
* Merge https://github.com/friendica/red into pending_mergefriendica2014-04-174-9/+58
|\
| * Merge branch 'master' of https://github.com/friendica/redjeroenpraat2014-04-1714-78/+114
| |\
| * | Dark schema: fixed code view, ACL window and previewjeroenpraat2014-04-164-9/+58
* | | This preserves the alignment work done earlier but provides a more aesthetica...friendica2014-04-174-2/+18
| |/ |/|
* | 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
| | |/
| | * 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
| * | | 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
|/ /
* | 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
| |/