aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | refactor a few more redundant returnsredmatrix2015-12-091-11/+7
|/ / /
* | | simplify magic-auth - a lot... Would be even simpler if we didn't need to pro...redmatrix2015-12-092-153/+149
* | | start working on the singleton settingredmatrix2015-12-095-7/+35
* | | Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2015-12-096-21/+62
|\ \ \
| * | | Some work on the login, register and default home page. Mostly neatly centeri...jeroenpraat2015-12-096-21/+62
* | | | provide paths for include filesredmatrix2015-12-091-5/+5
|/ / /
* | | Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2015-12-096-5/+65
|\ \ \
| * \ \ Merge pull request #212 from msooon/masterredmatrix2015-12-102-0/+60
| |\ \ \
| | * \ \ Merge pull request #1 from msooon/Lets-encrypt-supportmsooon2015-12-091-0/+30
| | |\ \ \
| | | * | | Let’s Encrypt addedmsooon2015-12-091-0/+30
| | |/ / /
| | * | | Let’s Encrypt addedmsooon2015-12-091-0/+30
| * | | | Fix #109.jeroenpraat2015-12-094-5/+5
| |/ / /
* / / / add empty argredmatrix2015-12-092-5/+5
|/ / /
* | | remove duplicated coderedmatrix2015-12-081-8/+10
* | | use killme() instead of die() so that any sessions are closed cleanly.redmatrix2015-12-081-4/+6
* | | remove extra debug logging and ensure we don't try to authenticate without a ...redmatrix2015-12-081-9/+5
* | | Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2015-12-081-17/+17
|\ \ \
| * \ \ Merge branch 'master' of https://github.com/redmatrix/hubzillajeroenpraat2015-12-097-403/+6
| |\ \ \
| * | | | First part of fix for issue #109jeroenpraat2015-12-091-17/+17
* | | | | more libzot stuffredmatrix2015-12-083-467/+527
| |/ / / |/| | |
* | | | remove some unused stuffredmatrix2015-12-085-400/+3
* | | | change to fallback server listredmatrix2015-12-082-3/+3
|/ / /
* | | move the diaspora templates out of core (except for diaspora_vcard, which is ...redmatrix2015-12-0715-194/+0
* | | Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2015-12-0713-1058/+889
|\ \ \
| * | | update es+nljeroenpraat2015-12-074-752/+854
| * | | Merge branch 'master' of https://github.com/redmatrix/hubzillaMario Vavti2015-12-071-1/+1
| |\ \ \
| | * | | fix issue #210Mario Vavti2015-12-071-1/+1
| * | | | mod_mitem.js is obsoleteMario Vavti2015-12-071-17/+0
| |/ / /
| * | | some style.css janitor workMario Vavti2015-12-072-279/+20
| * | | override bs default marginMario Vavti2015-12-071-0/+1
| * | | change album_id logic to make it work with ajax callsMario Vavti2015-12-072-3/+4
| * | | make justify gallery work with more than one albums per page (eg album widget)Mario Vavti2015-12-076-9/+12
* | | | a loose endredmatrix2015-12-071-1/+1
* | | | extra paren removedredmatrix2015-12-071-1/+1
* | | | abstract the message handlersredmatrix2015-12-076-16/+79
|/ / /
* | | Merge branch 'dev'redmatrix2015-12-0612-469/+639
|\ \ \
| * | | provide plugin hooks for blacklist checking functions.redmatrix2015-12-064-0/+40
| * | | remove duplicated coderedmatrix2015-12-062-475/+4
| * | | minor optimisationredmatrix2015-12-061-1/+0
| * | | whitespaceredmatrix2015-12-061-2/+0
| * | | comment orderredmatrix2015-12-061-2/+1
| * | | start of v4redmatrix2015-12-068-1/+606
* | | | Merge branch 'master' of https://github.com/redmatrix/hubzillaMario Vavti2015-12-078-4/+38
|\| | |
| * | | update errorredmatrix2015-12-061-1/+1
| * | | Merge branch 'dev'redmatrix2015-12-062-0/+25
| |\ \ \
| | * \ \ Merge branch 'master' into devredmatrix2015-12-057-7326/+7566
| | |\ \ \
| | * | | | use the channel blacklist for items and mail, still todo: directory and stuffredmatrix2015-12-032-0/+25
| * | | | | Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2015-12-06181-13477/+15456
| |\ \ \ \ \
| * | | | | | versionredmatrix2015-12-061-1/+1
| * | | | | | change text "Red developers" in update failed emailredmatrix2015-12-051-1/+1