Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | parse error | redmatrix | 2015-05-28 | 1 | -2/+2 |
| | |||||
* | another case of committing with unsaved changes in a second window | redmatrix | 2015-05-28 | 1 | -2/+4 |
| | |||||
* | add menu_created, menu_edited fields to DB | redmatrix | 2015-05-28 | 1 | -4/+31 |
| | |||||
* | menu encoding for sharing/exchange | redmatrix | 2015-05-27 | 1 | -0/+39 |
| | |||||
* | some high-level stuff we may need for shareable menus. Also make the client ↵ | redmatrix | 2015-05-27 | 1 | -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_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 | 1 | -5/+5 |
| | | | |||||
* | | | Comments need to have some kind of routing instructions. | redmatrix | 2015-05-26 | 1 | -0/+13 |
| |/ |/| | |||||
* | | Update api.php | jeroenpraat | 2015-05-26 | 1 | -1/+1 |
|/ | | | one comma to much | ||||
* | placeholder for dynamic rego | redmatrix | 2015-05-25 | 2 | -10/+2 |
| | |||||
* | slow but forward progress on dynamic client registration | redmatrix | 2015-05-25 | 1 | -0/+42 |
| | |||||
* | some work on issue #329 | redmatrix | 2015-05-25 | 3 | -7/+10 |
| | |||||
* | 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 #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 | 1 | -4/+17 |
|\ \ | |||||
| * | | use $a->data instead of $a->page for $content and ad another library for use ↵ | Mario Vavti | 2015-05-23 | 1 | -4/+17 |
| |/ | | | | | | | with webpages - foundation | ||||
* / | add local_dir_update hook | redmatrix | 2015-05-23 | 1 | -1/+4 |
|/ | |||||
* | 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. | ||||
* | 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 | 1 | -1/+18 |
|\ | |||||
| * | 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 | 3 | -20/+13 |
|/ | |||||
* | remove dbg code | Mario Vavti | 2015-05-19 | 1 | -1/+1 |
| | |||||
* | be verbose about what type of element (block, layout, webpage) is beeing ↵ | Mario Vavti | 2015-05-19 | 1 | -1/+2 |
| | | | | installed | ||||
* | if block title contains $content but $content title is empty do not show an ↵ | Mario Vavti | 2015-05-18 | 1 | -1/+1 |
| | | | | empty <h3> tag | ||||
* | remove dbg code | Mario Vavti | 2015-05-18 | 1 | -2/+0 |
| | |||||
* | allow block title to contain $content title | Mario Vavti | 2015-05-18 | 1 | -2/+11 |
| | |||||
* | missing $ | redmatrix | 2015-05-17 | 1 | -1/+1 |
| | |||||
* | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-05-17 | 2 | -32/+105 |
|\ | |||||
| * | Merge pull request #322 from dawnbreak/master | redmatrix | 2015-05-18 | 1 | -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 Weidenbach | 2015-05-16 | 1 | -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/docu | redmatrix | 2015-05-18 | 1 | -32/+39 |
| |\ \ | | | | | | | | | Add some more documentation to attach_store() | ||||
| | * | | Add some more documentation to attach_store() | Klaus Weidenbach | 2015-05-17 | 1 | -32/+39 |
| | |/ | |||||
* | / | Implement permission checking for OAuth clients using the xperm table. ↵ | redmatrix | 2015-05-17 | 3 | -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_merge | redmatrix | 2015-05-17 | 1 | -1/+8 |
|\| | |||||
| * | allow a block to contain $content | Mario Vavti | 2015-05-15 | 1 | -1/+8 |
| | | |||||
* | | more work isolating the projectname from core. | redmatrix | 2015-05-17 | 3 | -7/+7 |
|/ | |||||
* | product was a bad string to use because we may require it for e-commerce, ↵ | redmatrix | 2015-05-13 | 6 | -9/+9 |
| | | | | and RED_PLATFORM is equally problematic for other reasons. | ||||
* | provide a method for loading site/custom widgets | redmatrix | 2015-05-12 | 1 | -0/+3 |
| | |||||
* | replace project name with $product or $Product in strings to avoid merge ↵ | redmatrix | 2015-05-12 | 1 | -2/+15 |
| | | | | issues across different project names. Currently a place-holder. The strings themselves have not yet been modified. |