aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* better error reporting on mod_displayzotlabs2017-08-191-7/+5
|
* script html tags in js filezotlabs2017-08-191-2/+0
|
* php warningszotlabs2017-08-181-1/+1
|
* util/dcp "(DAV-copy) copy file from local system to Hubzilla/red DAV"zotlabs2017-08-171-0/+73
|
* 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
| | | | utilities
* update installation requirements - php 5.6 and mysql 5.5.3zotlabs2017-08-171-2/+2
|
* move ap_probe to pubcrawl addonzotlabs2017-08-161-42/+0
|
* Merge remote-tracking branch 'mike/master' into devMario Vavti2017-08-165-12/+26
|\
| * put unseen network count in page title; hubzilla issue #843zotlabs2017-08-151-1/+6
| |
| * remove easter eggzotlabs2017-08-151-7/+0
| |
| * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-08-153-3/+8
| |\
| * | more work on activitypub httpsignature verificationzotlabs2017-08-142-1/+18
| | |
| * | new content typezotlabs2017-08-142-3/+2
| | |
* | | update changelogMario Vavti2017-08-161-1/+1
| |/ |/|
* | typoMario Vavti2017-08-141-1/+1
| |
* | changelogMario Vavti2017-08-141-0/+1
| |
* | Merge pull request #842 from dawnbreak/devgit-marijus2017-08-142-2/+6
|\ \ | |/ |/| Update composer autload cache.
| * Update composer autload cache.Klaus Weidenbach2017-08-112-2/+6
| |
* | contact_slider.tpl didn't get updated with one of the bootstrap changes ↵zotlabs2017-08-131-3/+3
| | | | | | | | where 'in' was renamed to 'show'
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-08-1219-158/+151
|\ \
| * \ Merge remote-tracking branch 'mike/master' into devMario Vavti2017-08-121-2/+5
| |\ \
| * | | minor js and css changesgit-marijus2017-08-123-10/+16
| | |/ | |/|
| * | bump versionMario Vavti2017-08-111-1/+1
| | |
| * | update to bootstrap betaMario Vavti2017-08-1115-147/+134
| | |
* | | add parent item (if applicable) to notifier plugin infozotlabs2017-08-121-0/+2
| |/ |/|
* | add protocol selection to following feedszotlabs2017-08-121-2/+5
|/
* deliverable_singleton - also check hubloc_hash in case we don't have an ↵zotlabs2017-08-101-1/+9
| | | | xchan_hash
* prevent uploads to comments if the channel has a default private ACL.zotlabs2017-08-103-3/+23
|
* Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-08-105-17/+23
|\
| * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into devMario Vavti2017-08-102-4/+10
| |\
| | * update changeloggit-marijus2017-08-101-0/+1
| | |
| | * do not show channel manager and nav channel select if we are in a delegate ↵git-marijus2017-08-101-4/+8
| | | | | | | | | | | | session
| | * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into devgit-marijus2017-08-109-20/+22
| | |\
| | * | update changeloggit-marijus2017-08-091-0/+1
| | | |
| * | | create cdav principal also on client access and remove redundant pconfig ↵Mario Vavti2017-08-102-6/+12
| | |/ | |/| | | | | | | check in authentication process
| * | merge red/master into devMario Vavti2017-08-109-20/+22
| |/
| * App::get_channel() does not return the right channel if we are not looking ↵git-marijus2017-08-091-7/+1
| | | | | | | | at our own channel. fix issue #841
* | include the mastodon summary in the postzotlabs2017-08-101-2/+2
| |
* | when following, allow [network]follow_address syntax to connect with a ↵zotlabs2017-08-102-7/+20
| | | | | | | | specific network for multi-protocol services
* | some doco fixes and other real minor stuff to improve logreading abilityzotlabs2017-08-095-14/+15
| |
* | libxml errorszotlabs2017-08-094-6/+7
|/
* only show upload button to those with write_storage permissionzotlabs2017-08-082-0/+3
|
* support upload of files and attachments into comments. This has some ↵zotlabs2017-08-085-0/+49
| | | | repercussions when it comes to post permissions since the commenter will not know the distribution of the post. Basically the files will be uploaded with the commenter's default ACL. Most of the time this will do the right thing.
* Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-08-081-1/+95
|\
| * changeloggit-marijus2017-08-081-1/+95
| |
* | remove some no longer used images/iconszotlabs2017-08-0711-0/+0
|/
* ostatus feed was missing commentszotlabs2017-08-062-9/+5
|
* Merge pull request #838 from phellmes/devgit-marijus2017-08-062-2361/+2411
|\ | | | | Update DE translation strings (also for 2.6RC)