aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into tresfriendica2015-02-0897-6382/+7723
|\
| * Merge pull request #890 from f03el/masterRedMatrix2015-02-091-4128/+4271
| |\
| | * Update Swedish stringsErik Lundin2015-02-071-4128/+4271
| * | Merge branch 'event_edit'friendica2015-02-085-15/+120
| |\ \
| | * | we still need an event preview but this looks a lot better.friendica2015-02-085-60/+100
| | * | first cut at putting editor tools in event formfriendica2015-02-081-0/+65
| * | | undo extra loggingfriendica2015-02-081-0/+1
| |/ /
| * | generate the correct service permalinkfriendica2015-02-083-8/+30
| * | 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-082-3/+5
| |/
| * Merge https://github.com/friendica/red into pending_mergefriendica2015-02-061-1/+1
| |\
| | * fix objurl until get_rel_link() gets sortedmarijus2015-02-061-1/+1
| * | more doc updatesfriendica2015-02-0610-0/+772
| * | get_rel_link broken - also weekly doc updatesfriendica2015-02-0675-2213/+2504
| |/
| * style the checkboxes in the event formfriendica2015-02-053-5/+9
| * event form cleanup backported from trinidad - still need to style the checkboxesfriendica2015-02-054-9/+37
* | Merge branch 'master' into tresfriendica2015-02-0545-5364/+6398
|\|
| * allow post expiration to be set from a config (and therefore a plugin/addon)friendica2015-02-051-1/+4
| * over-ride permissions for sys channel delivery from diasporafriendica2015-02-051-9/+13
| * another issue with diaspora postings to sys channel - sys has no connections,...friendica2015-02-051-6/+14
| * Merge https://github.com/friendica/red into pending_mergefriendica2015-02-053-27/+70
| |\
| | * typomarijus2015-02-051-1/+1
| | * forgot to remove some debug stuffmarijus2015-02-051-2/+0
| | * make file activity respect parent dir permissions workmarijus2015-02-051-22/+66
| | * Merge branch 'master' of https://github.com/friendica/redHabeas Codice2015-02-0549-5349/+6405
| | |\
| | * | escape datesHabeas Codice2015-02-051-1/+1
| | * | typo/cleanup pg onlyHabeas Codice2015-02-051-4/+5
| * | | 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-053-2/+14
| | |/ | |/|
| * | diaspora public posts not delivering to sys channel if there were no other su...friendica2015-02-041-4/+9
| * | forgot to add the self exclusionfriendica2015-02-041-2/+4
| * | allow anybody to view ratings - including oneself. Only allow authenticated f...friendica2015-02-041-9/+9
| * | add 'view ratings' to the widget. It's actually two stacked widgets rather th...friendica2015-02-041-2/+6
| * | honour the rating enable setting (which we really do need to rename since it ...friendica2015-02-041-0/+5
| * | remote rating and addition of rate-me to channel profile sidebarfriendica2015-02-048-15/+228
| * | add the required js filefriendica2015-02-041-0/+34
| * | Merge https://github.com/friendica/red into pending_mergefriendica2015-02-041-28/+60
| |\ \
| | * | not quite there yet but getting closer a littlemarijus2015-02-041-28/+60
| * | | first cut at rating widget. The flaw is that it is limited because it require...friendica2015-02-048-25/+82
| |/ /
| * | 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-033-7/+8
| * | order ratings friends firstfriendica2015-02-033-6/+18
| * | final cleanup on ratings featurefriendica2015-02-038-11/+57
| * | finish off the sync functionsfriendica2015-02-032-2/+46
| * | ratings - mopping up, most everything but directory sync implementedfriendica2015-02-039-43/+57
| * | rating form workfriendica2015-02-034-1/+22
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-11 19:41:43 +0000