| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| | * | fix objurl until get_rel_link() gets sorted | marijus | 2015-02-06 | 1 | -1/+1 | |
| | | | ||||||
| | * | style the checkboxes in the event form | friendica | 2015-02-05 | 1 | -1/+1 | |
| | | | ||||||
| | * | event form cleanup backported from trinidad - still need to style the checkboxes | friendica | 2015-02-05 | 1 | -3/+4 | |
| | | | ||||||
| * | | Merge branch 'master' into tres | friendica | 2015-02-05 | 9 | -123/+428 | |
| |\| | | | | | | | | | | | Conflicts: view/css/mod_events.css view/theme/redbasic/css/style.css | |||||
| | * | remote rating and addition of rate-me to channel profile sidebar | friendica | 2015-02-04 | 1 | -0/+158 | |
| | | | ||||||
| | * | hide channel address in directory from hovertip if not logged into the matrix | friendica | 2015-02-03 | 1 | -1/+1 | |
| | | | ||||||
| | * | remove extra debugging | friendica | 2015-02-03 | 1 | -2/+1 | |
| | | | ||||||
| | * | probably enough for now - couldn't get the censorship filter in today, I ↵ | friendica | 2015-02-03 | 2 | -1/+2 | |
| | | | | | | | | | think that's the only bit missing. | |||||
| | * | order ratings friends first | friendica | 2015-02-03 | 2 | -2/+18 | |
| | | | ||||||
| | * | final cleanup on ratings feature | friendica | 2015-02-03 | 1 | -1/+23 | |
| | | | ||||||
| | * | finish off the sync functions | friendica | 2015-02-03 | 1 | -2/+3 | |
| | | | ||||||
| | * | ratings - mopping up, most everything but directory sync implemented | friendica | 2015-02-03 | 3 | -35/+24 | |
| | | | ||||||
| | * | rating form work | friendica | 2015-02-03 | 1 | -0/+5 | |
| | | | ||||||
| | * | styling for the directory page when it comes to ratings | friendica | 2015-02-03 | 3 | -15/+2 | |
| | | | ||||||
| | * | honour block public setting - especially for standalones | friendica | 2015-02-03 | 3 | -1/+24 | |
| | | | ||||||
| | * | run ratingsearch on the server | friendica | 2015-02-03 | 2 | -26/+87 | |
| | | | ||||||
| | * | for now punt if have no poi, but we should get it from the server | friendica | 2015-02-03 | 1 | -1/+1 | |
| | | | ||||||
| | * | start to tie ratings to the directory page | friendica | 2015-02-02 | 1 | -0/+4 | |
| | | | ||||||
| | * | add ratings to the directory sync arrays | friendica | 2015-02-02 | 1 | -0/+17 | |
| | | | ||||||
| | * | send rating information to directories | friendica | 2015-02-02 | 2 | -4/+4 | |
| | | | ||||||
| | * | sign the ratings, fix the bugs | friendica | 2015-02-02 | 3 | -6/+15 | |
| | | | ||||||
| | * | Merge branch 'master' into pocorate | friendica | 2015-02-02 | 1 | -3/+8 | |
| | |\ | ||||||
| | | * | improved directory registration - honour standalones and do the right thing | friendica | 2015-02-02 | 1 | -3/+8 | |
| | | | | ||||||
| | * | | add signatures | friendica | 2015-02-02 | 1 | -4/+12 | |
| | |/ | ||||||
| * | | 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 | |||||
 |
index : volse-hubzilla.git | |
| Volse Hubzilla -- soft fork of main Hubzilla core for Volse | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |