aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of https://github.com/friendica/redThomas Willingham2014-11-252-4/+14
|\
| * theme the observer tags so they stick out like a sore thumb. Too much bad juju.friendica2014-11-242-4/+14
* | Update dir fallbacks.Thomas Willingham2014-11-251-1/+0
|/
* Merge https://github.com/friendica/red into pending_mergefriendica2014-11-249-18686/+19723
|\
| * Merge pull request #707 from HaakonME/masterRedMatrix2014-11-252-4902/+5594
| |\
| | * Updated Norwegian bokmål translationHaakon Meland Eriksen2014-11-232-4902/+5594
| * | Merge pull request #709 from tuscanhobbit/devPaolo T2014-11-242-5007/+5205
| |\ \
| | * | Italian translationPaolo Tacconi2014-11-242-5007/+5205
| | * | Merge pull request #7 from friendica/masterPaolo T2014-11-24472-26959/+41480
| | |\ \ | | |/ / | |/| |
| * | | and update DutchJeroen2014-11-242-4385/+4403
| * | | Merge pull request #708 from zzottel/masterzzottel2014-11-243-4392/+4521
| |\ \ \
| | * | | update to German stringszottel2014-11-242-4392/+4519
| | * | | update to Germanmain help filezottel2014-11-241-0/+2
* | | | | hide online presence maps to DNTfriendica2014-11-242-3/+6
|/ / / /
* / / / add event export (this month) to event UIfriendica2014-11-243-1/+14
|/ / /
* | | basic vcalendar formatting supportfriendica2014-11-232-6/+60
* | | add link to search forums in the directoryfriendica2014-11-233-2/+12
* | | allow directory searches to be filtered by (public forums) and/or (! public f...friendica2014-11-233-3/+18
* | | more roadmapfriendica2014-11-231-0/+3
* | | Merge https://github.com/friendica/red into pending_mergefriendica2014-11-2313-6217/+7163
|\ \ \ | | |/ | |/|
| * | Merge pull request #706 from f03el/masterRedMatrix2014-11-238-6216/+7142
| |\ \
| | * | Update Swedish translationsErik Lundin2014-11-228-6216/+7142
| * | | added dbdriver to siteinfo json to better track affected sitesHabeas Codice2014-11-225-1/+21
| |/ /
* | | project roadmapfriendica2014-11-234-1/+51
* | | Merge https://github.com/friendica/red into pending_mergefriendica2014-11-225-3/+13
|\| |
| * | prevent database hackery from leaking over the wireHabeas Codice2014-11-221-1/+2
| * | somehow missed this oneHabeas Codice2014-11-221-0/+2
| * | Merge remote-tracking branch 'upstream/master'Habeas Codice2014-11-219-20/+277
| |\ \
| * | | new system config reserved_channelsHabeas Codice2014-11-212-1/+8
| * | | implicit type conversionHabeas Codice2014-11-211-1/+1
* | | | random block widgetfriendica2014-11-224-2648/+2721
* | | | doc updatesfriendica2014-11-2291-1408/+1554
| |/ / |/| |
* | | allow the photo_rand widget to access photos from any channel (useful if the ...friendica2014-11-201-1/+5
* | | more logging for zot_feed anomaliesfriendica2014-11-201-0/+2
* | | more directory tuning to ignore things we already know we can't possibly updatefriendica2014-11-201-1/+6
* | | directory: don't try and sync a directory update that points to a hubloc we a...friendica2014-11-201-1/+18
* | | yet another option for the homepagefriendica2014-11-205-18/+186
* | | Merge https://github.com/friendica/red into pending_mergefriendica2014-11-202-27/+78
|\| |
| * | fix driver issue for large dbsHabeas Codice2014-11-201-25/+76
| * | Merge remote-tracking branch 'upstream/master'Habeas Codice2014-11-203-2/+8
| |\ \
| * | | implicit boolean, formattingHabeas Codice2014-11-201-2/+2
* | | | random photo widgetfriendica2014-11-202-1/+62
| |/ / |/| |
* | | to-do updatefriendica2014-11-201-0/+1
* | | friendica commenters are currently shown using "Diaspora" app. Try and fix th...friendica2014-11-202-2/+7
|/ /
* | Merge remote-tracking branch 'upstream/master'Habeas Codice2014-11-1917-50/+80
|\ \
| * | change logging of some troublesome or noisy bits so we can figure out what is...friendica2014-11-193-4/+4
| * | minor photo flag issue - and some more whitespace editsfriendica2014-11-193-6/+6
| * | couple of fixes:friendica2014-11-192-1/+6
| * | there's still a permission issue delivering a public post directly to the sys...friendica2014-11-193-2/+4
| * | add sys channel to public recips if scope publicfriendica2014-11-181-0/+12