aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* there was a reason we included that fileredmatrix2015-05-281-3/+3
* parse errorredmatrix2015-05-281-2/+2
* another case of committing with unsaved changes in a second windowredmatrix2015-05-281-2/+4
* untested menu element import, be aware that the menu api does not over-write ...redmatrix2015-05-281-7/+46
* Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-05-282-1021/+1031
|\
| * Merge pull request #341 from solstag/ptbrupdateredmatrix2015-05-292-1021/+1031
| |\
| | * update pt_BR translationAlexandre Hannud Abdo2015-05-282-1021/+1031
| |/
* / add menu_created, menu_edited fields to DBredmatrix2015-05-286-8/+65
|/
* catch a window that wasn't yet saved when the last checkin occurredredmatrix2015-05-271-1/+0
* menu encoding for sharing/exchangeredmatrix2015-05-272-0/+43
* missing row in sql query which is used further downredmatrix2015-05-271-1/+1
* some high-level stuff we may need for shareable menus. Also make the client r...redmatrix2015-05-272-68/+84
* Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-05-272-0/+81
|\
| * Merge branch 'master' of https://github.com/redmatrix/redmatrixMario Vavti2015-05-271-1/+1
| |\
| * | define some custom attributes and html5 elements for htmlpurifierMario Vavti2015-05-271-0/+66
| * | make it possible to include menus in blocks - this will only work in html blo...Mario Vavti2015-05-271-0/+15
* | | fix for forked thread on diasporaredmatrix2015-05-272-11/+5
* | | revert for nowredmatrix2015-05-272-6/+6
* | | Comments need to have some kind of routing instructions.redmatrix2015-05-262-1/+14
| |/ |/|
* | Update api.phpjeroenpraat2015-05-261-1/+1
|/
* add ability to change existing channel/account service class withHabeas Codice2015-05-263-0/+73
* placeholder for dynamic regoredmatrix2015-05-252-10/+2
* Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-05-252-0/+65
|\
| * Add docs about current service class system, tiny util to make updates aHabeas Codice2015-05-252-0/+65
* | slow but forward progress on dynamic client registrationredmatrix2015-05-251-0/+42
|/
* some work on issue #329redmatrix2015-05-254-8/+11
* Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-05-251-0/+1
|\
| * add this to better support mobile devices out of the box in zen templateMario Vavti2015-05-251-0/+1
* | add toggle for ALLOWCODE to admin/channel and also fix the ability to toggle ...redmatrix2015-05-253-7/+40
|/
* timezone setting not saved issue #336redmatrix2015-05-241-1/+1
* typo and update to rfc7033 (webfinger) as well as webfinger diagnostic pageredmatrix2015-05-243-10/+15
* Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-05-246-274/+322
|\
| * one moreHabeas Codice2015-05-241-2/+2
| * avoid db compatibility issuesHabeas Codice2015-05-241-2/+2
| * logic has changed - this is not needed anymoreMario Vavti2015-05-241-6/+1
| * should not call prepare text here anymoreMario Vavti2015-05-241-1/+1
| * Merge pull request #331 from solstag/jquerypropredmatrix2015-05-241-2/+2
| |\
| | * Fix accepting contacts by using correct jquery calls.Alexandre Hannud Abdo2015-05-221-2/+2
| * | Merge pull request #333 from dawnbreak/docuredmatrix2015-05-242-258/+313
| |\ \
| | * | Add PHP's xml module check and upload limits to setup.Klaus Weidenbach2015-05-242-258/+313
| * | | Merge pull request #332 from solstag/zotfeedcleanupKlaus2015-05-241-3/+1
| |\ \ \ | | |/ / | |/| |
| | * | Import security only when necessary, use correct variable in logAlexandre Hannud Abdo2015-05-221-3/+1
| | |/
* | / search result heading not translatableredmatrix2015-05-242-3/+3
|/ /
* | federation problem from diaspora comments relayed through red channels due to...redmatrix2015-05-231-1/+1
* | add channel_id to local_dir_update hookredmatrix2015-05-231-1/+1
* | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-05-2321-4/+19094
|\ \
| * | use $a->data instead of $a->page for $content and ad another library for use ...Mario Vavti2015-05-2321-4/+19094
| |/
* / add local_dir_update hookredmatrix2015-05-233-523/+529
|/
* preserve lock on edited commentsredmatrix2015-05-212-2/+5
* cloning abook entries was broken in several ways if the target xchan wasn't a...redmatrix2015-05-202-16/+13