Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into tres | friendica | 2015-02-05 | 7 | -29/+45 |
|\ | | | | | | | | | | | Conflicts: view/css/mod_events.css view/theme/redbasic/css/style.css | ||||
| * | collapse overly-verbose ratings | friendica | 2015-02-05 | 1 | -1/+1 |
| | | |||||
| * | increase size of rating value to make it stand out a bit. | friendica | 2015-02-05 | 1 | -1/+1 |
| | | |||||
| * | remote rating and addition of rate-me to channel profile sidebar | friendica | 2015-02-04 | 2 | -0/+24 |
| | | |||||
| * | first cut at rating widget. The flaw is that it is limited because it ↵ | friendica | 2015-02-04 | 1 | -1/+2 |
| | | | | | | | | 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. | ||||
| * | probably enough for now - couldn't get the censorship filter in today, I ↵ | friendica | 2015-02-03 | 1 | -6/+6 |
| | | | | | | | | think that's the only bit missing. | ||||
| * | final cleanup on ratings feature | friendica | 2015-02-03 | 2 | -1/+2 |
| | | |||||
| * | ratings - mopping up, most everything but directory sync implemented | friendica | 2015-02-03 | 2 | -3/+6 |
| | | |||||
| * | rating form work | friendica | 2015-02-03 | 1 | -1/+1 |
| | | |||||
| * | styling for the directory page when it comes to ratings | friendica | 2015-02-03 | 2 | -11/+5 |
| | | |||||
| * | run ratingsearch on the server | friendica | 2015-02-03 | 1 | -10/+1 |
| | | |||||
| * | start to tie ratings to the directory page | friendica | 2015-02-02 | 1 | -4/+4 |
| | | |||||
| * | respect parent dir permissions | marijus | 2015-02-02 | 1 | -0/+2 |
| | | |||||
* | | Merge branch 'master' into tres | friendica | 2015-01-31 | 3 | -2/+15 |
|\| | | | | | | | | | Conflicts: include/zot.php | ||||
| * | Merge pull request #881 from cvogeley/master | RedMatrix | 2015-01-30 | 1 | -1/+2 |
| |\ | | | | | | | 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 | -1/+2 |
| | | | | | | | | | | | | admin menu | ||||
| * | | how did that stuff merge? grrrr.... | friendica | 2015-01-29 | 1 | -2/+2 |
| | | | |||||
| * | | Merge branch 'master' into pocorate | friendica | 2015-01-29 | 1 | -1/+1 |
| |\ \ | |||||
| | * | | non-tested fix for issue 847 | RedSwede | 2015-01-29 | 1 | -1/+1 |
| | |/ | |||||
| * | | Merge branch 'master' into pocorate | friendica | 2015-01-29 | 1 | -1/+1 |
| |\| | |||||
| * | | Merge branch 'master' into pocorate | friendica | 2015-01-28 | 1 | -0/+2 |
| |\ \ | |||||
| * | | | first cut at direntry template, right now just provide a mockup with a ↵ | friendica | 2015-01-27 | 1 | -0/+12 |
| | | | | | | | | | | | | | | | | slider and rating count to look at. | ||||
* | | | | cleanup event form and various required indicators on inputs | friendica | 2015-01-29 | 1 | -1/+4 |
| |_|/ |/| | | |||||
* | | | local_user => local_channel | friendica | 2015-01-28 | 1 | -1/+1 |
| |/ |/| | |||||
* | | show shared button only to local user | marijus | 2015-01-28 | 1 | -0/+2 |
|/ | |||||
* | tpl and css cleanup | marijus | 2015-01-27 | 1 | -8/+1 |
| | |||||
* | move userReadableSize() and getIconFromType() from ↵ | marijus | 2015-01-27 | 1 | -0/+31 |
| | | | | /include/RedDAV/RedBrowser.php to include/text.php and add template for mod/sharedwithme | ||||
* | we also don't need a profile selector when editing our default permissions. | friendica | 2015-01-25 | 1 | -0/+2 |
| | |||||
* | don't hide the scary stuff when editing self permissions. | friendica | 2015-01-25 | 1 | -2/+8 |
| | |||||
* | Hide all the scary decision making stuff that sends intellectually ↵ | friendica | 2015-01-25 | 1 | -0/+3 |
| | | | | challenged beings into siezures and brain melt-downs and online freak-outs. | ||||
* | move connection approval checkbox to top of page (above the sliders) - ↵ | friendica | 2015-01-25 | 1 | -11/+8 |
| | | | | instead of being in between rating and rating text. | ||||
* | this will require more fixing in include/enotify | marijus | 2015-01-23 | 1 | -1/+1 |
| | |||||
* | couple of hubloc manager issues | friendica | 2015-01-21 | 1 | -3/+3 |
| | |||||
* | css fixes - hopefully | marijus | 2015-01-20 | 1 | -1/+1 |
| | |||||
* | satisfy the floated images | marijus | 2015-01-20 | 1 | -1/+1 |
| | |||||
* | basic proof of concept file activity support - will send activity via the ↵ | marijus | 2015-01-18 | 2 | -3/+9 |
| | | | | filestorage module and via attach_delete() | ||||
* | more heavy lifting on poco rep | friendica | 2015-01-15 | 2 | -17/+9 |
| | |||||
* | poco rating - add a test module for pulling out ratings | friendica | 2015-01-15 | 2 | -1/+38 |
| | |||||
* | editing stuff for poco reputation | friendica | 2015-01-15 | 2 | -1/+9 |
| | |||||
* | more backend work on poco rating | friendica | 2015-01-15 | 3 | -0/+13 |
| | |||||
* | hide friends broken, add parameter for item search by verb | friendica | 2015-01-13 | 1 | -0/+2 |
| | |||||
* | another attempt to explain default permissions on connedit page | friendica | 2015-01-11 | 1 | -4/+17 |
| | |||||
* | Rename some stuff related to autocomplete | Stefan Parviainen | 2015-01-07 | 3 | -5/+5 |
| | |||||
* | Replace fancybox with colorbox | Stefan Parviainen | 2015-01-05 | 1 | -4/+4 |
| | |||||
* | Replace jslider with jRange | Stefan Parviainen | 2015-01-05 | 2 | -3/+3 |
| | |||||
* | Fix initEditor on non-wall pages | Stefan Parviainen | 2015-01-05 | 1 | -1/+4 |
| | |||||
* | Sorting of autocomplete | Stefan Parviainen | 2015-01-04 | 3 | -18/+20 |
|\ | |||||
| * | Merge https://github.com/friendica/red into pending_merge | friendica | 2015-01-04 | 1 | -2/+2 |
| |\ | |||||
| | * | provide some info for buttons | marijus | 2015-01-03 | 1 | -2/+2 |
| | | | |||||
| * | | remove hard-coded url to caterva.eu from events code. | friendica | 2015-01-04 | 1 | -1/+1 |
| |/ |