| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge https://github.com/friendica/red into pending_merge | friendica | 2014-10-10 | 151 | -8229/+6920 |
| |\ | |||||
| | * | and more missing wrappers | marijus | 2014-10-10 | 18 | -20/+28 |
| | | | |||||
| | * | found more missing wrappers | marijus | 2014-10-10 | 2 | -2/+3 |
| | | | |||||
| | * | one more oups... | marijus | 2014-10-10 | 1 | -2/+2 |
| | | | |||||
| | * | oups... that was weired... | marijus | 2014-10-10 | 1 | -2/+1 |
| | | | |||||
| | * | This is a fix to not interfere the ongoing adding of ↵ | marijus | 2014-10-10 | 18 | -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/red | Jeroen | 2014-10-10 | 258 | -11145/+11812 |
| | |\ | |||||
| | | * | Merge pull request #632 from zzottel/master | zzottel | 2014-10-10 | 8 | -1321/+1385 |
| | | |\ | | | | | | | | | more updates to German strings plus email templates | ||||
| | | | * | more updates to German strings plus email templates | zottel | 2014-10-10 | 8 | -1321/+1385 |
| | | |/ | |||||
| | | * | Merge pull request #631 from zzottel/master | zzottel | 2014-10-10 | 102 | -1885/+0 |
| | | |\ | | | | | | | | | remove unused email template files | ||||
| | | | * | remove unused email template files | zottel | 2014-10-10 | 102 | -1885/+0 |
| | | |/ | |||||
| | | * | Merge pull request #630 from zzottel/master | zzottel | 2014-10-10 | 2 | -6172/+6675 |
| | | |\ | | | | | | | | | update to German strings | ||||
| | | | * | update to German strings | zottel | 2014-10-10 | 2 | -6172/+6675 |
| | | |/ | |||||
| | * | | Good compromise I think. Remove display setting . Set the default (light) ↵ | Jeroen | 2014-10-10 | 4 | -10/+5 |
| | | | | | | | | | | | | | schema to = , so that other schemas can still use . | ||||
| * | | | remove remnants of old signing structure - now using diaspora_meta | friendica | 2014-10-10 | 1 | -7/+0 |
| | | | | |||||
| * | | | reset route to parent route on Diaspora comments flowing upstream so they ↵ | friendica | 2014-10-10 | 1 | -3/+5 |
| | | | | | | | | | | | | | won't be rejected going downstream | ||||
| * | | | make sure diaspora comments get the correct route | friendica | 2014-10-10 | 1 | -0/+4 |
| | |/ |/| | |||||
| * | | improvement in source route checking when handling complex *upstream* ↵ | friendica | 2014-10-10 | 3 | -1056/+1095 |
| | | | | | | | | | delivery chains, which were not adequately accounted for in the earlier checkin. | ||||
| * | | doc updates | friendica | 2014-10-10 | 140 | -1903/+3809 |
| | | | |||||
| * | | allow (our own) ajax urls to pass through bbcode intact. | friendica | 2014-10-09 | 4 | -7/+11 |
| | | | |||||
| * | | Merge https://github.com/friendica/red into pending_merge | friendica | 2014-10-09 | 28 | -30/+67 |
| |\| | |||||
| | * | Added the display setting for generic (other) content wrapper. Also did set ↵ | Jeroen | 2014-10-09 | 8 | -6/+22 |
| | | | | | | | | | the default a bit lighter. See if that's ok. | ||||
| | * | Added and changed on some places div class generic-content-wrapper. And ↵ | Jeroen | 2014-10-09 | 21 | -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. | friendica | 2014-10-09 | 1 | -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 .gitignore | friendica | 2014-10-09 | 1 | -0/+3 |
| | | | |||||
| * | | allow a site to over-ride the system app list without causing git issues | friendica | 2014-10-09 | 1 | -1/+4 |
| |/ | |||||
| * | Merge https://github.com/friendica/red into pending_merge | friendica | 2014-10-09 | 1 | -112/+0 |
| |\ | |||||
| | * | remove some cruft - revert if you find any regressions | marijus | 2014-10-09 | 1 | -112/+0 |
| | | | |||||
| * | | return of the missing diaspora wall-to-wall attribution | friendica | 2014-10-09 | 2 | -12/+12 |
| |/ | |||||
| * | fix css for [code] | marijus | 2014-10-09 | 3 | -8/+12 |
| | | |||||
| * | fix userinfo icon size | marijus | 2014-10-09 | 1 | -1/+1 |
| | | |||||
| * | more css fixes | marijus | 2014-10-09 | 2 | -0/+5 |
| | | |||||
| * | css fixes | marijus | 2014-10-09 | 2 | -15/+14 |
| | | |||||
| * | try to track down intermittent wall-to-wall attribution on Diaspora exported ↵ | friendica | 2014-10-09 | 2 | -1/+5 |
| | | | | | posts | ||||
| * | oembed issues | friendica | 2014-10-08 | 2 | -9/+9 |
| | | |||||
| * | change parent constructor per discussion | friendica | 2014-10-08 | 1 | -1/+1 |
| | | |||||
| * | dav issue | friendica | 2014-10-08 | 2 | -2/+1 |
| | | |||||
| * | Merge https://github.com/friendica/red into pending_merge | friendica | 2014-10-08 | 5 | -3279/+3688 |
| |\ | |||||
| | * | Merge pull request #622 from solstag/master | RedMatrix | 2014-10-09 | 2 | -3276/+3679 |
| | |\ | | | | | | | update pt-br translation | ||||
| | | * | update pt-br translation | Alexandre Hannud Abdo | 2014-10-07 | 2 | -3276/+3679 |
| | | | | |||||
| | * | | Merge pull request #627 from tuscanhobbit/dev | RedMatrix | 2014-10-09 | 1 | -1/+3 |
| | |\ \ | | | | | | | | | The simplest way to hide hubs in statistics | ||||
| | | * | | it's probably better to return an int type in json | tuscanhobbit | 2014-10-08 | 1 | -1/+2 |
| | | | | | |||||
| | | * | | The simplest way to hide hubs in statistics | tuscanhobbit | 2014-10-08 | 1 | -1/+2 |
| | |/ / | |||||
| | * | | Small fix so search field and search buttons fit well. | Jeroen | 2014-10-08 | 1 | -1/+5 |
| | | | | |||||
| | * | | Merge branch 'master' of https://github.com/friendica/red | marijus | 2014-10-08 | 2 | -1/+10 |
| | |\ \ | |||||
| | * | | | css fix | marijus | 2014-10-08 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | disable email notifications when bulk importing content. | friendica | 2014-10-08 | 2 | -0/+37 |
| | | | | | |||||
| * | | | | don't double-encode hashtags | friendica | 2014-10-08 | 1 | -4/+4 |
| | |/ / |/| | | |||||
| * | | | soundcloud using a slightly different oembed mechanism - react accordingly | friendica | 2014-10-08 | 2 | -1/+10 |
| |/ / | |||||
| * | | Merge pull request #626 from habeascodice/master | RedMatrix | 2014-10-08 | 1 | -1/+1 |
| |\ \ | | | | | | | regex missing terminator char | ||||
 |
index : volse-hubzilla.git | |
| Volse Hubzilla -- soft fork of main Hubzilla core for Volse | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |