Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | a couple of api improvements | redmatrix | 2015-12-11 | 2 | -2/+11 |
| | |||||
* | Merge https://github.com/redmatrix/hubzilla into pending_merge | redmatrix | 2015-12-11 | 1 | -0/+16 |
|\ | |||||
| * | Merge pull request #215 from royalterra/master | redmatrix | 2015-12-12 | 1 | -0/+16 |
| |\ | | | | | | | Add Link and extra Doc to Apache Configuration | ||||
| | * | Update INSTALL.txt | royalterra | 2015-12-11 | 1 | -0/+1 |
| | | | | | | | | | Add Link to ApacheTune for configure mod Prefork | ||||
| | * | Update INSTALL.txt | royalterra | 2015-12-11 | 1 | -0/+15 |
| | | | |||||
| | * | Merge pull request #1 from redmatrix/master | royalterra | 2015-12-11 | 286 | -47204/+49251 |
| | |\ | | | | | | | | | merge branches | ||||
* | | | | add deprecated update_with_media endpoint | redmatrix | 2015-12-11 | 1 | -0/+1 |
|/ / / | |||||
* | / | incorrect obj_type on several items | redmatrix | 2015-12-11 | 6 | -618/+621 |
| |/ |/| | |||||
* | | some minor cleanup - change the default of the discover tab (public stream ↵ | redmatrix | 2015-12-10 | 5 | -27/+28 |
| | | | | | | | | access) | ||||
* | | some major cleanup of api authentication stuff - still needs much more and ↵ | redmatrix | 2015-12-10 | 3 | -114/+109 |
| | | | | | | | | this still may not solve #206 | ||||
* | | don't spit out sabre xml on permission denied exceptions, just provide a 401 | redmatrix | 2015-12-10 | 2 | -31/+13 |
| | | |||||
* | | Merge https://github.com/redmatrix/hubzilla into pending_merge | redmatrix | 2015-12-10 | 1 | -1/+1 |
|\ \ | |||||
| * | | Missing underscores in doc | jeroenpraat | 2015-12-10 | 1 | -1/+1 |
| | | | |||||
* | | | refactor a few more redundant returns | redmatrix | 2015-12-09 | 1 | -11/+7 |
|/ / | |||||
* | | simplify magic-auth - a lot... Would be even simpler if we didn't need to ↵ | redmatrix | 2015-12-09 | 2 | -153/+149 |
| | | | | | | | | provide remote debugging, which takes up about half the code. But we need that because nobody wants to try and debug this shit by asking somebody at the other end to report what's in their logfile. We've tried this repeatedly. The only thing we can do is bring back all the debugging data so you can look at it yourself. | ||||
* | | start working on the singleton setting | redmatrix | 2015-12-09 | 5 | -7/+35 |
| | | |||||
* | | Merge https://github.com/redmatrix/hubzilla into pending_merge | redmatrix | 2015-12-09 | 6 | -21/+62 |
|\ \ | |||||
| * | | Some work on the login, register and default home page. Mostly neatly ↵ | jeroenpraat | 2015-12-09 | 6 | -21/+62 |
| | | | | | | | | | | | | centering things on different viewport widths. Bluegrid schema updated. | ||||
* | | | provide paths for include files | redmatrix | 2015-12-09 | 1 | -5/+5 |
|/ / | |||||
* | | Merge https://github.com/redmatrix/hubzilla into pending_merge | redmatrix | 2015-12-09 | 6 | -5/+65 |
|\ \ | |||||
| * \ | Merge pull request #212 from msooon/master | redmatrix | 2015-12-10 | 2 | -0/+60 |
| |\ \ | | | | | | | | | Let’s Encrypt support | ||||
| | * \ | Merge pull request #1 from msooon/Lets-encrypt-support | msooon | 2015-12-09 | 1 | -0/+30 |
| | |\ \ | | | | | | | | | | | Let’s Encrypt added | ||||
| | | * | | Let’s Encrypt added | msooon | 2015-12-09 | 1 | -0/+30 |
| | |/ / | |||||
| | * | | Let’s Encrypt added | msooon | 2015-12-09 | 1 | -0/+30 |
| | | | | |||||
| * | | | Fix #109. | jeroenpraat | 2015-12-09 | 4 | -5/+5 |
| |/ / | |||||
* / / | add empty arg | redmatrix | 2015-12-09 | 2 | -5/+5 |
|/ / | |||||
* | | remove duplicated code | redmatrix | 2015-12-08 | 1 | -8/+10 |
| | | |||||
* | | use killme() instead of die() so that any sessions are closed cleanly. | redmatrix | 2015-12-08 | 1 | -4/+6 |
| | | |||||
* | | remove extra debug logging and ensure we don't try to authenticate without a ↵ | redmatrix | 2015-12-08 | 1 | -9/+5 |
| | | | | | | | | hubloc | ||||
* | | Merge https://github.com/redmatrix/hubzilla into pending_merge | redmatrix | 2015-12-08 | 1 | -17/+17 |
|\ \ | |||||
| * \ | Merge branch 'master' of https://github.com/redmatrix/hubzilla | jeroenpraat | 2015-12-09 | 7 | -403/+6 |
| |\ \ | |||||
| * | | | First part of fix for issue #109 | jeroenpraat | 2015-12-09 | 1 | -17/+17 |
| | | | | |||||
* | | | | more libzot stuff | redmatrix | 2015-12-08 | 3 | -467/+527 |
| |/ / |/| | | |||||
* | | | remove some unused stuff | redmatrix | 2015-12-08 | 5 | -400/+3 |
| | | | |||||
* | | | change to fallback server list | redmatrix | 2015-12-08 | 2 | -3/+3 |
|/ / | |||||
* | | move the diaspora templates out of core (except for diaspora_vcard, which is ↵ | redmatrix | 2015-12-07 | 15 | -194/+0 |
| | | | | | | | | still stuck here for the present time) | ||||
* | | Merge https://github.com/redmatrix/hubzilla into pending_merge | redmatrix | 2015-12-07 | 13 | -1058/+889 |
|\ \ | |||||
| * | | update es+nl | jeroenpraat | 2015-12-07 | 4 | -752/+854 |
| | | | |||||
| * | | Merge branch 'master' of https://github.com/redmatrix/hubzilla | Mario Vavti | 2015-12-07 | 1 | -1/+1 |
| |\ \ | |||||
| | * | | fix issue #210 | Mario Vavti | 2015-12-07 | 1 | -1/+1 |
| | | | | |||||
| * | | | mod_mitem.js is obsolete | Mario Vavti | 2015-12-07 | 1 | -17/+0 |
| |/ / | |||||
| * | | some style.css janitor work | Mario Vavti | 2015-12-07 | 2 | -279/+20 |
| | | | |||||
| * | | override bs default margin | Mario Vavti | 2015-12-07 | 1 | -0/+1 |
| | | | |||||
| * | | change album_id logic to make it work with ajax calls | Mario Vavti | 2015-12-07 | 2 | -3/+4 |
| | | | |||||
| * | | make justify gallery work with more than one albums per page (eg album widget) | Mario Vavti | 2015-12-07 | 6 | -9/+12 |
| | | | |||||
* | | | a loose end | redmatrix | 2015-12-07 | 1 | -1/+1 |
| | | | |||||
* | | | extra paren removed | redmatrix | 2015-12-07 | 1 | -1/+1 |
| | | | |||||
* | | | abstract the message handlers | redmatrix | 2015-12-07 | 6 | -16/+79 |
|/ / | |||||
* | | Merge branch 'dev' | redmatrix | 2015-12-06 | 12 | -469/+639 |
|\ \ | |||||
| * | | provide plugin hooks for blacklist checking functions. | redmatrix | 2015-12-06 | 4 | -0/+40 |
| | | |