aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #849 from anaqreon/docogit-marijus2017-08-244-2/+93
|\
| * Merge remote-tracking branch 'upstream/dev' into docoAndrew Manning2017-08-2433-64/+904
| |\
| * | Added language selector menu for Help pagesAndrew Manning2017-08-244-2/+93
* | | ditch discover tab in favour of the public stream appgit-marijus2017-08-242-36/+5
| |/ |/|
* | Merge remote-tracking branch 'mike/master' into devMario Vavti2017-08-2433-64/+904
|\ \
| * | last remaining task in tasklist was not removed from view when 'completed'zotlabs2017-08-231-1/+2
| * | add tasklist and notes to cards pagezotlabs2017-08-231-1/+4
| * | add a section to the admin guide about admin rights and how to grant them if ...zotlabs2017-08-231-0/+13
| * | cards: make likes reload pagezotlabs2017-08-232-2/+3
| * | cards: make page load after comment postzotlabs2017-08-234-38/+55
| * | partial support (unfinished) for ajax loading cards with liveupdate; page sti...zotlabs2017-08-234-3/+51
| * | oembed provider cleanup, add oembed to cardszotlabs2017-08-236-14/+139
| * | apply autotime to all autotime classed elements when static loading a pagezotlabs2017-08-231-2/+1
| * | add autotime to cardszotlabs2017-08-231-0/+4
| * | use two keys for the updated sortzotlabs2017-08-231-1/+3
| * | add new conv_sort optionzotlabs2017-08-232-1/+7
| * | lognoise: don't log sync packet contents if there are no clones to receive themzotlabs2017-08-231-2/+3
| * | 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-238-37/+175
| * | typozotlabs2017-08-231-1/+1
| * | cards featurezotlabs2017-08-2313-7/+373
| * | test recursive dav copyzotlabs2017-08-222-5/+19
| * | allow cards to federatezotlabs2017-08-221-1/+1
| * | add support for card doctype and activity_obj typezotlabs2017-08-221-1/+3
| * | util/dcp - support recursion and folders full of photos by importing files si...zotlabs2017-08-223-26/+116
| * | remove debuggingzotlabs2017-08-211-4/+4
| * | more work on oembed from /displayzotlabs2017-08-213-8/+10
* | | Merge pull request #848 from anaqreon/docogit-marijus2017-08-245-92/+113
|\ \ \ | |/ / |/| / | |/
| * 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-235-92/+113
|/
* stream_perms_xchans wasn't working which has effects in mod_display and there...zotlabs2017-08-212-22/+45
* some issues with message-ids and urlencoding (again)zotlabs2017-08-201-2/+1
* util/dcp will now accept a directory as a destination. The directory must exi...zotlabs2017-08-201-36/+50
* a few file activities were not getting syncedzotlabs2017-08-204-3/+37
* add dmkdirzotlabs2017-08-201-0/+48
* 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
* Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-08-202-1/+9
|\
| * Update zot_protocol.bbAndrew Manning2017-08-201-1/+1
| * Merge remote-tracking branch 'mike/master' into devMario Vavti2017-08-201-1/+2
| |\
| * \ Merge remote-tracking branch 'mike/master' into devMario Vavti2017-08-194-10/+79
| |\ \
| * | | update changelogMario Vavti2017-08-181-0/+5
| * | | update changeloggit-marijus2017-08-181-0/+4
* | | | zot_protocol values are true and false; it is only php print_r() that turns t...zotlabs2017-08-201-4/+4
* | | | issue with oembed of a shared item, which wraps in another share.zotlabs2017-08-202-12/+22
| |_|/ |/| |
* | | more work on mod_displayzotlabs2017-08-191-1/+2
| |/ |/|
* | better error reporting on mod_displayzotlabs2017-08-191-7/+5
* | script html tags in js filezotlabs2017-08-191-2/+0