aboutsummaryrefslogtreecommitdiffstats
path: root/view/tpl
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into tresfriendica2015-02-057-29/+45
|\
| * collapse overly-verbose ratingsfriendica2015-02-051-1/+1
| * increase size of rating value to make it stand out a bit.friendica2015-02-051-1/+1
| * remote rating and addition of rate-me to channel profile sidebarfriendica2015-02-042-0/+24
| * first cut at rating widget. The flaw is that it is limited because it require...friendica2015-02-041-1/+2
| * probably enough for now - couldn't get the censorship filter in today, I thin...friendica2015-02-031-6/+6
| * final cleanup on ratings featurefriendica2015-02-032-1/+2
| * ratings - mopping up, most everything but directory sync implementedfriendica2015-02-032-3/+6
| * rating form workfriendica2015-02-031-1/+1
| * styling for the directory page when it comes to ratingsfriendica2015-02-032-11/+5
| * run ratingsearch on the serverfriendica2015-02-031-10/+1
| * 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-01-313-2/+15
|\|
| * Merge pull request #881 from cvogeley/masterRedMatrix2015-01-301-1/+2
| |\
| | * Add allowed and not allowed emails to the UI in theChristian Vogeley2015-01-291-1/+2
| * | how did that stuff merge? grrrr....friendica2015-01-291-2/+2
| * | Merge branch 'master' into pocoratefriendica2015-01-291-1/+1
| |\ \
| | * | non-tested fix for issue 847RedSwede2015-01-291-1/+1
| | |/
| * | Merge branch 'master' into pocoratefriendica2015-01-291-1/+1
| |\|
| * | Merge branch 'master' into pocoratefriendica2015-01-281-0/+2
| |\ \
| * | | first cut at direntry template, right now just provide a mockup with a slider...friendica2015-01-271-0/+12
* | | | cleanup event form and various required indicators on inputsfriendica2015-01-291-1/+4
| |_|/ |/| |
* | | local_user => local_channelfriendica2015-01-281-1/+1
| |/ |/|
* | show shared button only to local usermarijus2015-01-281-0/+2
|/
* tpl and css cleanupmarijus2015-01-271-8/+1
* move userReadableSize() and getIconFromType() from /include/RedDAV/RedBrowser...marijus2015-01-271-0/+31
* 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 challenged...friendica2015-01-251-0/+3
* move connection approval checkbox to top of page (above the sliders) - instea...friendica2015-01-251-11/+8
* this will require more fixing in include/enotifymarijus2015-01-231-1/+1
* couple of hubloc manager issuesfriendica2015-01-211-3/+3
* css fixes - hopefullymarijus2015-01-201-1/+1
* satisfy the floated imagesmarijus2015-01-201-1/+1
* basic proof of concept file activity support - will send activity via the fil...marijus2015-01-182-3/+9
* more heavy lifting on poco repfriendica2015-01-152-17/+9
* poco rating - add a test module for pulling out ratingsfriendica2015-01-152-1/+38
* editing stuff for poco reputationfriendica2015-01-152-1/+9
* more backend work on poco ratingfriendica2015-01-153-0/+13
* hide friends broken, add parameter for item search by verbfriendica2015-01-131-0/+2
* another attempt to explain default permissions on connedit pagefriendica2015-01-111-4/+17
* Rename some stuff related to autocompleteStefan Parviainen2015-01-073-5/+5
* Replace fancybox with colorboxStefan Parviainen2015-01-051-4/+4
* Replace jslider with jRangeStefan Parviainen2015-01-052-3/+3
* Fix initEditor on non-wall pagesStefan Parviainen2015-01-051-1/+4
* Sorting of autocompleteStefan Parviainen2015-01-043-18/+20
|\
| * Merge https://github.com/friendica/red into pending_mergefriendica2015-01-041-2/+2
| |\
| | * provide some info for buttonsmarijus2015-01-031-2/+2
| * | remove hard-coded url to caterva.eu from events code.friendica2015-01-041-1/+1
| |/