aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* When you delete something in /cloud stay in the right folder.Klaus Weidenbach2014-10-147-200/+251
| | | | | | | When you deleted a file in /cloud you was always jumped back to /cloud/[channel], now you will stay in the parent folder. Some more doxygen documentation. Removed duplicate data from logging output and reduced logging in RedDAV in general.
* Merge pull request #637 from tuscanhobbit/devRedMatrix2014-10-141-0/+3
|\ | | | | one more hidden config option
| * one more hidden configtuscanhobbit2014-10-131-0/+3
| |
| * Merge from mastertuscanhobbit2014-10-1317-987/+1048
| |\
| | * Merge from origintuscanhobbit2014-10-130-0/+0
| |/| |/| |
* | | Merge branch 'master' of https://github.com/friendica/redmarijus2014-10-132-3/+3
|\ \ \
| * | | tinymce still seems to be referenced. Can't quite get rid of it.friendica2014-10-131-1/+1
| | | |
| * | | Merge https://github.com/friendica/red into pending_mergefriendica2014-10-131-0/+2
| |\ \ \
| * | | | bring back PM upload functionality and why oh why are we still loading tinymce?friendica2014-10-133-4/+4
| | | | |
* | | | | really fix connedit > collection > checkboxmarijus2014-10-133-13/+5
| |/ / / |/| | |
* | | | fix connedit > collection > checkbox position also for webkit - this will ↵marijus2014-10-131-0/+2
|/ / / | | | | | | | | | need a better solution though
* | | context checkfriendica2014-10-121-1/+1
| | |
* | | diaspora_send_status() - recalculate markdown translation to pickup any ↵friendica2014-10-122-3/+3
| | | | | | | | | | | | later message changes after original submission like wall-to-wall attributions for instance. Normally this would've come from our cached version which was stored prior to tag_deliver being run and therefore isn't yet aware that wall-to-wall status may have changed after delivery.
* | | Merge https://github.com/friendica/red into pending_mergefriendica2014-10-126-928/+985
|\ \ \
| * \ \ Merge pull request #636 from dawnbreak/RedDAVRedMatrix2014-10-136-928/+985
| |\ \ \ | | | | | | | | | | Moved classes from reddav.php into own files.
| | * | | A fix, but I have no case to verify.Klaus2014-10-121-2/+2
| | | | | | | | | | | | | | | I could not find out under which conditions this is relevant and therefore have no test case, but it must be of instance RedDAV\RedFile.
| | * | | Moved classes from reddav.php into own files.Klaus Weidenbach2014-10-126-926/+983
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Finished moving classes out from include/reddav.php into own files. Also continued with namespace for RedDAV. Improved some docs and added some todos and fixmes.
* | | | | bit of cleanup of hidden_configs. This is a start - we've got hundreds more.friendica2014-10-121-37/+30
|/ / / /
* | | | Merge https://github.com/friendica/red into pending_mergefriendica2014-10-122-7/+15
|\ \ \ \
| * | | | fix connedit > collection > checkbox positionmarijus2014-10-122-7/+15
| | | | |
* | | | | cleanup of sync_locations and better logging. There was one significant code ↵friendica2014-10-121-7/+11
|/ / / / | | | | | | | | | | | | change but it is unrelated to current issues, basically if no primary was set we were setting everything as primary.
* / / / content deletion issuefriendica2014-10-122-2/+7
|/ / /
| * | Merge pull request #6 from tuscanhobbit/masterPaolo T2014-10-12323-14648/+15815
| |\| | | | | | | Fast forward local hub
| | * Merge pull request #4 from friendica/masterPaolo T2014-10-12323-14649/+15818
| | |\ | |_|/ |/| | Fast forward local hub
* | | Some more previously undocumented configs.Thomas Willingham2014-10-111-0/+49
| | |
* | | Show tag in siteinfo. Not useful for us, quite useful for admins.Thomas Willingham2014-10-112-1/+7
| | |
* | | FFS, another oopsThomas Willingham2014-10-111-2/+0
| | |
* | | Fix webpages. Sycning between too many codebases...Thomas Willingham2014-10-111-1/+3
| | |
* | | Also that doesn't work anymore - prettyPhoto relicThomas Willingham2014-10-111-1/+1
| | |
* | | Give Redbasic the -styled backThomas Willingham2014-10-111-1/+1
| | |
* | | Merge branch 'master' of https://github.com/friendica/redThomas Willingham2014-10-111-1/+2
|\ \ \
| * | | +1Jeroen2014-10-111-1/+2
| | | |
* | | | Unbreak webpagesThomas Willingham2014-10-112-3/+2
|/ / /
* | | Doco: Hidden configs - you won't believe what happens next!Thomas Willingham2014-10-111-0/+58
| | | | | | | | | | | | | | | Covered the P's, still need to do the X and just the configs. Work in progress, so not linked from the index yet.
* | | fix diaspora reshare tagsfriendica2014-10-102-1/+3
| | |
* | | ah yes, the redundant relay run was for the benefit of wall-to-wall posts ↵friendica2014-10-101-2/+1
| | | | | | | | | | | | issue #633
* | | missing source route after editfriendica2014-10-102-1/+3
| | |
* | | Merge https://github.com/friendica/red into pending_mergefriendica2014-10-10151-8229/+6920
|\ \ \
| * | | and more missing wrappersmarijus2014-10-1018-20/+28
| | | |
| * | | found more missing wrappersmarijus2014-10-102-2/+3
| | | |
| * | | one more oups...marijus2014-10-101-2/+2
| | | |
| * | | oups... that was weired...marijus2014-10-101-2/+1
| | | |
| * | | This is a fix to not interfere the ongoing adding of ↵marijus2014-10-1018-19/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | .generic-content-wrapper with the ongoing styling of redbasic theme. adding of .generic-content-wrapper is needed and useful for derivative themes but it should not contain any styling information for redbasic theme. therefor i added .generic-content-wrapper-styled as a quickfix for spots where redbasic is not finished yet. Sidenote: please avoid opening a div in one *.tpl and close it in another or (even worse) open a div in a *.tpl and close it in an already templatified mod/*.php. This will really make the code and templates very, very confusing.
| * | | Merge branch 'master' of https://github.com/friendica/redJeroen2014-10-10258-11145/+11812
| |\ \ \
| | * \ \ Merge pull request #632 from zzottel/masterzzottel2014-10-108-1321/+1385
| | |\ \ \ | | | | | | | | | | | | more updates to German strings plus email templates
| | | * | | more updates to German strings plus email templateszottel2014-10-108-1321/+1385
| | |/ / /
| | * | | Merge pull request #631 from zzottel/masterzzottel2014-10-10102-1885/+0
| | |\ \ \ | | | | | | | | | | | | remove unused email template files
| | | * | | remove unused email template fileszottel2014-10-10102-1885/+0
| | |/ / /
| | * | | Merge pull request #630 from zzottel/masterzzottel2014-10-102-6172/+6675
| | |\ \ \ | | | | | | | | | | | | update to German strings
| | | * | | update to German stringszottel2014-10-102-6172/+6675
| | |/ / /