Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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. | ||||
* | fix a couple of miscellaneous errors which showed up in the logs | redmatrix | 2015-05-11 | 2 | -2/+5 |
| | |||||
* | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-05-10 | 3 | -8/+88 |
|\ | |||||
| * | uid > channel id to make submenus visible for observers | Mario Vavti | 2015-05-10 | 1 | -3/+3 |
| | | |||||
| * | provide ability to create submenus | Mario Vavti | 2015-05-10 | 1 | -1/+19 |
| | | |||||
| * | provide wrap variable for comanche menus | Mario Vavti | 2015-05-07 | 2 | -4/+18 |
| | | |||||
| * | provide a possibility to include js/css libs | Mario Vavti | 2015-05-07 | 1 | -0/+40 |
| | | |||||
| * | adjust icon size | Mario Vavti | 2015-05-07 | 1 | -1/+1 |
| | | |||||
| * | allow blocks to have custom classes and add a new template called zen which ↵ | Mario Vavti | 2015-05-06 | 1 | -2/+10 |
| | | | | | | | | gives you an empty page to work with | ||||
* | | rev update | redmatrix | 2015-05-10 | 1 | -1/+1 |
|/ | |||||
* | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-05-05 | 1 | -1/+1 |
|\ | |||||
| * | remove obsolete linebreak | Mario Vavti | 2015-05-04 | 1 | -1/+1 |
| | | |||||
* | | turn consensus items into diaspora polls for that network | redmatrix | 2015-05-05 | 1 | -0/+15 |
|/ | |||||
* | more performance work | friendica | 2015-04-30 | 1 | -1/+9 |
| | |||||
* | Merge https://github.com/redmatrix/redmatrix into pending_merge | friendica | 2015-04-30 | 1 | -0/+2 |
|\ | |||||
| * | disable voting in blocks, layouts and webpages | Mario Vavti | 2015-04-29 | 1 | -0/+2 |
| | | |||||
* | | just a test, please do not try to implement this as there are severe ↵ | friendica | 2015-04-30 | 2 | -2/+20 |
|/ | | | | security issues |