aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
| | | | on duplicate name - it just fails. We'll need to sort this out eventually. Also it was planned to offer a choice of whether to preserve links from the source site or change the baseurl to the local one. Currently we convert them all to local links.
* 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 translation
| | * 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 ↵redmatrix2015-05-272-68/+84
| | | | register function do the right thing even though I refuse to make it work. If **you** want service federation with things like pumpio and openid connect, it's time for **you** to put your own skin in the game and quit treating project volunteers like excrement just because you can't get up off your lazy buttocks.
* 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 ↵Mario Vavti2015-05-271-0/+15
| | | | | | | | | | | | blocks of course
* | | 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
|/ | | one comma to much
* add ability to change existing channel/account service class withHabeas Codice2015-05-263-0/+73
| | | | | util/service_class add link from main doc
* 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
| | | | | | | | little easier than the standard config util
* | 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
|/ | | | the censor flag from that page.
* 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.
| | * Fix accepting contacts by using correct jquery calls.Alexandre Hannud Abdo2015-05-221-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/docuredmatrix2015-05-242-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 Weidenbach2015-05-242-258/+313
| | | | | | | | | | | | | | | | And some documentation.
| * | | Merge pull request #332 from solstag/zotfeedcleanupKlaus2015-05-241-3/+1
| |\ \ \ | | |/ / | |/| | Import security only when necessary, use correct variable in log
| | * | Import security only when necessary, use correct variable in logAlexandre Hannud Abdo2015-05-221-3/+1
| | |/ | | | | | | | | | Just some cleanup, seemed like the intent of previous changes was so
* | / search result heading not translatableredmatrix2015-05-242-3/+3
|/ /
* | federation problem from diaspora comments relayed through red channels due ↵redmatrix2015-05-231-1/+1
| | | | | | | | to typo
* | 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
| |/ | | | | | | with webpages - foundation
* / 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 ↵redmatrix2015-05-202-16/+13
| | | | available on the clone site. This should make it less broken.
* check for success before updating remote idredmatrix2015-05-201-8/+9
|
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-26 13:59:16 +0000