| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-06-09 | 8 | -239/+251 |
|\ |
|
| * | add nomadic identities as webfinger aliases | redmatrix | 2015-06-09 | 1 | -1/+10 |
| * | provide a mechanism for loading the frontpage without redirecting. | redmatrix | 2015-06-08 | 1 | -0/+5 |
| * | remove debugging | redmatrix | 2015-06-08 | 1 | -3/+0 |
| * | add site_dead flag to prevent delivery to dead sites. Allow sys channel webpa... | redmatrix | 2015-06-08 | 2 | -6/+16 |
| * | magic auth issues on dreamhost | redmatrix | 2015-06-07 | 2 | -3/+6 |
| * | make sure these are included | redmatrix | 2015-06-07 | 2 | -0/+189 |
| * | more frontpage tweaks | redmatrix | 2015-06-07 | 2 | -3/+3 |
| * | reverse logic of homepage login setting | redmatrix | 2015-06-07 | 2 | -4/+8 |
| * | frontpage tweaks | redmatrix | 2015-06-07 | 2 | -5/+10 |
| * | frontpage changes | redmatrix | 2015-06-07 | 1 | -229/+19 |
* | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-06-06 | 3 | -1/+6 |
|\| |
|
| * | Added translatable strings to the Display Settings page and refreshed util/me... | jeroenpraat | 2015-06-06 | 1 | -0/+3 |
| * | use the right webpage layout for an installed webpage if it exists | Mario Vavti | 2015-06-04 | 2 | -1/+3 |
* | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-06-02 | 3 | -36/+37 |
|\| |
|
| * | update help link | Mario Vavti | 2015-06-02 | 1 | -1/+1 |
| * | move the photo and attachment permission syncing past the tag replacement so ... | redmatrix | 2015-06-01 | 1 | -34/+36 |
| * | bare bones ASLD | redmatrix | 2015-05-31 | 1 | -1/+0 |
* | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-05-31 | 5 | -15/+60 |
|\| |
|
| * | 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 | 3 | -12/+18 |
| |\ |
|
| | * | whitespace | Mario Vavti | 2015-05-29 | 1 | -1/+1 |
| | * | add some yes/no labels and minor template fixes | Mario Vavti | 2015-05-29 | 2 | -6/+6 |
| | * | some fixes to make menu sharing work and expose it in the ui. | Mario Vavti | 2015-05-29 | 1 | -5/+9 |
| | * | show created/edited dates for menus | Mario Vavti | 2015-05-29 | 1 | -0/+2 |
| * | | strip images from directory text entries | redmatrix | 2015-05-30 | 1 | -1/+1 |
| |/ |
|
| * | 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 | 2 | -0/+4 |
|\| |
|
| * | 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 | 1 | -0/+4 |
| * | 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 |
|\| |
|