Commit Graph

15379 Commits

Author SHA1 Message Date
redmatrix 7fa944ed95 don't spit out sabre xml on permission denied exceptions, just provide a 401 2015-12-10 15:13:10 -08:00
redmatrix 2340092008 Merge https://github.com/redmatrix/hubzilla into pending_merge 2015-12-10 14:44:37 -08:00
jeroenpraat 6cd3296c08 Missing underscores in doc 2015-12-10 23:32:25 +01:00
redmatrix 8e1e301764 refactor a few more redundant returns 2015-12-09 21:03:29 -08:00
redmatrix bd37f59829 simplify magic-auth - a lot... Would be even simpler if we didn't need to 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. 2015-12-09 20:51:00 -08:00
redmatrix 72edc9cd6c start working on the singleton setting 2015-12-09 18:30:30 -08:00
redmatrix 93123e1fa8 Merge https://github.com/redmatrix/hubzilla into pending_merge 2015-12-09 14:56:27 -08:00
redmatrix 4b6dcbb057 provide paths for include files 2015-12-09 14:56:08 -08:00
jeroenpraat 47f7165b07 Some work on the login, register and default home page. Mostly neatly centering things on different viewport widths. Bluegrid schema updated. 2015-12-09 23:41:37 +01:00
redmatrix ae2c0e6552 Merge https://github.com/redmatrix/hubzilla into pending_merge 2015-12-09 11:51:55 -08:00
redmatrix 200eabe052 add empty arg 2015-12-09 11:51:31 -08:00
redmatrix 5042200492 Merge pull request #212 from msooon/master
Let’s Encrypt support
2015-12-10 06:24:30 +11:00
jeroenpraat 2e73e6bfb6 Fix #109. 2015-12-09 14:37:14 +01:00
msooon c1d10bbbcb Merge pull request #1 from msooon/Lets-encrypt-support
Let’s Encrypt added
2015-12-09 12:21:17 +01:00
msooon 746acc21f7 Let’s Encrypt added 2015-12-09 10:54:48 +01:00
msooon f5226a748f Let’s Encrypt added 2015-12-09 10:48:41 +01:00
redmatrix 0f4ceedbb4 remove duplicated code 2015-12-08 20:47:55 -08:00
redmatrix 656e5fd052 use killme() instead of die() so that any sessions are closed cleanly. 2015-12-08 20:42:46 -08:00
redmatrix 5735cad457 remove extra debug logging and ensure we don't try to authenticate without a hubloc 2015-12-08 19:43:49 -08:00
redmatrix 648f972cf0 Merge https://github.com/redmatrix/hubzilla into pending_merge 2015-12-08 18:32:05 -08:00
redmatrix baab9b6fbc more libzot stuff 2015-12-08 18:31:33 -08:00
jeroenpraat 60b0f9af90 Merge branch 'master' of https://github.com/redmatrix/hubzilla 2015-12-09 01:39:20 +01:00
jeroenpraat 9d04406f9a First part of fix for issue #109 2015-12-09 01:39:02 +01:00
redmatrix 29ac533cc9 remove some unused stuff 2015-12-08 16:32:06 -08:00
redmatrix 79340c5147 change to fallback server list 2015-12-08 11:08:00 -08:00
redmatrix b9f5076cfc move the diaspora templates out of core (except for diaspora_vcard, which is still stuck here for the present time) 2015-12-07 19:17:40 -08:00
redmatrix 241607e7d7 Merge https://github.com/redmatrix/hubzilla into pending_merge 2015-12-07 16:15:52 -08:00
redmatrix bd7d851758 a loose end 2015-12-07 16:11:39 -08:00
redmatrix 5de1a1ce10 extra paren removed 2015-12-07 16:06:43 -08:00
redmatrix 8b974f8f74 abstract the message handlers 2015-12-07 16:01:54 -08:00
jeroenpraat 96d94551f9 update es+nl 2015-12-07 21:10:36 +01:00
Mario Vavti ba8d9c0f0b Merge branch 'master' of https://github.com/redmatrix/hubzilla 2015-12-07 20:28:51 +01:00
Mario Vavti 68cbebe1a5 mod_mitem.js is obsolete 2015-12-07 20:28:17 +01:00
Mario Vavti 0174cb10ae fix issue #210 2015-12-07 19:11:32 +01:00
Mario Vavti 293df6308c some style.css janitor work 2015-12-07 18:57:03 +01:00
Mario Vavti af29822f04 override bs default margin 2015-12-07 15:45:21 +01:00
Mario Vavti 0df4f9c114 change album_id logic to make it work with ajax calls 2015-12-07 13:27:35 +01:00
Mario Vavti 69c9f4588c make justify gallery work with more than one albums per page (eg album widget) 2015-12-07 12:13:51 +01:00
redmatrix 53627c89a7 Merge branch 'dev' 2015-12-06 20:50:02 -08:00
redmatrix f7f0d2b265 provide plugin hooks for blacklist checking functions. 2015-12-06 20:45:21 -08:00
redmatrix 2d799f2c11 remove duplicated code 2015-12-06 19:59:46 -08:00
redmatrix aa5b7eb98a minor optimisation 2015-12-06 19:48:46 -08:00
redmatrix 1c22e8ae7e whitespace 2015-12-06 19:32:39 -08:00
redmatrix 4d301bc5a6 comment order 2015-12-06 19:29:01 -08:00
redmatrix 4ccd9ae6da start of v4 2015-12-06 19:16:38 -08:00
Mario Vavti c8c9916b59 Merge branch 'master' of https://github.com/redmatrix/hubzilla 2015-12-07 00:01:03 +01:00
Mario Vavti 5490919557 css fixes for blockquote and code (use same padding) 2015-12-07 00:00:47 +01:00
redmatrix 3f920da413 update error 2015-12-06 14:25:47 -08:00
redmatrix 2393db3943 Merge branch 'dev' 2015-12-06 14:24:18 -08:00
redmatrix a88ec1b1af Merge https://github.com/redmatrix/hubzilla into pending_merge 2015-12-06 14:22:55 -08:00