aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'upstream/dev' into docoAndrew Manning2017-08-273-5/+20
|\
| * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-08-243-21/+18
| |\
| * | fix title of edit card which showed up as 'edit block' due to copy/pastezotlabs2017-08-241-1/+1
| * | cards - change placeholdertext, separate from button textzotlabs2017-08-241-0/+2
| * | make cards searchablezotlabs2017-08-241-11/+13
| * | fix permalinks for card comments (send to parent url)zotlabs2017-08-241-0/+11
* | | Merge remote-tracking branch 'upstream/dev' into docoAndrew Manning2017-08-251-18/+4
|\ \ \ | | |/ | |/|
| * | Merge pull request #849 from anaqreon/docogit-marijus2017-08-241-1/+4
| |\ \
| * | | ditch discover tab in favour of the public stream appgit-marijus2017-08-241-18/+4
* | | | Removed duplicated table of contents (TOC) in Help pages by breaking hierarch...Andrew Manning2017-08-251-0/+2
| |/ / |/| |
* | | Merge remote-tracking branch 'upstream/dev' into docoAndrew Manning2017-08-2417-29/+588
|\| |
| * | Merge remote-tracking branch 'mike/master' into devMario Vavti2017-08-2417-29/+588
| |\|
| | * last remaining task in tasklist was not removed from view when 'completed'zotlabs2017-08-231-1/+2
| | * cards: make page load after comment postzotlabs2017-08-233-38/+49
| | * partial support (unfinished) for ajax loading cards with liveupdate; page sti...zotlabs2017-08-232-3/+41
| | * oembed provider cleanup, add oembed to cardszotlabs2017-08-236-14/+139
| | * add new conv_sort optionzotlabs2017-08-231-1/+1
| | * fix permalink for cardszotlabs2017-08-231-0/+4
| | * cards: acl supportzotlabs2017-08-231-0/+1
| | * add category support to main pagezotlabs2017-08-231-0/+3
| | * several card enhancementszotlabs2017-08-233-33/+161
| | * typozotlabs2017-08-231-1/+1
| | * cards featurezotlabs2017-08-234-3/+202
| | * test recursive dav copyzotlabs2017-08-221-0/+2
| | * allow cards to federatezotlabs2017-08-221-1/+1
| | * util/dcp - support recursion and folders full of photos by importing files si...zotlabs2017-08-221-0/+45
| | * remove debuggingzotlabs2017-08-211-4/+4
| | * more work on oembed from /displayzotlabs2017-08-213-8/+10
* | | Added language selector menu for Help pagesAndrew Manning2017-08-241-1/+4
|/ /
* / Repaired and extended support for help page translations including table of c...Andrew Manning2017-08-231-2/+10
|/
* stream_perms_xchans wasn't working which has effects in mod_display and there...zotlabs2017-08-211-21/+43
* some issues with message-ids and urlencoding (again)zotlabs2017-08-201-2/+1
* a few file activities were not getting syncedzotlabs2017-08-202-1/+21
* add namespaces to activitystreams parserzotlabs2017-08-201-12/+53
* httpsig - return an array with all the different signing possibilities enumer...zotlabs2017-08-201-8/+21
* issue with oembed of a shared item, which wraps in another share.zotlabs2017-08-201-10/+20
* more work on mod_displayzotlabs2017-08-191-1/+2
* better error reporting on mod_displayzotlabs2017-08-191-7/+5
* mv HTTPSig to core - so we can use it as an auth methodzotlabs2017-08-171-0/+220
* hubzilla issue #846zotlabs2017-08-171-1/+1
* move activitystreams parser back to core; we will eventually need it in core ...zotlabs2017-08-171-12/+20
* move ap_probe to pubcrawl addonzotlabs2017-08-161-42/+0
* more work on activitypub httpsignature verificationzotlabs2017-08-142-1/+18
* new content typezotlabs2017-08-141-2/+2
* Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-08-121-3/+3
|\
| * minor js and css changesgit-marijus2017-08-121-3/+3
* | add parent item (if applicable) to notifier plugin infozotlabs2017-08-121-0/+2
|/
* prevent uploads to comments if the channel has a default private ACL.zotlabs2017-08-102-2/+9
* create cdav principal also on client access and remove redundant pconfig chec...Mario Vavti2017-08-102-6/+12
* merge red/master into devMario Vavti2017-08-105-8/+9