Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | Merge branch 'master' into tres | friendica | 2015-02-08 | 6 | -4155/+4409 | |
|\| | | | | | | | | | | | Conflicts: mod/events.php view/css/mod_events.css | |||||
| * | Merge pull request #890 from f03el/master | RedMatrix | 2015-02-09 | 1 | -4128/+4271 | |
| |\ | | | | | | | Update Swedish strings | |||||
| | * | Update Swedish strings | Erik Lundin | 2015-02-07 | 1 | -4128/+4271 | |
| | | | ||||||
| * | | we still need an event preview but this looks a lot better. | friendica | 2015-02-08 | 5 | -60/+100 | |
| | | | ||||||
| * | | first cut at putting editor tools in event form | friendica | 2015-02-08 | 1 | -0/+65 | |
| |/ | ||||||
| * | style the checkboxes in the event form | friendica | 2015-02-05 | 2 | -4/+8 | |
| | | ||||||
| * | event form cleanup backported from trinidad - still need to style the checkboxes | friendica | 2015-02-05 | 2 | -5/+31 | |
| | | ||||||
* | | Merge branch 'master' into tres | friendica | 2015-02-05 | 20 | -5183/+5490 | |
|\| | | | | | | | | | | | Conflicts: view/css/mod_events.css view/theme/redbasic/css/style.css | |||||
| * | 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 | 1 | -0/+12 | |
| | | ||||||
| * | remote rating and addition of rate-me to channel profile sidebar | friendica | 2015-02-04 | 5 | -3/+38 | |
| | | ||||||
| * | add the required js file | friendica | 2015-02-04 | 1 | -0/+34 | |
| | | ||||||
| * | first cut at rating widget. The flaw is that it is limited because it ↵ | friendica | 2015-02-04 | 5 | -24/+48 | |
| | | | | | | | | 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 | 6 | -10/+33 | |
| | | ||||||
| * | ratings - mopping up, most everything but directory sync implemented | friendica | 2015-02-03 | 5 | -8/+30 | |
| | | ||||||
| * | rating form work | friendica | 2015-02-03 | 3 | -1/+17 | |
| | | ||||||
| * | 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 | 4 | -12/+17 | |
| | | ||||||
| * | run ratingsearch on the server | friendica | 2015-02-03 | 3 | -10/+1 | |
| | | ||||||
| * | Merge branch 'master' into pocorate | friendica | 2015-02-03 | 3 | -5148/+5286 | |
| |\ | ||||||
| | * | 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 | |
| | | | ||||||
| * | | 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-02-01 | 1 | -3/+3 | |
|\| | ||||||
| * | typo, see #884 | jeroenpraat | 2015-02-02 | 1 | -3/+3 | |
| | | ||||||
* | | Merge branch 'master' into tres | friendica | 2015-01-31 | 5 | -4/+17 | |
|\| | | | | | | | | | Conflicts: include/zot.php | |||||
| * | better cross-browser compatibility for td hover colour | marijus | 2015-01-30 | 1 | -1/+1 | |
| | | ||||||
| * | 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 | 2 | -2/+2 | |
| |\ \ | ||||||
| | * | | small autocomplete fix adding space to the output | RedSwede | 2015-01-29 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | provides: the ability to press enter after pressing enter during the mention-js-popup (this second enter should behave as a normal one) FF35 | |||||
| | * | | non-tested fix for issue 847 | RedSwede | 2015-01-29 | 1 | -1/+1 | |
| | |/ | ||||||
| * | | Merge branch 'master' into pocorate | friendica | 2015-01-29 | 2 | -66/+66 | |
| |\| | ||||||
| * | | Merge branch 'master' into pocorate | friendica | 2015-01-28 | 2 | -4/+4 | |
| |\ \ | ||||||
| * | | | 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 | 3 | -5/+22 | |
| |_|/ |/| | | ||||||
* | | | local_user => local_channel | friendica | 2015-01-28 | 2 | -66/+66 | |
| |/ |/| | ||||||
* | | fix /view/de/lostpass_eml.tpl | marijus | 2015-01-28 | 1 | -4/+2 | |
| | | ||||||
* | | show shared button only to local user | marijus | 2015-01-28 | 1 | -0/+2 | |
|/ | ||||||
* | tpl and css cleanup | marijus | 2015-01-27 | 2 | -12/+5 | |
| | ||||||
* | move userReadableSize() and getIconFromType() from ↵ | marijus | 2015-01-27 | 3 | -0/+59 | |
| | | | | /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. | |||||
* | rework the new connection stuff so we don't need a "permissions have been ↵ | friendica | 2015-01-25 | 1 | -4/+4 | |
| | | | | changed but not saved" message. | |||||
* | 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. |