Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into tres | friendica | 2015-02-05 | 45 | -5364/+6398 |
|\ | | | | | | | | | | | Conflicts: view/css/mod_events.css view/theme/redbasic/css/style.css | ||||
| * | allow post expiration to be set from a config (and therefore a plugin/addon) | friendica | 2015-02-05 | 1 | -1/+4 |
| | | |||||
| * | over-ride permissions for sys channel delivery from diaspora | friendica | 2015-02-05 | 1 | -9/+13 |
| | | |||||
| * | another issue with diaspora postings to sys channel - sys has no ↵ | friendica | 2015-02-05 | 1 | -6/+14 |
| | | | | | | | | connections, hence no abook records. | ||||
| * | Merge https://github.com/friendica/red into pending_merge | friendica | 2015-02-05 | 3 | -27/+70 |
| |\ | |||||
| | * | typo | marijus | 2015-02-05 | 1 | -1/+1 |
| | | | |||||
| | * | forgot to remove some debug stuff | marijus | 2015-02-05 | 1 | -2/+0 |
| | | | |||||
| | * | make file activity respect parent dir permissions work | marijus | 2015-02-05 | 1 | -22/+66 |
| | | | |||||
| | * | Merge branch 'master' of https://github.com/friendica/red | Habeas Codice | 2015-02-05 | 49 | -5349/+6405 |
| | |\ | |||||
| | * | | escape dates | Habeas Codice | 2015-02-05 | 1 | -1/+1 |
| | | | | |||||
| | * | | typo/cleanup pg only | Habeas Codice | 2015-02-05 | 1 | -4/+5 |
| | | | | |||||
| * | | | collapse overly-verbose ratings | friendica | 2015-02-05 | 2 | -1/+5 |
| | | | | |||||
| * | | | increase size of rating value to make it stand out a bit. | friendica | 2015-02-05 | 3 | -13/+6 |
| | | | | |||||
| * | | | author profile photo in reshare wasn't linked | friendica | 2015-02-05 | 3 | -2/+14 |
| | |/ | |/| | |||||
| * | | diaspora public posts not delivering to sys channel if there were no other ↵ | friendica | 2015-02-04 | 1 | -4/+9 |
| | | | | | | | | | | | | subscribers | ||||
| * | | forgot to add the self exclusion | friendica | 2015-02-04 | 1 | -2/+4 |
| | | | |||||
| * | | allow anybody to view ratings - including oneself. Only allow authenticated ↵ | friendica | 2015-02-04 | 1 | -9/+9 |
| | | | | | | | | | | | | folks to edit them. | ||||
| * | | add 'view ratings' to the widget. It's actually two stacked widgets rather ↵ | friendica | 2015-02-04 | 1 | -2/+6 |
| | | | | | | | | | | | | than a widget with two entries. That's the only way we can keep the theming consistent with the rconnect button. | ||||
| * | | honour the rating enable setting (which we really do need to rename since it ↵ | friendica | 2015-02-04 | 1 | -0/+5 |
| | | | | | | | | | | | | isn't poco any more) | ||||
| * | | remote rating and addition of rate-me to channel profile sidebar | friendica | 2015-02-04 | 8 | -15/+228 |
| | | | |||||
| * | | add the required js file | friendica | 2015-02-04 | 1 | -0/+34 |
| | | | |||||
| * | | Merge https://github.com/friendica/red into pending_merge | friendica | 2015-02-04 | 1 | -28/+60 |
| |\ \ | |||||
| | * | | not quite there yet but getting closer a little | marijus | 2015-02-04 | 1 | -28/+60 |
| | | | | |||||
| * | | | first cut at rating widget. The flaw is that it is limited because it ↵ | friendica | 2015-02-04 | 8 | -25/+82 |
| |/ / | | | | | | | | | | requires local_channel() (formerly local_user()). We need to extend this to take you home like rpost does if you're logged in as remote_channel() - and/or we need zot to send the rating message to the source channel and target in addition to the directories. | ||||
| * | | 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 | 3 | -7/+8 |
| | | | | | | | | | | | | think that's the only bit missing. | ||||
| * | | order ratings friends first | friendica | 2015-02-03 | 3 | -6/+18 |
| | | | |||||
| * | | final cleanup on ratings feature | friendica | 2015-02-03 | 8 | -11/+57 |
| | | | |||||
| * | | finish off the sync functions | friendica | 2015-02-03 | 2 | -2/+46 |
| | | | |||||
| * | | ratings - mopping up, most everything but directory sync implemented | friendica | 2015-02-03 | 9 | -43/+57 |
| | | | |||||
| * | | rating form work | friendica | 2015-02-03 | 4 | -1/+22 |
| | | | |||||
| * | | 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 |
| | | | |