aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* ability to generate arbitrary map with [ map=lat/lon] and also free form loca...friendica2014-12-172-0/+25
* Merge https://github.com/friendica/red into pending_mergefriendica2014-12-172-1183/+1199
|\
| * update nlJeroen2014-12-172-1183/+1199
* | make unique hub filter more robust and straight-forward so it's easier to und...friendica2014-12-171-7/+25
|/
* Merge https://github.com/friendica/red into pending_mergefriendica2014-12-172-3/+3
|\
| * fix label of preview buttonmarijus2014-12-172-2/+2
| * fix editing of postsmarijus2014-12-171-1/+1
* | critical notifier fix to make diaspora delivery work reliably again. If every...friendica2014-12-172-19/+12
|/
* essentials for creating a "block-style" list-mode page such as one might have...friendica2014-12-163-2/+22
* fix some directory anomoliesfriendica2014-12-165-6/+8
* call collapseHeight when neededfriendica2014-12-162-0/+5
* add divmore to directory entriesfriendica2014-12-163-3/+4
* Add [ map ] element to bbcode, no closing tag. Requires a map generator plugi...friendica2014-12-162-0/+22
* Merge https://github.com/friendica/red into pending_mergefriendica2014-12-162-2/+7
|\
| * Minor docoThomas Willingham2014-12-162-2/+7
* | edit and preview removed from additional features and turned into core functi...friendica2014-12-167-11/+10
* | build a channel based thread viewing link when in list_mode and when using th...friendica2014-12-162-2/+10
|/
* add Thomas's Diaspora repair script as include/fixd.php - altered so it can b...friendica2014-12-164-17/+51
* Merge https://github.com/friendica/red into pending_mergefriendica2014-12-1512-1212/+1260
|\
| * Merge branch 'master' of https://github.com/friendica/redThomas Willingham2014-12-151-1/+4
| |\
| | * Merge pull request #746 from pafcu/autofollowdocThomas Willingham2014-12-151-1/+4
| | |\
| | | * Document the auto_follow optionStefan Parviainen2014-12-151-1/+4
| * | | Issue #743Thomas Willingham2014-12-153-18/+37
| |/ /
| * | Undo accidental reversion included in last checkinThomas Willingham2014-12-151-2/+2
| * | Doco: How to write foreign doco in how to write doco doco.Thomas Willingham2014-12-152-2/+11
| * | Merge pull request #744 from pafcu/searchhelpThomas Willingham2014-12-154-4/+5
| |\ \
| | * | Add hint on how to use search boxStefan Parviainen2014-12-144-4/+5
| * | | Merge pull request #745 from tuscanhobbit/devPaolo T2014-12-152-1189/+1205
| |\ \ \
| | * | | Updated Italian stringsPaolo Tacconi2014-12-152-1189/+1205
| |/ / /
* / / / wall tagsfriendica2014-12-1510-18/+65
|/ / /
* | / don't remove obsolete hublocs that have no sitekey - it will remove all kinds...friendica2014-12-142-2/+2
| |/ |/|
* | Merge pull request #742 from pafcu/verifieditemclassThomas Willingham2014-12-143-3/+3
|\ \
| * | Add extra class to verified item iconStefan Parviainen2014-12-143-3/+3
* | | Merge pull request #741 from dawnbreak/docuThomas Willingham2014-12-145-227/+231
|\ \ \ | |/ / |/| |
| * | Add security logger to RedDAV.Klaus Weidenbach2014-12-145-227/+231
|/ /
* | Merge branch 'master' of https://github.com/friendica/redThomas Willingham2014-12-132-47/+47
|\ \
| * | Merge pull request #738 from pafcu/moreidsThomas Willingham2014-12-132-47/+47
| |\|
| | * Add some ids to nav elementsStefan Parviainen2014-12-122-47/+47
* | | Let Diaspora hublocs come back by allowing discover_by_webbie() to carry on ifThomas Willingham2014-12-131-3/+2
|/ /
* | Issue #739Thomas Willingham2014-12-132-1/+18
* | Fix WSOD on loginThomas Willingham2014-12-121-3/+5
* | Merge https://github.com/friendica/red into pending_mergefriendica2014-12-12136-10355/+13468
|\ \
| * | Update SmartyThomas Willingham2014-12-11132-10329/+13450
| * | move profile css to mod_profile and minoor fixesmarijus2014-12-114-26/+18
* | | doc updatefriendica2014-12-125-0/+721
* | | don't import to sys channel from self-censored authorsfriendica2014-12-1283-1580/+1823
|/ /
* | Merge https://github.com/friendica/red into pending_mergefriendica2014-12-1068-1166/+1313
|\ \
| * | Missing ''Thomas Willingham2014-12-101-1/+1
| * | Merge branch 'master' of https://github.com/friendica/redThomas Willingham2014-12-101-232/+228
| |\ \
| | * | some work on profile page - mostly whitespacemarijus2014-12-101-232/+228