aboutsummaryrefslogtreecommitdiffstats
path: root/include
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of https://github.com/friendica/redThomas Willingham2014-12-131-27/+27
|\
| * Merge pull request #738 from pafcu/moreidsThomas Willingham2014-12-131-27/+27
| |\
| | * Add some ids to nav elementsStefan Parviainen2014-12-121-27/+27
* | | Let Diaspora hublocs come back by allowing discover_by_webbie() to carry on ifThomas Willingham2014-12-131-3/+2
|/ /
* | don't import to sys channel from self-censored authorsfriendica2014-12-121-1/+11
* | Merge https://github.com/friendica/red into pending_mergefriendica2014-12-1010-233/+596
|\ \
| * | Provide censorship.Thomas Willingham2014-12-101-4/+9
| * | show clear browser location button only if use browser location option is set...marijus2014-12-091-1/+1
| * | Make it clear that title and categories are optionalStefan Parviainen2014-12-081-2/+2
| |/
| * Merge pull request #726 from pafcu/tagsinotherchannelsThomas Willingham2014-12-082-3/+270
| |\
| | * Show tags in other channels profile field to make it easier to navigate to th...Stefan Parviainen2014-12-072-3/+270
| * | Merge pull request #723 from pafcu/diroptsThomas Willingham2014-12-081-0/+17
| |\ \
| | * | Directory sorting as a dropdown, forum filter as checkbox, option to sort old...Stefan Parviainen2014-12-071-0/+17
| | |/
| * | Merge pull request #727 from dawnbreak/docuThomas Willingham2014-12-085-222/+259
| |\ \
| | * | Some Doxygen comments and small cleanups.Klaus Weidenbach2014-12-075-222/+259
| * | | small changeChristian Vogeley2014-12-071-1/+1
| * | | Remove channel cloud files from file system whenChristian Vogeley2014-12-071-0/+36
| |/ /
| * | Missing include if photo album widget called from not-the-photos page.Thomas Willingham2014-12-041-1/+2
* | | block adult channels from inclusion in public content feedsfriendica2014-12-101-2/+2
|/ /
* | can't reset public to false because it may have been passed in as true and th...friendica2014-12-011-5/+5
* | Somewhat subtle process_delivery() bug - $public was not being reset if a sysThomas Willingham2014-12-011-0/+1
* | Whitespace. Stupid £#@£@$ editor.Thomas Willingham2014-11-292-7/+7
* | Fix abook_toggle_flag from postgres stuffThomas Willingham2014-11-291-5/+7
|/
* Issue #713 Arguably, we shouldn't allow poking yourself and stuff eitherThomas Willingham2014-11-291-1/+2
* 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-241-4/+6
* hide online presence maps to DNTfriendica2014-11-241-3/+3
* basic vcalendar formatting supportfriendica2014-11-232-6/+60
* add link to search forums in the directoryfriendica2014-11-231-2/+3
* allow directory searches to be filtered by (public forums) and/or (! public f...friendica2014-11-231-0/+1
* Merge https://github.com/friendica/red into pending_mergefriendica2014-11-234-0/+18
|\
| * added dbdriver to siteinfo json to better track affected sitesHabeas Codice2014-11-224-0/+18
* | Merge https://github.com/friendica/red into pending_mergefriendica2014-11-223-2/+10
|\|
| * 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-215-9/+95
| |\
| * | new system config reserved_channelsHabeas Codice2014-11-211-1/+6
* | | random block widgetfriendica2014-11-221-0/+41
| |/ |/|
* | 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-202-7/+11
* | Merge https://github.com/friendica/red into pending_mergefriendica2014-11-201-2/+2
|\|
| * Merge remote-tracking branch 'upstream/master'Habeas Codice2014-11-201-1/+6
| |\
| * | implicit boolean, formattingHabeas Codice2014-11-201-2/+2
* | | random photo widgetfriendica2014-11-201-1/+55
| |/ |/|
* | friendica commenters are currently shown using "Diaspora" app. Try and fix th...friendica2014-11-201-1/+6
|/
* 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-192-5/+5