| Commit message (Expand) | Author | Age | Files | Lines |
... | |
| * | | 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 |
| * | | | Merge pull request #333 from dawnbreak/docu | redmatrix | 2015-05-24 | 2 | -258/+313 |
| |\ \ \ |
|
| | * | | | Add PHP's xml module check and upload limits to setup. | Klaus Weidenbach | 2015-05-24 | 2 | -258/+313 |
| | | |/
| | |/| |
|
| * | | | Merge pull request #332 from solstag/zotfeedcleanup | Klaus | 2015-05-24 | 1 | -3/+1 |
| |\ \ \
| | |/ /
| |/| | |
|
| | * | | Import security only when necessary, use correct variable in log | Alexandre Hannud Abdo | 2015-05-22 | 1 | -3/+1 |
| | |/ |
|
| * | | federation problem from diaspora comments relayed through red channels due to... | redmatrix | 2015-05-23 | 1 | -1/+1 |
| * | | add channel_id to local_dir_update hook | redmatrix | 2015-05-23 | 1 | -1/+1 |
| * | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-05-23 | 21 | -4/+19094 |
| |\ \ |
|
| | * | | use $a->data instead of $a->page for $content and ad another library for use ... | Mario Vavti | 2015-05-23 | 21 | -4/+19094 |
| | |/ |
|
| * / | add local_dir_update hook | redmatrix | 2015-05-23 | 3 | -523/+529 |
| |/ |
|
* | | more migration of page types | redmatrix | 2015-05-21 | 8 | -42/+40 |
* | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-05-21 | 2 | -2/+5 |
|\| |
|
| * | preserve lock on edited comments | redmatrix | 2015-05-21 | 2 | -2/+5 |
* | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-05-20 | 13 | -118/+151 |
|\| |
|
| * | cloning abook entries was broken in several ways if the target xchan wasn't a... | redmatrix | 2015-05-20 | 2 | -16/+13 |
| * | check for success before updating remote id | redmatrix | 2015-05-20 | 1 | -8/+9 |
| * | don't allow item_id to update without a valid post id | redmatrix | 2015-05-20 | 1 | -0/+5 |
| * | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-05-20 | 3 | -72/+89 |
| |\ |
|
| | * | Another update for Dutch with complete $Projectname substitutions (and channe... | jeroenpraat | 2015-05-20 | 2 | -71/+71 |
| | * | make design elements translateable | Mario Vavti | 2015-05-20 | 1 | -1/+18 |
| * | | PRIVACY: possible privacy leakage under a defined set of circumstances | redmatrix | 2015-05-20 | 8 | -26/+32 |
| |/ |
|
* | | re-arrange the html cache a bit | redmatrix | 2015-05-20 | 3 | -12/+19 |
* | | more db structure | redmatrix | 2015-05-19 | 2 | -16/+32 |
* | | add rot47 to the mix. This shouldn't affect the speed to any measurable degree. | redmatrix | 2015-05-19 | 4 | -20/+26 |
* | | 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 |
* | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-05-19 | 6 | -57/+80 |
|\| |
|
| * | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-05-19 | 6 | -108/+127 |
| |\ |
|
| | * | Merge pull request #327 from solstag/help | redmatrix | 2015-05-20 | 3 | -3/+21 |
| | |\ |
|
| | | * | Document widget creation. | Alexandre Hannud Abdo | 2015-05-19 | 2 | -1/+17 |
| | | * | Document php-xml requirement for webdav. | Alexandre Hannud Abdo | 2015-05-19 | 1 | -2/+4 |
| | * | | remove dbg code | Mario Vavti | 2015-05-19 | 1 | -1/+1 |
| | * | | be verbose about what type of element (block, layout, webpage) is beeing inst... | Mario Vavti | 2015-05-19 | 1 | -1/+2 |
| | |/ |
|
| | * | New update Dutch | jeroenpraat | 2015-05-19 | 2 | -104/+104 |
| * | | version update | redmatrix | 2015-05-19 | 1 | -1/+1 |
| |/ |
|
* | | mail_obscure - AES-256 is way too slow, simplify. Ideally a substitution ciph... | redmatrix | 2015-05-19 | 5 | -35/+29 |
* | | vsprintf error | redmatrix | 2015-05-18 | 1 | -1/+1 |
* | | consensus items not working correctly and make the collections widget abide b... | redmatrix | 2015-05-18 | 2 | -4/+8 |
* | | 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 | 5 | -53/+37 |
* | | 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 | 3 | -1012/+1270 |
* | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-05-18 | 2 | -8/+16 |
|\| |
|
| * | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-05-18 | 4 | -385/+446 |
| |\ |
|
| * | | fix po2php to handle projectname variables correctly | redmatrix | 2015-05-18 | 2 | -8/+16 |
* | | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-05-18 | 7 | -134/+188 |
|\ \ \
| | |/
| |/| |
|
| * | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | Mario Vavti | 2015-05-18 | 1 | -0/+47 |
| |\ \ |
|