aboutsummaryrefslogtreecommitdiffstats
path: root/view
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into tresfriendica2015-02-0520-5183/+5490
|\ | | | | | | | | | | Conflicts: view/css/mod_events.css view/theme/redbasic/css/style.css
| * collapse overly-verbose ratingsfriendica2015-02-052-1/+5
| |
| * increase size of rating value to make it stand out a bit.friendica2015-02-053-13/+6
| |
| * author profile photo in reshare wasn't linkedfriendica2015-02-051-0/+12
| |
| * remote rating and addition of rate-me to channel profile sidebarfriendica2015-02-045-3/+38
| |
| * add the required js filefriendica2015-02-041-0/+34
| |
| * first cut at rating widget. The flaw is that it is limited because it ↵friendica2015-02-045-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 ↵friendica2015-02-031-6/+6
| | | | | | | | think that's the only bit missing.
| * final cleanup on ratings featurefriendica2015-02-036-10/+33
| |
| * ratings - mopping up, most everything but directory sync implementedfriendica2015-02-035-8/+30
| |
| * rating form workfriendica2015-02-033-1/+17
| |
| * that didn't look so good on a small screen - let it hang out on the right marginfriendica2015-02-031-2/+1
| |
| * styling for the directory page when it comes to ratingsfriendica2015-02-034-12/+17
| |
| * run ratingsearch on the serverfriendica2015-02-033-10/+1
| |
| * Merge branch 'master' into pocoratefriendica2015-02-033-5148/+5286
| |\
| | * Fixed height of items in dropdown notification lists. They overlapped when ↵jeroenpraat2015-02-031-0/+7
| | | | | | | | | | | | the browser uses a higher font size. This must work for everyone.
| | * NL on 100 percent again :/jeroen2015-02-032-5148/+5279
| | |
| * | start to tie ratings to the directory pagefriendica2015-02-021-4/+4
| |/
| * respect parent dir permissionsmarijus2015-02-021-0/+2
| |
* | Merge branch 'master' into tresfriendica2015-02-011-3/+3
|\|
| * typo, see #884jeroenpraat2015-02-021-3/+3
| |
* | Merge branch 'master' into tresfriendica2015-01-315-4/+17
|\| | | | | | | | | Conflicts: include/zot.php
| * better cross-browser compatibility for td hover colourmarijus2015-01-301-1/+1
| |
| * Merge pull request #881 from cvogeley/masterRedMatrix2015-01-301-1/+2
| |\ | | | | | | Add allowed and not allowed emails to the UI in the
| | * Add allowed and not allowed emails to the UI in theChristian Vogeley2015-01-291-1/+2
| | | | | | | | | | | | admin menu
| * | how did that stuff merge? grrrr....friendica2015-01-291-2/+2
| | |
| * | Merge branch 'master' into pocoratefriendica2015-01-292-2/+2
| |\ \
| | * | small autocomplete fix adding space to the outputRedSwede2015-01-291-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 847RedSwede2015-01-291-1/+1
| | |/
| * | Merge branch 'master' into pocoratefriendica2015-01-292-66/+66
| |\|
| * | Merge branch 'master' into pocoratefriendica2015-01-282-4/+4
| |\ \
| * | | first cut at direntry template, right now just provide a mockup with a ↵friendica2015-01-271-0/+12
| | | | | | | | | | | | | | | | slider and rating count to look at.
* | | | cleanup event form and various required indicators on inputsfriendica2015-01-293-5/+22
| |_|/ |/| |
* | | local_user => local_channelfriendica2015-01-282-66/+66
| |/ |/|
* | fix /view/de/lostpass_eml.tplmarijus2015-01-281-4/+2
| |
* | show shared button only to local usermarijus2015-01-281-0/+2
|/
* tpl and css cleanupmarijus2015-01-272-12/+5
|
* move userReadableSize() and getIconFromType() from ↵marijus2015-01-273-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.friendica2015-01-251-0/+2
|
* don't hide the scary stuff when editing self permissions.friendica2015-01-251-2/+8
|
* Hide all the scary decision making stuff that sends intellectually ↵friendica2015-01-251-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 ↵friendica2015-01-251-4/+4
| | | | changed but not saved" message.
* move connection approval checkbox to top of page (above the sliders) - ↵friendica2015-01-251-11/+8
| | | | instead of being in between rating and rating text.
* this will require more fixing in include/enotifymarijus2015-01-231-1/+1
|
* couple of hubloc manager issuesfriendica2015-01-211-3/+3
|
* bring back nav-search spinnermarijus2015-01-212-7/+11
|
* More styling for poco reputation page. Note: the reason this isn't yet ↵friendica2015-01-201-0/+4
| | | | linked to the UI is because we need to age some old '1' values that are bogus.
* css fixes - hopefullymarijus2015-01-204-15/+24
|
* satisfy the floated imagesmarijus2015-01-203-3/+3
|
* as a workaround make nav-search dropdown behave a little bettermarijus2015-01-203-11/+11
|