aboutsummaryrefslogtreecommitdiffstats
path: root/include
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'dev' of https://github.com/redmatrix/hubzilla into devMario Vavti2017-09-011-1/+7
|\
| * Merge pull request #850 from anaqreon/docogit-marijus2017-09-011-1/+7
| |\
| | * Merge remote-tracking branch 'upstream/dev' into docoAndrew Manning2017-08-272-3/+10
| | |\
| | * \ Merge remote-tracking branch 'upstream/dev' into docoAndrew Manning2017-08-251-18/+1
| | |\ \
| | * | | Removed duplicated table of contents (TOC) in Help pages by breaking hierarch...Andrew Manning2017-08-251-1/+7
* | | | | cut down on a few extraneous gprobe processeszotlabs2017-08-311-1/+3
* | | | | some changes after testing server-to-server magic authzotlabs2017-08-311-8/+11
* | | | | add server-to-server magic auth to dav and cdav controllerszotlabs2017-08-311-1/+1
* | | | | server to server magic authzotlabs2017-08-311-2/+50
* | | | | simplify api_authzotlabs2017-08-311-15/+9
|/ / / /
* | | | check input is hex before sending it to hex2binzotlabs2017-08-301-1/+1
* | | | issue with mentions and xchans with @ or /zotlabs2017-08-301-1/+1
* | | | use iso 8601 "Zulu" for log timestamps so it can be easily processed with fai...zotlabs2017-08-291-3/+6
* | | | escape 'http' inside code blocks so it doesn't trigger an oembedzotlabs2017-08-292-0/+5
| |_|/ |/| |
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-08-242-28/+53
|\ \ \ | | |/ | |/|
| * | Merge pull request #849 from anaqreon/docogit-marijus2017-08-241-1/+24
| |\|
| | * Merge remote-tracking branch 'upstream/dev' into docoAndrew Manning2017-08-248-6/+195
| | |\
| | * | Added language selector menu for Help pagesAndrew Manning2017-08-241-1/+24
| * | | ditch discover tab in favour of the public stream appgit-marijus2017-08-241-18/+1
| | |/ | |/|
| * | Merge remote-tracking branch 'mike/master' into devMario Vavti2017-08-248-6/+195
| |\ \ | | |/ | |/|
| * | Fixed incorrect language path when choosing the language from browser preferenceAndrew Manning2017-08-241-1/+1
| * | Repaired and extended support for help page translations including table of c...Andrew Manning2017-08-231-10/+29
* | | cards - change placeholdertext, separate from button textzotlabs2017-08-241-1/+5
* | | make cards searchablezotlabs2017-08-242-2/+5
| |/ |/|
* | cards: make page load after comment postzotlabs2017-08-231-0/+6
* | partial support (unfinished) for ajax loading cards with liveupdate; page sti...zotlabs2017-08-231-0/+9
* | use two keys for the updated sortzotlabs2017-08-231-1/+3
* | add new conv_sort optionzotlabs2017-08-231-0/+6
* | lognoise: don't log sync packet contents if there are no clones to receive themzotlabs2017-08-231-2/+3
* | several card enhancementszotlabs2017-08-232-1/+8
* | cards featurezotlabs2017-08-235-2/+154
* | util/dcp - support recursion and folders full of photos by importing files si...zotlabs2017-08-221-1/+7
|/
* stream_perms_xchans wasn't working which has effects in mod_display and there...zotlabs2017-08-211-1/+2
* issue with oembed of a shared item, which wraps in another share.zotlabs2017-08-201-2/+2
* php warningszotlabs2017-08-181-1/+1
* remove easter eggzotlabs2017-08-151-7/+0
* new content typezotlabs2017-08-141-1/+0
* add protocol selection to following feedszotlabs2017-08-121-2/+5
* deliverable_singleton - also check hubloc_hash in case we don't have an xchan...zotlabs2017-08-101-1/+9
* prevent uploads to comments if the channel has a default private ACL.zotlabs2017-08-101-1/+14
* Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-08-101-4/+8
|\
| * do not show channel manager and nav channel select if we are in a delegate se...git-marijus2017-08-101-4/+8
| * merge red/master into devMario Vavti2017-08-103-7/+8
* | include the mastodon summary in the postzotlabs2017-08-101-2/+2
* | when following, allow [network]follow_address syntax to connect with a specif...zotlabs2017-08-102-7/+20
* | some doco fixes and other real minor stuff to improve logreading abilityzotlabs2017-08-091-2/+2
* | libxml errorszotlabs2017-08-092-5/+6
|/
* ostatus feed was missing commentszotlabs2017-08-062-9/+5
* Merge branch 'dev' of https://github.com/redmatrix/hubzilla into devgit-marijus2017-08-061-0/+86
|\
| * allow channel address to be changedzotlabs2017-08-041-0/+86