aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* bring back PM upload functionality and why oh why are we still loading tinymce?friendica2014-10-133-4/+4
|
* 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
|/
* 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
| | |/
| * | Good compromise I think. Remove display setting . Set the default (light) ↵Jeroen2014-10-104-10/+5
| | | | | | | | | | | | schema to = , so that other schemas can still use .
* | | remove remnants of old signing structure - now using diaspora_metafriendica2014-10-101-7/+0
| | |
* | | reset route to parent route on Diaspora comments flowing upstream so they ↵friendica2014-10-101-3/+5
| | | | | | | | | | | | won't be rejected going downstream
* | | make sure diaspora comments get the correct routefriendica2014-10-101-0/+4
| |/ |/|
* | improvement in source route checking when handling complex *upstream* ↵friendica2014-10-103-1056/+1095
| | | | | | | | delivery chains, which were not adequately accounted for in the earlier checkin.
* | doc updatesfriendica2014-10-10140-1903/+3809
| |
* | allow (our own) ajax urls to pass through bbcode intact.friendica2014-10-094-7/+11
| |
* | Merge https://github.com/friendica/red into pending_mergefriendica2014-10-0928-30/+67
|\|
| * Added the display setting for generic (other) content wrapper. Also did set ↵Jeroen2014-10-098-6/+22
| | | | | | | | the default a bit lighter. See if that's ok.
| * Added and changed on some places div class generic-content-wrapper. And ↵Jeroen2014-10-0921-29/+50
| | | | | | | | added to redbasic. Other thems can now also theme backgrounds of a lot of pages. I'm not completely done, but till now - this is it.
* | OK this is important. So read it carefully.friendica2014-10-091-3/+33
| | | | | | | | | | | | | | | | This checkin implements route matching of comments so that they are only accepted from the same route as the top-level post they are attached to. This way there should be no mis-match of permissions between any posts in the thread. It may not be completely compatible with comments posted in the past (though I've tried to be, there may be some minor issues). In addition it seems that relaying was invoked more often than necessary - especially when a duplicate post arrived which was not processed because the edited time hadn't changed - it still invoked relaying. This fix should improve site performance considerably for comments cross-posted to forums; which got bounced around a bit and delivered redundantly for no reason. Roll this back *only* if it causes a meltdown or comment loss is "serious" (as in OMG people are dying, make it stop!). If we can get past 24 hours without serious issue we need to get everybody onto this code. There may be some minor comment loss (mostly affecting new comments to older posts or likes of older comments) until the majority of sites have moved to the new code. It may be difficult or impossible to deliver comments to posts that pre-date the addition of source routes (April 1, 2014) to anybody but the top-level post author at his/her primary hub. We may wish to close comments on these posts, but let's see how we go before doing that.
* | add site apps directory to .gitignorefriendica2014-10-091-0/+3
| |
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-19 18:02:50 +0000