aboutsummaryrefslogtreecommitdiffstats
path: root/include
Commit message (Collapse)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
|
* add menu_created, menu_edited fields to DBredmatrix2015-05-281-4/+31
|
* menu encoding for sharing/exchangeredmatrix2015-05-271-0/+39
|
* some high-level stuff we may need for shareable menus. Also make the client ↵redmatrix2015-05-271-11/+1
| | | | 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-271-5/+5
| | |
* | | Comments need to have some kind of routing instructions.redmatrix2015-05-261-0/+13
| |/ |/|
* | Update api.phpjeroenpraat2015-05-261-1/+1
|/ | | one comma to much
* placeholder for dynamic regoredmatrix2015-05-252-10/+2
|
* slow but forward progress on dynamic client registrationredmatrix2015-05-251-0/+42
|
* some work on issue #329redmatrix2015-05-253-7/+10
|
* 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 #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
* | 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-231-4/+17
|\ \
| * | use $a->data instead of $a->page for $content and ad another library for use ↵Mario Vavti2015-05-231-4/+17
| |/ | | | | | | with webpages - foundation
* / add local_dir_update hookredmatrix2015-05-231-1/+4
|/
* 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.
* don't allow item_id to update without a valid post idredmatrix2015-05-201-0/+5
|
* Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-05-201-1/+18
|\
| * make design elements translateableMario Vavti2015-05-201-1/+18
| |
* | PRIVACY: possible privacy leakage under a defined set of circumstancesredmatrix2015-05-203-20/+13
|/
* remove dbg codeMario Vavti2015-05-191-1/+1
|
* be verbose about what type of element (block, layout, webpage) is beeing ↵Mario Vavti2015-05-191-1/+2
| | | | installed
* if block title contains $content but $content title is empty do not show an ↵Mario Vavti2015-05-181-1/+1
| | | | empty <h3> tag
* remove dbg codeMario Vavti2015-05-181-2/+0
|
* allow block title to contain $content titleMario Vavti2015-05-181-2/+11
|
* missing $redmatrix2015-05-171-1/+1
|
* Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-05-172-32/+105
|\
| * Merge pull request #322 from dawnbreak/masterredmatrix2015-05-181-0/+66
| |\ | | | | | | Add functions to parse and get some values from php.ini.
| | * Add functions to parse and get some values from php.ini.Klaus Weidenbach2015-05-161-0/+66
| | | | | | | | | | | | | | | | | | | | | Get upload limits from php.ini. These functions will be used for checking against upload limits and to give information in the frontend. Wasn't sure in which file to put these functions, so I created a new one include/environment.php.
| * | Merge pull request #323 from dawnbreak/docuredmatrix2015-05-181-32/+39
| |\ \ | | | | | | | | Add some more documentation to attach_store()
| | * | Add some more documentation to attach_store()Klaus Weidenbach2015-05-171-32/+39
| | |/
* | / Implement permission checking for OAuth clients using the xperm table. ↵redmatrix2015-05-173-5/+95
|/ / | | | | | | Currently 'all' permissions are applied to OAuth clients which gives them the same rights as the channel owner and full access to API functions as the channel owner. However, individual permissions can now be created. These mirror the permission names from the normal permission table (although it isn't required that they do so). Lack of an xp_perm entry for the specified permission and lack of an 'all' override indicates permission denied.
* | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-05-171-1/+8
|\|
| * allow a block to contain $contentMario Vavti2015-05-151-1/+8
| |
* | more work isolating the projectname from core.redmatrix2015-05-173-7/+7
|/
* product was a bad string to use because we may require it for e-commerce, ↵redmatrix2015-05-136-9/+9
| | | | and RED_PLATFORM is equally problematic for other reasons.
* provide a method for loading site/custom widgetsredmatrix2015-05-121-0/+3
|