Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | 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 ↵ | Mario Vavti | 2015-05-27 | 1 | -0/+15 | |
| | | | | | | | | | | | | | | | | blocks of course | |||||
| * | | | 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 | |
| |/ | | | | | one comma to much | |||||
| * | add ability to change existing channel/account service class with | Habeas Codice | 2015-05-26 | 3 | -0/+73 | |
| | | | | | | | | | | util/service_class add link from main doc | |||||
| * | 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 | |
| | | | | | | | | | | | | little easier than the standard config util | |||||
| * | | 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 | |
| |\ | ||||||
| | * | add this to better support mobile devices out of the box in zen template | Mario Vavti | 2015-05-25 | 1 | -0/+1 | |
| | | | ||||||
| * | | add toggle for ALLOWCODE to admin/channel and also fix the ability to toggle ↵ | redmatrix | 2015-05-25 | 3 | -7/+40 | |
| |/ | | | | | | | the censor flag from that page. | |||||
* | | 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 | 2 | -3/+3 | |
|\| | ||||||
| * | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-05-24 | 6 | -274/+322 | |
| |\ | ||||||
| * | | search result heading not translatable | redmatrix | 2015-05-24 | 2 | -3/+3 | |
| | | | ||||||
* | | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-05-24 | 29 | -799/+19945 | |
|\ \ \ | | |/ | |/| | | | | | | | | | | Conflicts: index.php mod/setup.php | |||||
| * | | one more | Habeas Codice | 2015-05-24 | 1 | -2/+2 | |
| | | | ||||||
| * | | avoid db compatibility issues | Habeas Codice | 2015-05-24 | 1 | -2/+2 | |
| | | | ||||||
| * | | logic has changed - this is not needed anymore | Mario Vavti | 2015-05-24 | 1 | -6/+1 | |
| | | | ||||||
| * | | should not call prepare text here anymore | Mario Vavti | 2015-05-24 | 1 | -1/+1 | |
| | | | ||||||
| * | | Merge pull request #331 from solstag/jqueryprop | redmatrix | 2015-05-24 | 1 | -2/+2 | |
| |\ \ | | | | | | | | | Fix accepting contacts by using correct jquery calls. | |||||
| | * | | Fix accepting contacts by using correct jquery calls. | Alexandre Hannud Abdo | 2015-05-22 | 1 | -2/+2 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Not sure what the operation on disabled is supposed to do, but it also seemed to requier prop instead of attr. See for reference: http://api.jquery.com/prop/ """ The checked attribute value does not change with the state of the checkbox, while the checked property does. """ | |||||
| * | | | 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. | |||||
| | * | | | Add PHP's xml module check and upload limits to setup. | Klaus Weidenbach | 2015-05-24 | 2 | -258/+313 | |
| | | |/ | | |/| | | | | | | | | | And some documentation. | |||||
| * | | | Merge pull request #332 from solstag/zotfeedcleanup | Klaus | 2015-05-24 | 1 | -3/+1 | |
| |\ \ \ | | |/ / | |/| | | Import security only when necessary, use correct variable in log | |||||
| | * | | Import security only when necessary, use correct variable in log | Alexandre Hannud Abdo | 2015-05-22 | 1 | -3/+1 | |
| | |/ | | | | | | | | | | Just some cleanup, seemed like the intent of previous changes was so | |||||
| * | | federation problem from diaspora comments relayed through red channels due ↵ | redmatrix | 2015-05-23 | 1 | -1/+1 | |
| | | | | | | | | | | | | to typo | |||||
| * | | 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 | |
| | |/ | | | | | | | | | | with webpages - foundation | |||||
| * / | 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 | |
|\| | | | | | | | | | | | | | | | Conflicts: include/items.php include/text.php mod/item.php view/nl/messages.po | |||||
| * | cloning abook entries was broken in several ways if the target xchan wasn't ↵ | redmatrix | 2015-05-20 | 2 | -16/+13 | |
| | | | | | | | | available on the clone site. This should make it less broken. | |||||
| * | 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 ↵ | jeroenpraat | 2015-05-20 | 2 | -71/+71 | |
| | | | | | | | | | | | | channel activity as suggested on previous discussion) | |||||
| | * | make design elements translateable | Mario Vavti | 2015-05-20 | 1 | -1/+18 | |
| | | |