| Commit message (Expand) | Author | Age | Files | Lines |
* | 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 |
| | * | provide ability to create submenus | Mario Vavti | 2015-05-10 | 1 | -2/+10 |
| * | | missed one... | redmatrix | 2015-05-06 | 1 | -1/+1 |
| * | | convert ITEM_WALL from bitfield to standalone | redmatrix | 2015-05-06 | 13 | -41/+38 |
| * | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-05-06 | 1 | -1/+1 |
| |\| |
|
| | * | avoid double slash after editing layout | Mario Vavti | 2015-05-06 | 1 | -1/+1 |
| * | | for hubzilla we won't be obscuring items, only private mail, this will allow ... | redmatrix | 2015-05-05 | 1 | -8/+0 |
| * | | second pass name change | redmatrix | 2015-05-05 | 6 | -7/+7 |
| * | | first pass name change | redmatrix | 2015-05-05 | 9 | -20/+20 |
| |/ |
|
* | | Merge branch 'master' into tres | friendica | 2015-04-29 | 8 | -54/+91 |
|\| |
|
| * | disable voting in blocks, layouts and webpages | Mario Vavti | 2015-04-29 | 3 | -2/+5 |
| * | fix $noloc state in mod editwebpages | Mario Vavti | 2015-04-29 | 1 | -1/+1 |
| * | adjust placeholder naming | Mario Vavti | 2015-04-29 | 2 | -2/+3 |
| * | Provide webpage layout description | Mario Vavti | 2015-04-25 | 1 | -2/+5 |
| * | Merge https://github.com/redmatrix/redmatrix into pending_merge | friendica | 2015-04-24 | 5 | -46/+32 |
| |\ |
|
| | * | provide block titles in blocklist | Mario Vavti | 2015-04-24 | 1 | -1/+3 |
| | * | add title to element array | Mario Vavti | 2015-04-24 | 3 | -3/+5 |
| | * | there is no key named term in this array | Mario Vavti | 2015-04-24 | 1 | -1/+0 |
| | * | copy/paste typo | Mario Vavti | 2015-04-24 | 1 | -1/+1 |
| | * | webpages layout fixes | Mario Vavti | 2015-04-24 | 3 | -43/+26 |
| * | | reset route | friendica | 2015-04-24 | 1 | -1/+1 |
| * | | mod/branchtopic - move an off-topic comment to its own thread as a fresh wall... | friendica | 2015-04-24 | 1 | -0/+42 |
| |/ |
|
| * | Merge https://github.com/redmatrix/redmatrix into pending_merge | friendica | 2015-04-23 | 2 | -32/+27 |
| |\ |
|
| * | | disconnect | friendica | 2015-04-23 | 1 | -3/+5 |
* | | | Merge branch 'master' into tres | friendica | 2015-04-23 | 61 | -1388/+2323 |
|\ \ \
| | |/
| |/| |
|
| * | | webpages blocks fixes | Mario Vavti | 2015-04-23 | 2 | -32/+27 |
| |/ |
|
| * | do not show acl button if not owner | Mario Vavti | 2015-04-22 | 1 | -3/+4 |
| * | fix webpages profile_tabs | Mario Vavti | 2015-04-22 | 1 | -5/+2 |
| * | fix webpage perms | Mario Vavti | 2015-04-22 | 2 | -2/+11 |
| * | provide headings for blocks and layouts | Mario Vavti | 2015-04-22 | 3 | -8/+15 |
| * | bring lockstate to webpages | Mario Vavti | 2015-04-21 | 1 | -1/+5 |
| * | bring lockview to menu items, slightly change the way /lockview is called | Mario Vavti | 2015-04-21 | 2 | -14/+26 |