aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of https://github.com/friendica/redPaolo Tacconi2014-09-1533-640/+667
|\
| * this is probably better in most casesmarijus2014-09-151-1/+1
| * Merge https://github.com/friendica/red into pending_mergefriendica2014-09-140-0/+0
| |\
| | * Bugger, revert - not only a dodgy cut and paste between terminals, butThomas Willingham2014-09-151-14/+0
| | * Very, very cautiously, let a developer switch to the sys chan, ifThomas Willingham2014-09-151-0/+14
| * | allow the site to designate an admin channel that's visible to the outside wo...friendica2014-09-142-2/+9
| * | provide a way to sync locations and get rid of bogus hublocs, now implementedfriendica2014-09-145-14/+73
| |/
| * that won't work...friendica2014-09-141-1/+2
| * bb2diaspora_itemwallwall not finding author elements - inserting empty bbcodefriendica2014-09-141-0/+4
| * fix diaspora_retractionfriendica2014-09-141-7/+4
| * pull the plug on the old location sync section of import_xchan - this has now...friendica2014-09-141-168/+12
| * Merge branch 'master' of https://github.com/friendica/redThomas Willingham2014-09-151-2/+20
| |\
| | * Merge https://github.com/friendica/red into pending_mergefriendica2014-09-147-15/+21
| | |\
| | * | privacy issue - restrictive stream permission setting with a non-targetted po...friendica2014-09-141-2/+20
| * | | A bit of mod/home refactoring. This is a transient state, so it's stillThomas Willingham2014-09-151-20/+27
| | |/ | |/|
| * | Deprecate site channel. The sys channel should be doing this. Will fixThomas Willingham2014-09-152-4/+3
| * | tryout - some more adjustmentsmarijus2014-09-141-3/+1
| * | Thanks to Thomas other people see now your posts on your channel page also li...Jeroen2014-09-141-1/+1
| * | Made link post titles to source optional in display settings. Hopefully I did...Jeroen2014-09-144-3/+12
| * | tryout - fetch larger thumbnail if image gets streched over its sizemarijus2014-09-141-6/+6
| |/
| * more heavy lifting on the hubloc management and revocation infrastructure; do...friendica2014-09-143-31/+55
| * Merge https://github.com/friendica/red into pending_mergefriendica2014-09-1310-392/+32
| |\
| | * Doco - kill dupeThomas Willingham2014-09-131-105/+0
| | * Bring DB doco up to dateThomas Willingham2014-09-131-5/+22
| | * Doco - some links that got stripped at some pointThomas Willingham2014-09-131-0/+3
| | * remove this hub from fallback serversmarijus2014-09-131-2/+1
| | * Merge branch 'master' of https://github.com/friendica/redmarijus2014-09-132-216/+1
| | |\
| | | * Here, have a semi-colonThomas Willingham2014-09-131-1/+1
| | | * Only use one install fileThomas Willingham2014-09-132-216/+1
| | * | cleanup after recent changes in mod photosmarijus2014-09-133-63/+4
| | |/
| | * Merge pull request #592 from jeroenpraat/masterRedMatrix2014-09-131-1/+1
| | |\
| | | * Issue #590: Linked conversation titles to source. jeroenpraat2014-09-121-1/+1
| * | | some backend work for the remaining missing bits of mod_hubman - this is stil...friendica2014-09-134-6/+258
| |/ /
| * | log why this doesn't get executedfriendica2014-09-121-0/+2
| * | Merge https://github.com/friendica/red into pending_mergefriendica2014-09-127-468/+525
| |\ \
| | * | define justifiedGalleryActive in head.tpl to not break other pages autoloadmarijus2014-09-122-1/+2
| | * | Merge branch 'master' of https://github.com/friendica/redmarijus2014-09-121-2/+2
| | |\ \
| | | * | This is even better. Adapts better to Red user settings.Jeroen2014-09-121-2/+2
| | * | | reset testing values back to defaultmarijus2014-09-121-2/+2
| | * | | do not load next page if justifiedGallery() is not ready yetmarijus2014-09-122-4/+5
| | |/ /
| | * | H1-H6 simplified (less font sizes), remJeroen2014-09-121-0/+12
| | * | expert_mode > expertJeroen2014-09-121-1/+1
| | * | Fixed. Thanks to Thomas.Jeroen2014-09-121-4/+3
| * | | make the xchan diagnostic tool usefulfriendica2014-09-121-2/+14
| * | | doc updatesfriendica2014-09-122-0/+141
* | | | Merge pull request #2 from friendica/masterPaolo T2014-09-122-463/+506
|\ \ \ \ | | |/ / | |/| |
| * | | Merge pull request #591 from tuscanhobbit/devPaolo T2014-09-122-463/+506
|/| | |
| * | | IT localization updatedtuscanhobbit2014-09-122-463/+506
|/ / /
* / / Addon count on addon settings page (featured) doesnt work (always 0). Comment...Jeroen2014-09-121-2/+3
|/ /
* | doc updates and a couple of issues spotted in the logs (diaspora likes, feed ...friendica2014-09-1276-879/+1147