| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge from upstream | tuscanhobbit | 2014-09-28 | 14 | -156/+453 |
| |\ | |||||
| | * | Merge branch 'master' of https://github.com/friendica/red | marijus | 2014-09-28 | 1 | -2/+50 |
| | |\ | |||||
| | | * | Merge pull request #604 from tuscanhobbit/dev | RedMatrix | 2014-09-29 | 1 | -2/+50 |
| | | |\ | | | | | | | | | Statistics copied into siteinfo/json | ||||
| | | | * | added statistics to siteinfo json | tuscanhobbit | 2014-09-28 | 1 | -2/+50 |
| | | | | | |||||
| | * | | | some more work on photos | marijus | 2014-09-28 | 4 | -14/+29 |
| | |/ / | |||||
| | * | | BBCode - $1 wrote doesn't make sense as a spoiler. $1 spoiler does. | Thomas Willingham | 2014-09-28 | 1 | -1/+1 |
| | | | | |||||
| | * | | Merge branch 'master' of https://github.com/friendica/red | marijus | 2014-09-27 | 4 | -106/+338 |
| | |\ \ | |||||
| | | * \ | Merge https://github.com/friendica/red into pending_merge | friendica | 2014-09-27 | 1 | -105/+269 |
| | | |\ \ | |||||
| | | | * \ | Merge pull request #603 from dawnbreak/docu | RedMatrix | 2014-09-27 | 1 | -105/+269 |
| | | | |\ \ | | | | | | | | | | | | | Some documentation for include/config.php. | ||||
| | | | | * | | Some documentation of include/config.php. | Klaus Weidenbach | 2014-09-26 | 1 | -105/+269 |
| | | | |/ / | | | | | | | | | | | | | | | | | | | | | I hope my guesses are not completely wrong, anyway please take look not that I tell complete bullshit. | ||||
| | | * | | | provide backup copy of post for diaspora reshare and re-fetch | friendica | 2014-09-27 | 1 | -0/+52 |
| | | | | | | |||||
| | | * | | | Merge https://github.com/friendica/red into pending_merge | friendica | 2014-09-27 | 9 | -97/+88 |
| | | |\| | | |||||
| | | * | | | some background work for import/export of things and liked things/profiles | friendica | 2014-09-27 | 2 | -1/+17 |
| | | | | | | |||||
| | * | | | | more css shifting | marijus | 2014-09-27 | 3 | -16/+17 |
| | | |/ / | |/| | | |||||
| | * | | | upload first but not inside another {{if}} | marijus | 2014-09-26 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | upload should be first | marijus | 2014-09-26 | 1 | -3/+3 |
| | | | | | |||||
| | * | | | fix blockquote | marijus | 2014-09-26 | 4 | -16/+17 |
| | | | | | |||||
| | * | | | So much so, in fact, that I didn't even notice the typo. | Thomas Willingham | 2014-09-26 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | Minor doco. Add some clarity - that had me scratching my head. | Thomas Willingham | 2014-09-26 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Merge from origin | tuscanhobbit | 2014-09-28 | 83 | -1956/+2370 |
| |\ \ \ \ | | |_|/ | |/| | | |||||
| | * | | | Rebase from upstream | Paolo Tacconi | 2014-09-26 | 67 | -1246/+1444 |
| | |\| | | |||||
| | | * | | move some css to the right place | marijus | 2014-09-26 | 3 | -12/+13 |
| | | | | | |||||
| | | * | | some more work on photos - work in progress | marijus | 2014-09-26 | 6 | -84/+73 |
| | | |/ | |||||
| | | * | doc updates, clean up buttons on PM edit template to match other edit buttons | friendica | 2014-09-26 | 55 | -1147/+1274 |
| | | | | |||||
| | | * | optionally include wall items (posts) in import/export | friendica | 2014-09-25 | 6 | -9/+90 |
| | | | | |||||
| | | * | Typo | Thomas Willingham | 2014-09-25 | 1 | -1/+1 |
| | | | | |||||
| | * | | Rebase from upstream | Paolo Tacconi | 2014-09-25 | 123 | -2915/+4795 |
| | |\| | |||||
| | | * | constrain viewsrc colorbox to 80% of the current page size. It gets messy ↵ | friendica | 2014-09-24 | 1 | -1/+1 |
| | | | | | | | | | | | | | scrolling to the right for days to find the close button. | ||||
| | | * | if no rss/atom element author, use feed level contact | friendica | 2014-09-24 | 1 | -7/+11 |
| | | | | |||||
| | | * | make it the default | friendica | 2014-09-24 | 1 | -21/+20 |
| | | | | |||||
| | | * | one step closer | friendica | 2014-09-24 | 1 | -1/+3 |
| | | | | |||||
| | | * | more testing | friendica | 2014-09-24 | 1 | -3/+18 |
| | | | | |||||
| | | * | just an experiment - don't do anything with this until I'm finished with it. | friendica | 2014-09-24 | 2 | -1/+10 |
| | | | | |||||
| | | * | Merge https://github.com/friendica/red into pending_merge | friendica | 2014-09-23 | 1 | -632/+721 |
| | | |\ | |||||
| | | | * | Merge pull request #601 from solstag/master | RedMatrix | 2014-09-24 | 1 | -632/+721 |
| | | | |\ | | | | | | | | | | | update pt-br translation | ||||
| | | | | * | update pt-br translation | Alexandre Hannud Abdo | 2014-09-22 | 1 | -632/+721 |
| | | | | | | |||||
| | | * | | | fix url mismatches of a single trailing slash for feed author/owner ↵ | friendica | 2014-09-23 | 4 | -15/+10 |
| | | |/ / | | | | | | | | | | | | | comparisons; update diaspora_compat | ||||
| | | * | | Merge https://github.com/friendica/red into pending_merge | friendica | 2014-09-23 | 1 | -3/+8 |
| | | |\ \ | |||||
| | | | * \ | Merge pull request #602 from zzottel/master | zzottel | 2014-09-23 | 1 | -3/+8 |
| | | | |\ \ | | | | | | | | | | | | | update German main help page | ||||
| | | | | * | | update German main help page | zottel | 2014-09-23 | 1 | -3/+8 |
| | | | |/ / | |||||
| | | * / / | diaspora private mail seems to work now - but there's an obfuscation leak ↵ | friendica | 2014-09-23 | 3 | -11/+14 |
| | | |/ / | | | | | | | | | | | | | via the conversation structure that needs to be dealt with. | ||||
| | | * | | d* little fixes | friendica | 2014-09-23 | 1 | -10/+4 |
| | | | | | |||||
| | | * | | d* PM cont. | friendica | 2014-09-23 | 3 | -4/+11 |
| | | | | | |||||
| | | * | | more work on d* private messages | friendica | 2014-09-23 | 3 | -9/+78 |
| | | | | | |||||
| | | * | | trying to call mod/magic on rss resources - which have no hub | friendica | 2014-09-22 | 2 | -5/+9 |
| | | | | | |||||
| | | * | | better way to deal with effective_uid | friendica | 2014-09-22 | 3 | -12/+12 |
| | | | | | |||||
| | | * | | make discover items interactive | friendica | 2014-09-22 | 5 | -11/+30 |
| | | | | | |||||
| | | * | | found the sucker | friendica | 2014-09-22 | 2 | -2/+4 |
| | | |/ | |||||
| * | | | Merge from origin | tuscanhobbit | 2014-09-22 | 0 | -0/+0 |
| |\| | | |||||
| | * | | Merge pull request #3 from friendica/master | Paolo T | 2014-09-18 | 41 | -205/+5638 |
| | |\ \ | | | | | | | | | Merge from upstream | ||||
 |
index : volse-hubzilla.git | |
| Volse Hubzilla -- soft fork of main Hubzilla core for Volse | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |