| Commit message (Expand) | Author | Age | Files | Lines |
* | isolate the os_storage flag | redmatrix | 2015-06-13 | 3 | -23/+29 |
* | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-06-13 | 1 | -2/+10 |
|\ |
|
* | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-06-11 | 1 | -0/+4 |
|\| |
|
| * | don't provide a connect button on the sys channel profile sidebar | redmatrix | 2015-06-11 | 1 | -0/+4 |
* | | make cloud work again | redmatrix | 2015-06-11 | 5 | -6/+6 |
* | | start on the DAV/photos merger | redmatrix | 2015-06-11 | 1 | -12/+30 |
* | | more work on items | redmatrix | 2015-06-11 | 2 | -19/+90 |
|\| |
|
| * | hubzilla compatibility function | redmatrix | 2015-06-11 | 1 | -0/+14 |
* | | the hubzilla version of this function | redmatrix | 2015-06-11 | 1 | -0/+12 |
* | | diaspora disallowed by default | redmatrix | 2015-06-10 | 2 | -6/+0 |
* | | more work on item table optimisation | redmatrix | 2015-06-10 | 4 | -37/+59 |
* | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-06-10 | 1 | -28/+0 |
|\| |
|
| * | retire old Friendica RINO encryption functions | redmatrix | 2015-06-09 | 1 | -28/+0 |
* | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-06-09 | 2 | -0/+28 |
|\| |
|
| * | toggle diaspora protocol on a per-channel level in addition to the existing p... | redmatrix | 2015-06-09 | 2 | -0/+28 |
* | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-06-09 | 1 | -8/+17 |
|\| |
|
| * | add site_dead flag to prevent delivery to dead sites. Allow sys channel webpa... | redmatrix | 2015-06-08 | 1 | -8/+17 |
* | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-06-02 | 2 | -7/+57 |
|\| |
|
| * | asjld work | redmatrix | 2015-06-02 | 1 | -3/+13 |
| * | error in directory bbcode image filter | redmatrix | 2015-05-31 | 1 | -1/+1 |
| * | bare bones ASLD | redmatrix | 2015-05-31 | 1 | -4/+44 |
* | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-05-31 | 3 | -13/+70 |
|\| |
|
| * | some basic background work for activitystreams-json-ld-2.0 conversions | redmatrix | 2015-05-31 | 2 | -0/+45 |
| * | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-05-30 | 2 | -9/+14 |
| |\ |
|
| | * | should not redefine $var in the function call | Mario Vavti | 2015-05-29 | 1 | -1/+1 |
| | * | fix menu render for menu item edit - menu preview | Mario Vavti | 2015-05-29 | 1 | -1/+5 |
| | * | some fixes to make menu sharing work and expose it in the ui. | Mario Vavti | 2015-05-29 | 2 | -6/+7 |
| * | | strip images from directory text entries | redmatrix | 2015-05-30 | 1 | -0/+5 |
| |/ |
|
| * | there was a reason we included that file | redmatrix | 2015-05-28 | 1 | -3/+3 |
| * | parse error | redmatrix | 2015-05-28 | 1 | -2/+2 |
| * | another case of committing with unsaved changes in a second window | redmatrix | 2015-05-28 | 1 | -2/+4 |
* | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-05-28 | 1 | -4/+70 |
|\| |
|
| * | add menu_created, menu_edited fields to DB | redmatrix | 2015-05-28 | 1 | -4/+31 |
| * | menu encoding for sharing/exchange | redmatrix | 2015-05-27 | 1 | -0/+39 |
* | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-05-27 | 8 | -15/+130 |
|\| |
|
| * | some high-level stuff we may need for shareable menus. Also make the client r... | redmatrix | 2015-05-27 | 1 | -11/+1 |
| * | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-05-27 | 2 | -0/+81 |
| |\ |
|
| | * | Merge branch 'master' of https://github.com/redmatrix/redmatrix | Mario Vavti | 2015-05-27 | 1 | -1/+1 |
| | |\ |
|
| | * | | define some custom attributes and html5 elements for htmlpurifier | Mario Vavti | 2015-05-27 | 1 | -0/+66 |
| | * | | make it possible to include menus in blocks - this will only work in html blo... | Mario Vavti | 2015-05-27 | 1 | -0/+15 |
| * | | | fix for forked thread on diaspora | redmatrix | 2015-05-27 | 2 | -11/+5 |
| * | | | revert for now | redmatrix | 2015-05-27 | 1 | -5/+5 |
| * | | | Comments need to have some kind of routing instructions. | redmatrix | 2015-05-26 | 1 | -0/+13 |
| | |/
| |/| |
|
| * | | Update api.php | jeroenpraat | 2015-05-26 | 1 | -1/+1 |
| |/ |
|
| * | placeholder for dynamic rego | redmatrix | 2015-05-25 | 2 | -10/+2 |
| * | slow but forward progress on dynamic client registration | redmatrix | 2015-05-25 | 1 | -0/+42 |
| * | some work on issue #329 | redmatrix | 2015-05-25 | 3 | -7/+10 |
* | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-05-24 | 4 | -18/+27 |
|\| |
|
| * | one more | Habeas Codice | 2015-05-24 | 1 | -2/+2 |
| * | avoid db compatibility issues | Habeas Codice | 2015-05-24 | 1 | -2/+2 |