aboutsummaryrefslogtreecommitdiffstats
path: root/mod
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into tresfriendica2015-02-083-6/+8
|\
| * undo extra loggingfriendica2015-02-081-0/+1
| * make default calendar view ambivalent to the state of the ignore flag.friendica2015-02-081-3/+2
| * Merge https://github.com/friendica/red into pending_mergefriendica2015-02-081-1/+1
| |\
| | * revert to get_rel_link()marijus2015-02-061-1/+1
| * | restrict "mark all events seen" to only the events that are presented in the ...friendica2015-02-081-2/+4
| |/
| * fix objurl until get_rel_link() gets sortedmarijus2015-02-061-1/+1
| * style the checkboxes in the event formfriendica2015-02-051-1/+1
| * event form cleanup backported from trinidad - still need to style the checkboxesfriendica2015-02-051-3/+4
* | Merge branch 'master' into tresfriendica2015-02-059-123/+428
|\|
| * remote rating and addition of rate-me to channel profile sidebarfriendica2015-02-041-0/+158
| * hide channel address in directory from hovertip if not logged into the matrixfriendica2015-02-031-1/+1
| * remove extra debuggingfriendica2015-02-031-2/+1
| * probably enough for now - couldn't get the censorship filter in today, I thin...friendica2015-02-032-1/+2
| * order ratings friends firstfriendica2015-02-032-2/+18
| * final cleanup on ratings featurefriendica2015-02-031-1/+23
| * finish off the sync functionsfriendica2015-02-031-2/+3
| * ratings - mopping up, most everything but directory sync implementedfriendica2015-02-033-35/+24
| * rating form workfriendica2015-02-031-0/+5
| * styling for the directory page when it comes to ratingsfriendica2015-02-033-15/+2
| * honour block public setting - especially for standalonesfriendica2015-02-033-1/+24
| * run ratingsearch on the serverfriendica2015-02-032-26/+87
| * for now punt if have no poi, but we should get it from the serverfriendica2015-02-031-1/+1
| * start to tie ratings to the directory pagefriendica2015-02-021-0/+4
| * add ratings to the directory sync arraysfriendica2015-02-021-0/+17
| * send rating information to directoriesfriendica2015-02-022-4/+4
| * sign the ratings, fix the bugsfriendica2015-02-023-6/+15
| * Merge branch 'master' into pocoratefriendica2015-02-021-3/+8
| |\
| | * improved directory registration - honour standalones and do the right thingfriendica2015-02-021-3/+8
| * | add signaturesfriendica2015-02-021-4/+12
| |/
* | Merge branch 'master' into tresfriendica2015-02-013-2/+73
|\|
| * admin/dbsync not reporting failed updatesfriendica2015-02-011-1/+1
| * two tracks proceeding in parallel - first adding the ability to store a digit...friendica2015-02-012-1/+72
* | Merge branch 'master' into tresfriendica2015-01-315-7/+146
|\|
| * Merge pull request #881 from cvogeley/masterRedMatrix2015-01-301-0/+3
| |\
| | * Add allowed and not allowed emails to the UI in theChristian Vogeley2015-01-291-0/+3
| * | how did that stuff merge? grrrr....friendica2015-01-291-1/+1
| * | enable ratings only in this branch until we're ready to pushfriendica2015-01-291-1/+1
| * | Merge branch 'master' into pocoratefriendica2015-01-292-4/+3
| |\ \
| | * \ Merge https://github.com/friendica/red into pending_mergefriendica2015-01-291-4/+2
| | |\ \
| | | * | fix issue 848 + code commentsRedSwede2015-01-291-4/+2
| | | |/
| | * / disable ratings until we're a bit further along. It's all changing.friendica2015-01-291-0/+1
| | |/
| * | Merge branch 'master' into pocoratefriendica2015-01-2989-593/+593
| |\|
| * | prate modulefriendica2015-01-291-0/+91
| * | basic query for number of raters. Should probably be a join or subselect but ...friendica2015-01-281-1/+11
| * | updates to put rating info into the local xlink before sending it to known di...friendica2015-01-281-2/+38
* | | cleanup event form and various required indicators on inputsfriendica2015-01-291-3/+4
* | | Merge branch 'master' into tresfriendica2015-01-2989-595/+595
|\ \ \ | | |/ | |/|
| * | Merge https://github.com/friendica/red into pending_mergefriendica2015-01-281-1/+1
| |\ \
| | * | Merge branch 'master' of https://github.com/friendica/redHabeas Codice2015-01-288-236/+83
| | |\|