aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2015-12-1451-3337/+3139
|\
| * revert include/photos.php:L380redmatrix2015-12-142-2/+2
| |
| * more work on api media uploadsredmatrix2015-12-134-20/+37
| |
| * Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2015-12-135-1518/+1511
| |\
| | * Typosjeroenpraat2015-12-121-1/+1
| | |
| | * That script is taken from someone else without any contribution ↵jeroenpraat2015-12-121-14/+3
| | | | | | | | | | | | (http://blog.strictly-software.com/2013/07/apache-performance-tuning-bash-script.html). Also the English is very bad. Anyway, I've replaced it with some general tips that all web admins should know.
| | * Merge branch 'master' of https://github.com/redmatrix/hubzillajeroenpraat2015-12-123-2/+28
| | |\
| | * | es+nl strings updatejeroenpraat2015-12-124-1504/+1508
| | | |
| * | | remove the unqualified "OAuth" namespace from the project. We need to ↵redmatrix2015-12-138-102/+103
| | |/ | |/| | | | | | | reference either OAuth1 or OAuth2.
| * | a couple of api improvementsredmatrix2015-12-112-2/+11
| | |
| * | Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2015-12-111-0/+16
| |\ \
| | * \ Merge pull request #215 from royalterra/masterredmatrix2015-12-121-0/+16
| | |\ \ | | | |/ | | |/| Add Link and extra Doc to Apache Configuration
| | | * Update INSTALL.txtroyalterra2015-12-111-0/+1
| | | | | | | | | | | | Add Link to ApacheTune for configure mod Prefork
| | | * Update INSTALL.txtroyalterra2015-12-111-0/+15
| | | |
| | | * Merge pull request #1 from redmatrix/masterroyalterra2015-12-11286-47204/+49251
| | | |\ | | | | | | | | | | merge branches
| * | | | add deprecated update_with_media endpointredmatrix2015-12-111-0/+1
| |/ / /
| * | / incorrect obj_type on several itemsredmatrix2015-12-116-618/+621
| | |/ | |/|
| * | some minor cleanup - change the default of the discover tab (public stream ↵redmatrix2015-12-105-27/+28
| | | | | | | | | | | | access)
| * | some major cleanup of api authentication stuff - still needs much more and ↵redmatrix2015-12-103-114/+109
| | | | | | | | | | | | this still may not solve #206
| * | don't spit out sabre xml on permission denied exceptions, just provide a 401redmatrix2015-12-102-31/+13
| | |
| * | Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2015-12-101-1/+1
| |\ \
| | * | Missing underscores in docjeroenpraat2015-12-101-1/+1
| | | |
| * | | 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 ↵redmatrix2015-12-092-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 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 ↵jeroenpraat2015-12-096-21/+62
| | | | | | | | | | | | | | | | centering things on different viewport widths. Bluegrid schema updated.
| * | | 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
| | |\ \ | | | | | | | | | | Let’s Encrypt support
| | | * \ Merge pull request #1 from msooon/Lets-encrypt-supportmsooon2015-12-091-0/+30
| | | |\ \ | | | | | | | | | | | | Let’s Encrypt added
| | | | * | 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
| | | | | | | | | | | | hubloc
| * | 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
| |/ /
* | | Hubzilla textbox - promoting Hubzilla features in jot.tpl - third versionHaakon Meland Eriksen2015-12-121-1/+1
| | |
* | | Hubzilla textbox - promoting Hubzilla features in jot.tpl - third versionHaakon Meland Eriksen2015-12-111-1/+1
| | |
* | | Hubzilla textbox - promoting Hubzilla features in jot.tpl - third versionHaakon Meland Eriksen2015-12-111-4/+0
| | |
* | | Hubzilla textbox - promoting Hubzilla features in jot.tpl - third versionHaakon Meland Eriksen2015-12-101-1/+2
| | |
* | | Hubzilla textbox - promoting Hubzilla features in jot.tpl - third versionHaakon Meland Eriksen2015-12-101-1/+1
| | |
* | | Hubzilla textbox - promoting Hubzilla features in jot.tpl - third versionHaakon Meland Eriksen2015-12-091-1/+1
| | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-29 00:22:49 +0000