aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Directory sorting as a dropdown, forum filter as checkbox, option to sort old...Stefan Parviainen2014-12-074-10/+28
* bootstrap-3.3.1 and minor css fixesmarijus2014-11-299-188/+227
* Merge https://github.com/friendica/red into pending_mergefriendica2014-11-282-19/+20
|\
| * Issue #713 Arguably, we shouldn't allow poking yourself and stuff eitherThomas Willingham2014-11-291-1/+2
| * Doco - #710 flipped the colours. Unsurprisingly, they were the otherThomas Willingham2014-11-281-18/+18
* | update mozilla cacert.pemfriendica2014-11-283-732/+849
* | doc updatesfriendica2014-11-2857-155/+564
|/
* Merge https://github.com/friendica/red into pending_mergefriendica2014-11-275-4080/+3988
|\
| * Merge pull request #710 from anaqreon/features-docRedMatrix2014-11-283-132/+8
| |\
| | * Documentation wordingAndrew Manning2014-11-253-132/+8
| * | Merge pull request #712 from f03el/masterRedMatrix2014-11-282-3948/+3980
| |\ \
| | * | Update Swedish stringsErik Lundin2014-11-251-778/+785
| | * | Update Swedish stringsErik Lundin2014-11-251-3170/+3195
| | |/
* | / revupfriendica2014-11-271-1/+1
|/ /
* | revupfriendica2014-11-261-1/+1
* | Merge remote-tracking branch 'upstream/master'Habeas Codice2014-11-26129-28979/+31328
|\|
| * Make events export track the current calendar. Turn it and 'new event' into b...friendica2014-11-242-3/+13
| * Merge https://github.com/friendica/red into pending_mergefriendica2014-11-241-1/+0
| |\
| | * Merge branch 'master' of https://github.com/friendica/redThomas Willingham2014-11-252-4/+14
| | |\
| | * | Update dir fallbacks.Thomas Willingham2014-11-251-1/+0
| * | | ical output wasn't using 24-hour timefriendica2014-11-241-2/+2
| | |/ | |/|
| * | theme the observer tags so they stick out like a sore thumb. Too much bad juju.friendica2014-11-242-4/+14
| |/
| * 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
| * | | | project roadmapfriendica2014-11-234-1/+51
| * | | | Merge https://github.com/friendica/red into pending_mergefriendica2014-11-225-3/+13
| |\ \ \ \ | | | |/ / | | |/| |
| * | | | random block widgetfriendica2014-11-224-2648/+2721
| * | | | doc updatesfriendica2014-11-2291-1408/+1554
* | | | | fix true toggleHabeas Codice2014-11-261-1/+2
| |_|/ / |/| | |
* | | | added dbdriver to siteinfo json to better track affected sitesHabeas Codice2014-11-225-1/+21
| |/ / |/| |
* | | 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
|\| |