Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into pocorate | friendica | 2015-02-03 | 2 | -2/+7 |
|\ | |||||
| * | garbage in garbage out | friendica | 2015-02-03 | 2 | -2/+7 |
| | | |||||
* | | that didn't look so good on a small screen - let it hang out on the right margin | friendica | 2015-02-03 | 1 | -2/+1 |
| | | |||||
* | | styling for the directory page when it comes to ratings | friendica | 2015-02-03 | 7 | -27/+19 |
| | | |||||
* | | honour block public setting - especially for standalones | friendica | 2015-02-03 | 3 | -1/+24 |
| | | |||||
* | | run ratingsearch on the server | friendica | 2015-02-03 | 5 | -36/+88 |
| | | |||||
* | | Merge branch 'master' into pocorate | friendica | 2015-02-03 | 3 | -5148/+5286 |
|\| | |||||
| * | Merge branch 'master' of https://github.com/friendica/red | jeroenpraat | 2015-02-03 | 0 | -0/+0 |
| |\ | |||||
| | * | Fixed height of items in dropdown notification lists. They overlapped when ↵ | jeroen | 2015-02-03 | 1 | -0/+7 |
| | | | | | | | | | | | | the browser uses a higher font size. This must work for everyone. | ||||
| * | | Fixed height of items in dropdown notification lists. They overlapped when ↵ | jeroenpraat | 2015-02-03 | 1 | -0/+7 |
| |/ | | | | | | | the browser uses a higher font size. This must work for everyone. | ||||
| * | NL on 100 percent again :/ | jeroen | 2015-02-03 | 2 | -5148/+5279 |
| | | |||||
* | | 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 | 2 | -4/+8 |
| | | |||||
* | | add ratings to the directory sync arrays | friendica | 2015-02-02 | 1 | -0/+17 |
| | | |||||
* | | send rating information to directories | friendica | 2015-02-02 | 5 | -28/+157 |
| | | |||||
* | | sign the ratings, fix the bugs | friendica | 2015-02-02 | 3 | -6/+15 |
| | | |||||
* | | Merge branch 'master' into pocorate | friendica | 2015-02-02 | 2 | -3/+15 |
|\| | |||||
| * | improved directory registration - honour standalones and do the right thing | friendica | 2015-02-02 | 2 | -3/+15 |
| | | |||||
* | | Merge branch 'master' into pocorate | friendica | 2015-02-02 | 2 | -0/+77 |
|\| | |||||
| * | Merge https://github.com/friendica/red into pending_merge | friendica | 2015-02-02 | 2 | -0/+77 |
| |\ | |||||
| | * | comment out latest changes - needs more testing | marijus | 2015-02-02 | 1 | -4/+4 |
| | | | |||||
| | * | comment this out for now - it is not always true | marijus | 2015-02-02 | 1 | -2/+2 |
| | | | |||||
| | * | one important line missing | marijus | 2015-02-02 | 1 | -0/+1 |
| | | | |||||
| | * | we also need folder here | marijus | 2015-02-02 | 1 | -1/+1 |
| | | | |||||
| | * | typo | marijus | 2015-02-02 | 1 | -1/+1 |
| | | | |||||
| | * | just select perms | marijus | 2015-02-02 | 1 | -1/+1 |
| | | | |||||
| | * | respect parent dir permissions | marijus | 2015-02-02 | 2 | -0/+76 |
| | | | |||||
| * | | Merge branch 'pocorate'; commit '043ff33' | friendica | 2015-02-02 | 0 | -0/+0 |
| | | | |||||
* | | | add signatures | friendica | 2015-02-02 | 1 | -4/+12 |
|/ / | |||||
* / | issue #889 private tags for forums no longer recognised after tag refactor a ↵ | friendica | 2015-02-02 | 2 | -0/+4 |
|/ | | | | few weeks back. This solution is not optimal as it also leaves you in the privacy ACL in some cases and not in others but it restores the previous functionality | ||||
* | admin/dbsync not reporting failed updates | friendica | 2015-02-01 | 2 | -2/+2 |
| | |||||
* | Merge https://github.com/friendica/red into pending_merge | friendica | 2015-02-01 | 2 | -3/+4 |
|\ | |||||
| * | typo, see #884 | jeroenpraat | 2015-02-02 | 1 | -3/+3 |
| | | |||||
| * | add multipart/mixed to getIconFromType() | marijus | 2015-02-01 | 1 | -0/+1 |
| | | |||||
* | | two tracks proceeding in parallel - first adding the ability to store a ↵ | friendica | 2015-02-01 | 8 | -4/+101 |
|/ | | | | 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 https://github.com/friendica/red into pending_merge | friendica | 2015-01-31 | 3 | -6/+16 |
|\ | |||||
| * | Add more detail about directory_mode settings to default config and docs | Habeas Codice | 2015-01-30 | 2 | -5/+15 |
| | | |||||
| * | prevent silly fake null date from causing problems OTW from older builds | Habeas Codice | 2015-01-30 | 1 | -1/+1 |
| | | |||||
* | | issue #885, autoperms not working for diaspora connections | friendica | 2015-01-31 | 1 | -1/+1 |
| | | |||||
* | | revup | friendica | 2015-01-31 | 1 | -1/+1 |
|/ | |||||
* | sync_locations() toggle DB flag functions were broken - result of postgres ↵ | friendica | 2015-01-30 | 6 | -4/+751 |
| | | | | changes. Split these into seperate set and reset blocks. | ||||
* | fix random profiles | friendica | 2015-01-30 | 1 | -2/+3 |
| | |||||
* | Merge https://github.com/friendica/red into pending_merge | friendica | 2015-01-30 | 1 | -1/+1 |
|\ | |||||
| * | better cross-browser compatibility for td hover colour | marijus | 2015-01-30 | 1 | -1/+1 |
| | | |||||
* | | let zot_refresh continue without a primary hub if one cannot be found. also ↵ | friendica | 2015-01-30 | 86 | -4189/+4483 |
|/ | | | | weekly doc updates | ||||
* | Merge pull request #881 from cvogeley/master | RedMatrix | 2015-01-30 | 2 | -1/+5 |
|\ | | | | | 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 | 2 | -1/+5 |
| | | | | | | | | admin menu | ||||
* | | how did that stuff merge? grrrr.... | friendica | 2015-01-29 | 2 | -3/+3 |
| | | |||||
* | | bring back inline images | friendica | 2015-01-29 | 1 | -6/+15 |
| | | |||||
* | | enable ratings only in this branch until we're ready to push | friendica | 2015-01-29 | 1 | -1/+1 |
| | |