| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-05-17 | 9 | -45/+216 |
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: include/bb2diaspora.php include/diaspora.php include/enotify.php mod/admin.php mod/cloud.php mod/dav.php mod/home.php mod/invite.php mod/like.php mod/mitem.php mod/p.php mod/pubsites.php mod/setup.php mod/siteinfo.php util/messages.po | ||||
| | * | 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 |
| | |/ | |||||
| * | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-05-13 | 6 | -9/+9 |
| |\| | | | | | | | | | | | | | Conflicts: boot.php include/api.php include/enotify.php | ||||
| | * | 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. | ||||
| * | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-05-12 | 4 | -4/+23 |
| |\| | | | | | | | | | | | Conflicts: mod/mitem.php view/nl/strings.php | ||||
| | * | 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 branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-05-10 | 2 | -2/+20 |
| |\| | | | | | | | | | | | | | Conflicts: mod/mitem.php view/de/messages.po view/de/strings.php | ||||
| | * | 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 |
| | | | | |||||
| | * | | rev update | redmatrix | 2015-05-10 | 1 | -1/+1 |
| | | | | |||||
| * | | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-05-07 | 3 | -5/+59 |
| |\ \ \ | | |/ | |/| | |||||
| | * | | 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 |
| | | | | |||||
| * | | | missed one... | redmatrix | 2015-05-06 | 1 | -0/+2 |
| | | | | |||||
| * | | | forgot to save | redmatrix | 2015-05-06 | 1 | -2/+0 |
| | | | | |||||
| * | | | Hopefully this will make item_cache the default | redmatrix | 2015-05-06 | 2 | -14/+54 |
| | | | | |||||
| * | | | convert ITEM_WALL from bitfield to standalone | redmatrix | 2015-05-06 | 14 | -49/+54 |
| | | | | |||||
| * | | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-05-06 | 2 | -2/+25 |
| |\| | | |||||
| | * | | 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 | ||||
| | * | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-05-05 | 1 | -1/+1 |
| | |\ | |||||
| | * | | turn consensus items into diaspora polls for that network | redmatrix | 2015-05-05 | 1 | -0/+15 |
| | | | | |||||
| * | | | no need to obscure the diaspora signature if we're not obscuring the posts | redmatrix | 2015-05-06 | 2 | -6/+12 |
| | | | | |||||
| * | | | for hubzilla we won't be obscuring items, only private mail, this will allow ↵ | redmatrix | 2015-05-05 | 2 | -59/+1 |
| | | | | | | | | | | | | | us to search and cache private posts | ||||
| * | | | second pass name change | redmatrix | 2015-05-05 | 2 | -3/+3 |
| | | | | |||||
| * | | | first pass name change | redmatrix | 2015-05-05 | 13 | -22/+22 |
| | |/ |/| | |||||
| * | | remove obsolete linebreak | Mario Vavti | 2015-05-04 | 1 | -1/+1 |
| |/ | |||||
| * | 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 | ||||
| * | Provide webpage layout description | Mario Vavti | 2015-04-25 | 1 | -1/+1 |
| | | |||||
| * | Merge https://github.com/redmatrix/redmatrix into pending_merge | friendica | 2015-04-24 | 2 | -1/+2 |
| |\ | |||||
| | * | add widget class to blocks again by default. we have the wrap variable now ↵ | Mario Vavti | 2015-04-24 | 1 | -1/+1 |
| | | | | | | | | | to remove the div wrapper if necessary. | ||||
| | * | provide block titles in blocklist | Mario Vavti | 2015-04-24 | 1 | -0/+1 |
| | | | |||||
| * | | zotfeed issues | friendica | 2015-04-24 | 1 | -3/+3 |
| | | | |||||
| * | | mod/branchtopic - move an off-topic comment to its own thread as a fresh ↵ | friendica | 2015-04-24 | 1 | -1/+1 |
| |/ | | | | wall-to-wall post and the same delivery permissions as its parent. No adjustments are made for complex delivery chains. | ||||
| * | block unfederated posts from zot_feed | friendica | 2015-04-23 | 1 | -0/+6 |
| | | |||||
 |
index : volse-hubzilla.git | |
| Volse Hubzilla -- soft fork of main Hubzilla core for Volse | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |