| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-06-02 | 10 | -371/+380 |
|\ |
|
| * | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-06-02 | 5 | -328/+286 |
| |\ |
|
| | * | First schema completely to the new format. git-marijus: Can you please quickl... | jeroenpraat | 2015-06-02 | 2 | -123/+237 |
| | * | update help link | Mario Vavti | 2015-06-02 | 1 | -1/+1 |
| | * | update comanche doco | Mario Vavti | 2015-06-02 | 2 | -204/+48 |
| * | | asjld work | redmatrix | 2015-06-02 | 2 | -4/+14 |
| |/ |
|
| * | move the photo and attachment permission syncing past the tag replacement so ... | redmatrix | 2015-06-01 | 2 | -35/+37 |
| * | error in directory bbcode image filter | redmatrix | 2015-05-31 | 1 | -1/+1 |
| * | bare bones ASLD | redmatrix | 2015-05-31 | 2 | -5/+44 |
* | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-05-31 | 14 | -791/+973 |
|\| |
|
| * | some basic background work for activitystreams-json-ld-2.0 conversions | redmatrix | 2015-05-31 | 3 | -1/+46 |
| * | fix unable to crop profile pic on postgres | Habeas Codice | 2015-05-30 | 1 | -1/+1 |
| * | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-05-30 | 9 | -31/+61 |
| |\ |
|
| | * | 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 |
| | * | whitespace | Mario Vavti | 2015-05-29 | 1 | -1/+1 |
| | * | add some yes/no labels and minor template fixes | Mario Vavti | 2015-05-29 | 4 | -9/+9 |
| | * | some fixes to make menu sharing work and expose it in the ui. | Mario Vavti | 2015-05-29 | 5 | -23/+30 |
| | * | show created/edited dates for menus | Mario Vavti | 2015-05-29 | 3 | -3/+22 |
| * | | strip images from directory text entries | redmatrix | 2015-05-30 | 4 | -754/+820 |
| |/ |
|
| * | 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 |
| * | untested menu element import, be aware that the menu api does not over-write ... | redmatrix | 2015-05-28 | 1 | -7/+46 |
* | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-05-28 | 10 | -2505/+4071 |
|\| |
|
| * | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-05-28 | 2 | -1021/+1031 |
| |\ |
|
| | * | Merge pull request #341 from solstag/ptbrupdate | redmatrix | 2015-05-29 | 2 | -1021/+1031 |
| | |\ |
|
| | | * | update pt_BR translation | Alexandre Hannud Abdo | 2015-05-28 | 2 | -1021/+1031 |
| | |/ |
|
| * / | add menu_created, menu_edited fields to DB | redmatrix | 2015-05-28 | 6 | -8/+65 |
| |/ |
|
| * | catch a window that wasn't yet saved when the last checkin occurred | redmatrix | 2015-05-27 | 1 | -1/+0 |
| * | menu encoding for sharing/exchange | redmatrix | 2015-05-27 | 2 | -0/+43 |
| * | 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 | 15 | -76/+356 |
|\| |
|
| * | some high-level stuff we may need for shareable menus. Also make the client r... | redmatrix | 2015-05-27 | 2 | -68/+84 |
| * | 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 | 2 | -6/+6 |
| * | | | Comments need to have some kind of routing instructions. | redmatrix | 2015-05-26 | 2 | -1/+14 |
| | |/
| |/| |
|
| * | | Update api.php | jeroenpraat | 2015-05-26 | 1 | -1/+1 |
| |/ |
|
| * | add ability to change existing channel/account service class with | Habeas Codice | 2015-05-26 | 3 | -0/+73 |
| * | placeholder for dynamic rego | redmatrix | 2015-05-25 | 2 | -10/+2 |
| * | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-05-25 | 2 | -0/+65 |
| |\ |
|
| | * | Add docs about current service class system, tiny util to make updates a | Habeas Codice | 2015-05-25 | 2 | -0/+65 |
| * | | slow but forward progress on dynamic client registration | redmatrix | 2015-05-25 | 1 | -0/+42 |
| |/ |
|
| * | some work on issue #329 | redmatrix | 2015-05-25 | 4 | -8/+11 |
* | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-05-25 | 4 | -7/+41 |
|\| |
|
| * | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-05-25 | 1 | -0/+1 |
| |\ |
|