| Commit message (Expand) | Author | Age | Files | Lines |
... | |
| * | missing row in sql query which is used further down | redmatrix | 2015-05-27 | 1 | -1/+1 |
* | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-05-27 | 2 | -58/+84 |
|\| |
|
| * | some high-level stuff we may need for shareable menus. Also make the client r... | redmatrix | 2015-05-27 | 1 | -57/+83 |
| * | some work on issue #329 | redmatrix | 2015-05-25 | 1 | -1/+1 |
* | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-05-25 | 1 | -5/+37 |
|\| |
|
| * | add toggle for ALLOWCODE to admin/channel and also fix the ability to toggle ... | redmatrix | 2015-05-25 | 1 | -5/+37 |
* | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-05-24 | 4 | -11/+16 |
|\| |
|
| * | timezone setting not saved issue #336 | redmatrix | 2015-05-24 | 1 | -1/+1 |
| * | typo and update to rfc7033 (webfinger) as well as webfinger diagnostic page | redmatrix | 2015-05-24 | 3 | -10/+15 |
* | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-05-24 | 1 | -2/+2 |
|\| |
|
| * | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-05-24 | 2 | -191/+257 |
| |\ |
|
| * | | search result heading not translatable | redmatrix | 2015-05-24 | 1 | -2/+2 |
* | | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-05-24 | 2 | -190/+258 |
|\ \ \
| | |/
| |/| |
|
| * | | Merge pull request #331 from solstag/jqueryprop | redmatrix | 2015-05-24 | 1 | -2/+2 |
| |\ \ |
|
| | * | | Fix accepting contacts by using correct jquery calls. | Alexandre Hannud Abdo | 2015-05-22 | 1 | -2/+2 |
| | |/ |
|
| * / | Add PHP's xml module check and upload limits to setup. | Klaus Weidenbach | 2015-05-24 | 1 | -189/+255 |
| |/ |
|
* | | more migration of page types | redmatrix | 2015-05-21 | 6 | -39/+37 |
* | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-05-21 | 1 | -1/+4 |
|\| |
|
| * | preserve lock on edited comments | redmatrix | 2015-05-21 | 1 | -1/+4 |
* | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-05-20 | 4 | -11/+24 |
|\| |
|
| * | check for success before updating remote id | redmatrix | 2015-05-20 | 1 | -8/+9 |
| * | PRIVACY: possible privacy leakage under a defined set of circumstances | redmatrix | 2015-05-20 | 3 | -5/+15 |
* | | merge redmatrix fix | redmatrix | 2015-05-19 | 1 | -2/+2 |
* | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-05-19 | 1 | -1/+9 |
|\| |
|
| * | issue with deleting imported design elements and re-installing them | redmatrix | 2015-05-19 | 1 | -1/+9 |
* | | mail_obscure - AES-256 is way too slow, simplify. Ideally a substitution ciph... | redmatrix | 2015-05-19 | 1 | -2/+0 |
* | | get rid of photo_flags in the code | redmatrix | 2015-05-18 | 1 | -7/+7 |
* | | bring the new photo schema into play | redmatrix | 2015-05-18 | 2 | -27/+19 |
* | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-05-18 | 2 | -4/+6 |
|\| |
|
| * | this should fix undeletable blocks and layouts | redmatrix | 2015-05-18 | 2 | -4/+6 |
* | | fix some merge errors | redmatrix | 2015-05-18 | 1 | -2/+4 |
* | | Merge branch 'master' into tres | redmatrix | 2015-05-17 | 11 | -22/+20 |
|\ \ |
|
| * | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-05-17 | 11 | -22/+20 |
| |\| |
|
| | * | more work isolating the projectname from core. | redmatrix | 2015-05-17 | 11 | -18/+18 |
* | | | Merge branch 'master' into tres | redmatrix | 2015-05-14 | 1 | -10/+15 |
|\| | |
|
| * | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-05-14 | 1 | -10/+15 |
| |\| |
|
| | * | provide default permissions ('all') for existing and newly created OAuth app ... | redmatrix | 2015-05-14 | 1 | -10/+15 |
* | | | Merge branch 'master' into tres | redmatrix | 2015-05-14 | 24 | -69/+67 |
|\| | |
|
| * | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-05-13 | 1 | -1/+1 |
| |\| |
|
| | * | remove project name dependency from most of the doc files to ease project mer... | redmatrix | 2015-05-13 | 1 | -1/+1 |
| * | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-05-13 | 5 | -7/+11 |
| |\| |
|
| | * | restrict webpage list to undeleted items | redmatrix | 2015-05-13 | 2 | -3/+3 |
| | * | product was a bad string to use because we may require it for e-commerce, and... | redmatrix | 2015-05-13 | 3 | -3/+3 |
| | * | issue #187 | redmatrix | 2015-05-12 | 1 | -1/+5 |
| * | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-05-12 | 1 | -0/+3 |
| |\| |
|
| | * | let the site admin import a record directly from the probe diagnostic | redmatrix | 2015-05-11 | 1 | -0/+3 |
| | * | missing translation | redmatrix | 2015-05-11 | 1 | -1/+1 |
| * | | missing merge conflict | redmatrix | 2015-05-11 | 1 | -6/+1 |
| * | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-05-10 | 1 | -4/+18 |
| |\| |
|
| | * | provide drop down submenu suggestions in edit mode | Mario Vavti | 2015-05-10 | 1 | -3/+4 |