| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'master' into tres | friendica | 2015-02-01 | 3 | -2/+73 |
| |\ | |||||
| | * | admin/dbsync not reporting failed updates | friendica | 2015-02-01 | 1 | -1/+1 |
| | | | |||||
| | * | two tracks proceeding in parallel - first adding the ability to store a ↵ | friendica | 2015-02-01 | 2 | -1/+72 |
| | | | | | | | | | digital signature with ratings so that directories can pass them around, second provide some directory registration functions so we can obtain a list of directories from somewhere (to pass ratings around between them). This gives the primary directory role some value as that is where you register your directory. | ||||
| * | | Merge branch 'master' into tres | friendica | 2015-01-31 | 5 | -7/+146 |
| |\| | | | | | | | | | Conflicts: include/zot.php | ||||
| | * | Merge pull request #881 from cvogeley/master | RedMatrix | 2015-01-30 | 1 | -0/+3 |
| | |\ | | | | | | | Add allowed and not allowed emails to the UI in the | ||||
| | | * | Add allowed and not allowed emails to the UI in the | Christian Vogeley | 2015-01-29 | 1 | -0/+3 |
| | | | | | | | | | | | | | admin menu | ||||
| | * | | how did that stuff merge? grrrr.... | friendica | 2015-01-29 | 1 | -1/+1 |
| | | | | |||||
| | * | | enable ratings only in this branch until we're ready to push | friendica | 2015-01-29 | 1 | -1/+1 |
| | | | | |||||
| | * | | Merge branch 'master' into pocorate | friendica | 2015-01-29 | 2 | -4/+3 |
| | |\ \ | |||||
| | | * \ | Merge https://github.com/friendica/red into pending_merge | friendica | 2015-01-29 | 1 | -4/+2 |
| | | |\ \ | |||||
| | | | * | | fix issue 848 + code comments | RedSwede | 2015-01-29 | 1 | -4/+2 |
| | | | |/ | |||||
| | | * / | disable ratings until we're a bit further along. It's all changing. | friendica | 2015-01-29 | 1 | -0/+1 |
| | | |/ | |||||
| | * | | Merge branch 'master' into pocorate | friendica | 2015-01-29 | 89 | -593/+593 |
| | |\| | |||||
| | * | | prate module | friendica | 2015-01-29 | 1 | -0/+91 |
| | | | | |||||
| | * | | basic query for number of raters. Should probably be a join or subselect but ↵ | friendica | 2015-01-28 | 1 | -1/+11 |
| | | | | | | | | | | | | | that will take a bit more fiddling | ||||
| | * | | updates to put rating info into the local xlink before sending it to known ↵ | friendica | 2015-01-28 | 1 | -2/+38 |
| | | | | | | | | | | | | | directory servers | ||||
| * | | | cleanup event form and various required indicators on inputs | friendica | 2015-01-29 | 1 | -3/+4 |
| | | | | |||||
| * | | | Merge branch 'master' into tres | friendica | 2015-01-29 | 89 | -595/+595 |
| |\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: include/group.php include/text.php mod/acl.php mod/channel.php mod/connections.php mod/display.php mod/group.php mod/item.php mod/locs.php mod/network.php mod/photos.php mod/ping.php mod/starred.php mod/viewsrc.php | ||||
| | * | | Merge https://github.com/friendica/red into pending_merge | friendica | 2015-01-28 | 1 | -1/+1 |
| | |\ \ | |||||
| | | * | | Merge branch 'master' of https://github.com/friendica/red | Habeas Codice | 2015-01-28 | 8 | -236/+83 |
| | | |\| | |||||
| | | * | | fix implicit boolean | Habeas Codice | 2015-01-28 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | remote_user => remote_channel | friendica | 2015-01-28 | 17 | -23/+23 |
| | | | | | |||||
| | * | | | local_user => local_channel | friendica | 2015-01-28 | 87 | -584/+584 |
| | | |/ | |/| | |||||
| | * | | no need for new line here - spacing is done via css | marijus | 2015-01-28 | 1 | -1/+1 |
| | | | | |||||
| * | | | more message restrict conversions | friendica | 2015-01-29 | 10 | -26/+25 |
| | | | | |||||
| * | | | Merge branch 'master' into tres | friendica | 2015-01-27 | 4 | -28/+54 |
| |\| | | | | | | | | | | | | | | Conflicts: include/socgraph.php | ||||
| | * | | allow RSS connections in the type 'a' autocomplete results as that is used ↵ | friendica | 2015-01-27 | 1 | -3/+7 |
| | | | | | | | | | | | | | for channel sources. Without it a feed cannot be selected as a channel source. | ||||
| | * | | Merge https://github.com/friendica/red into pending_merge | friendica | 2015-01-27 | 1 | -14/+24 |
| | |\ \ | |||||
| | | * | | move userReadableSize() and getIconFromType() from ↵ | marijus | 2015-01-27 | 1 | -14/+24 |
| | | | | | | | | | | | | | | | | | /include/RedDAV/RedBrowser.php to include/text.php and add template for mod/sharedwithme | ||||
| | * | | | allow doc/help system to use subdirs | friendica | 2015-01-27 | 1 | -6/+14 |
| | |/ / | |||||
| | * | | superblock enhancements | friendica | 2015-01-26 | 1 | -5/+9 |
| | | | | |||||
| * | | | Merge branch 'master' into tres and add some work on the item_deleted flag ↵ | friendica | 2015-01-26 | 11 | -273/+82 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | refactor Conflicts: include/attach.php include/onedirsync.php include/zot.php mod/locs.php | ||||
| | * | | provide a json feed of search results | friendica | 2015-01-26 | 1 | -0/+17 |
| | | | | |||||
| | * | | abstract poco into a single function in socgraph so we can provide different ↵ | friendica | 2015-01-25 | 2 | -207/+11 |
| | |/ | | | | | | | wrappers for it providing slightly different functionality. | ||||
| | * | Hide all the scary decision making stuff that sends intellectually ↵ | friendica | 2015-01-25 | 1 | -0/+2 |
| | | | | | | | | | challenged beings into siezures and brain melt-downs and online freak-outs. | ||||
| | * | rework the new connection stuff so we don't need a "permissions have been ↵ | friendica | 2015-01-25 | 1 | -10/+3 |
| | | | | | | | | | changed but not saved" message. | ||||
| | * | misspelling | anaqreon | 2015-01-25 | 1 | -1/+1 |
| | | | |||||
| | * | standardize sql | Habeas Codice | 2015-01-24 | 1 | -1/+1 |
| | | | |||||
| | * | Merge branch 'master' of https://github.com/friendica/red | Habeas Codice | 2015-01-23 | 3 | -30/+13 |
| | |\ | |||||
| | | * | some more kiss | marijus | 2015-01-24 | 1 | -30/+9 |
| | | | | |||||
| | | * | some code restructure | marijus | 2015-01-23 | 2 | -3/+4 |
| | | | | |||||
| | | * | this will require more fixing in include/enotify | marijus | 2015-01-23 | 1 | -1/+1 |
| | | | | |||||
| | | * | possible performance improvement for sharedwithme update query | marijus | 2015-01-22 | 1 | -4/+7 |
| | | | | |||||
| | * | | rand() fixes | Habeas Codice | 2015-01-23 | 2 | -3/+5 |
| | |/ | |||||
| | * | Merge branch 'master' of https://github.com/friendica/red | Habeas Codice | 2015-01-21 | 3 | -42/+49 |
| | |\ | |||||
| | | * | Merge branch 'master' of https://github.com/friendica/red | marijus | 2015-01-22 | 1 | -3/+9 |
| | | |\ | |||||
| | | | * | couple of hubloc manager issues | friendica | 2015-01-21 | 1 | -1/+5 |
| | | | | | |||||
| | | | * | Merge https://github.com/friendica/red into pending_merge | friendica | 2015-01-21 | 2 | -39/+39 |
| | | | |\ | |||||
| | | | * | | hubloc manage issue | friendica | 2015-01-21 | 1 | -2/+4 |
| | | | | | | |||||
| | | * | | | make $links an array of links | marijus | 2015-01-22 | 1 | -1/+2 |
| | | | |/ | | |/| | |||||
 |
index : volse-hubzilla.git | |
| Volse Hubzilla -- soft fork of main Hubzilla core for Volse | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |