aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of https://github.com/habeascodice/redhabeascodice2014-10-11301-11204/+11847
|\
| * Merge remote branch 'upstream/master'habeascodice2014-10-11311-11353/+11964
| |\
| | * 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 remote branch 'upstream/master'habeascodice2014-10-0922-3380/+3802
| |\ \ \
| * \ \ \ Merge remote branch 'upstream/master'habeascodice2014-10-075-18/+29
| |\ \ \ \
| * | | | | xhabeascodice2014-10-071-0/+1
| | | | | |
| * | | | | Merge remote branch 'upstream/master'habeascodice2014-10-0766-7600/+648
| |\ \ \ \ \
| * \ \ \ \ \ Merge remote branch 'upstream/master'habeascodice2014-10-06176-1201/+12679
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge remote branch 'upstream/master'habeascodice2014-09-297-1366/+1983
| |\ \ \ \ \ \ \
* | \ \ \ \ \ \ \ Merge remote branch 'upstream/master'habeascodice2014-10-0936-182/+151
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | |
| * | | | | | | | 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
| | | | | | | | |
| * | | | | | | | allow a site to over-ride the system app list without causing git issuesfriendica2014-10-091-1/+4
| |/ / / / / / /
| * | | | | | | Merge https://github.com/friendica/red into pending_mergefriendica2014-10-091-112/+0
| |\ \ \ \ \ \ \
| | * | | | | | | remove some cruft - revert if you find any regressionsmarijus2014-10-091-112/+0
| | | | | | | | |
| * | | | | | | | return of the missing diaspora wall-to-wall attributionfriendica2014-10-092-12/+12
| |/ / / / / / /
| * | | | | | | fix css for [code]marijus2014-10-093-8/+12
| | | | | | | |
| * | | | | | | fix userinfo icon sizemarijus2014-10-091-1/+1
| | | | | | | |
| * | | | | | | more css fixesmarijus2014-10-092-0/+5
| | | | | | | |
| * | | | | | | css fixesmarijus2014-10-092-15/+14
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge remote branch 'upstream/master'habeascodice2014-10-0922-3380/+3802
|\| | | | | |
| * | | | | | try to track down intermittent wall-to-wall attribution on Diaspora exported ↵friendica2014-10-092-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | posts
| * | | | | | oembed issuesfriendica2014-10-082-9/+9
| | | | | | |
| * | | | | | change parent constructor per discussionfriendica2014-10-081-1/+1
| | | | | | |
| * | | | | | dav issuefriendica2014-10-082-2/+1
| | | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-05 06:47:27 +0000