| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| | * | | 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 | |
| | |/ | ||||||
| * | | Merge branch 'master' into tres | friendica | 2015-05-01 | 2 | -2/+28 | |
| |\| | ||||||
| | * | 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 | |
| | |\ | ||||||
| | * | | just a test, please do not try to implement this as there are severe ↵ | friendica | 2015-04-30 | 2 | -2/+20 | |
| | | | | | | | | | | | | | security issues | |||||
| * | | | Merge branch 'master' into tres | friendica | 2015-04-29 | 5 | -13/+30 | |
| |\ \ \ | | |/ | |/| | | | | | | | Conflicts: include/notifier.php | |||||
| | * | | disable voting in blocks, layouts and webpages | Mario Vavti | 2015-04-29 | 1 | -0/+2 | |
| | |/ | ||||||
| | * | 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 | |
| | | | ||||||
| | * | disconnect | friendica | 2015-04-23 | 1 | -7/+15 | |
| | | | ||||||
| * | | Merge branch 'master' into tres | friendica | 2015-04-23 | 58 | -3887/+5463 | |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: include/Contact.php include/ItemObject.php include/api.php include/attach.php include/diaspora.php include/dir_fns.php include/enotify.php include/event.php include/expire.php include/items.php include/notifier.php include/notify.php include/photos.php include/taxonomy.php include/text.php include/widgets.php include/zot.php mod/admin.php mod/channel.php mod/dirsearch.php mod/display.php mod/editwebpage.php mod/events.php mod/home.php mod/item.php mod/manage.php mod/mood.php mod/network.php mod/page.php mod/photos.php mod/ping.php mod/post.php mod/thing.php mod/viewsrc.php view/css/mod_events.css | |||||
| | * | fix webpage perms | Mario Vavti | 2015-04-22 | 1 | -1/+1 | |
| | | | ||||||
| | * | use PERMS_SPECIFIC for anything that hasn't been specified. This way there's ↵ | friendica | 2015-04-21 | 1 | -24/+24 | |
| | | | | | | | | | nothing that's "only yourself", and let's you add additional permissions at will rather than be forced to accept the defaults or turn on custom permissions just to give a friend delegation rights or the ability to post photos. | |||||
| | * | issue #162 | friendica | 2015-04-20 | 1 | -0/+1 | |
| | | | ||||||
| | * | issue #176, sender copy of item not obscured if using private mention | friendica | 2015-04-20 | 1 | -1/+3 | |
| | | | ||||||
| | * | force event obj_type on update | friendica | 2015-04-20 | 1 | -1/+2 | |
| | | | ||||||
| | * | issue #157, provide default directory sort order | friendica | 2015-04-19 | 1 | -1/+7 | |
| | | | ||||||
| | * | doco updates | friendica | 2015-04-19 | 1 | -3/+0 | |
| | | | ||||||
| | * | add favorites/create and destroy to api | friendica | 2015-04-19 | 1 | -36/+137 | |
| | | | ||||||
| | * | api performance enhancer | friendica | 2015-04-19 | 1 | -5/+2 | |
| | | | ||||||
 |
index : volse-hubzilla.git | |
| Volse Hubzilla -- soft fork of main Hubzilla core for Volse | Eilertsens Kodeknekkeri |
| aboutsummaryrefslogtreecommitdiffstats |