aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2017-09-285-39/+67
|\
| * remove double remote login button and slightly change appearenceMario Vavti2017-09-282-2/+2
| * Merge pull request #860 from waitman/patch-2git-marijus2017-09-281-0/+1
| |\
| | * add remote login to login formWaitman Gobble2017-09-181-0/+1
| * | Merge pull request #861 from waitman/patch-3git-marijus2017-09-281-0/+1
| |\ \
| | * | add remote login to login.tplWaitman Gobble2017-09-181-0/+1
| | |/
| * | Merge pull request #862 from waitman/patch-4git-marijus2017-09-281-1/+5
| |\ \
| | * | prevent 'my_address' being set with bogus infoWaitman Gobble2017-09-181-1/+5
| | |/
| * | process activity deletes from OStatus which for whatever reason do not use th...zotlabs2017-09-272-37/+59
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2017-09-2736-615/+257
|\| |
| * | re-arrange some htmlMario Vavti2017-09-272-7/+7
| * | make justifiedGallery even more happyMario Vavti2017-09-272-2/+2
| * | make justifiedGallery happy againMario Vavti2017-09-273-2/+7
| * | do not use our spinner css on the justifiedGallery spinner which has the same...Mario Vavti2017-09-271-1/+3
| * | fix some missing spinnersMario Vavti2017-09-279-9/+20
| * | Merge remote-tracking branch 'mike/master' into devMario Vavti2017-09-266-44/+51
| |\ \
| | * | whitespacezotlabs2017-09-251-2/+0
| | * | move the Link header initialisation from Router (where it does not really bel...zotlabs2017-09-254-28/+36
| | * | typozotlabs2017-09-251-1/+1
| | * | more zot6 basic stuffzotlabs2017-09-253-11/+12
| | * | zot_site_info - always sign the site block with the site private keyzotlabs2017-09-251-4/+4
| * | | bump versionMario Vavti2017-09-261-1/+1
| * | | get rid of spinner.js in use a lightweight css spinner insteadMario Vavti2017-09-2622-558/+175
| |/ /
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2017-09-2515-628/+996
|\| |
| * | extend activity_match to work with arrayszotlabs2017-09-241-2/+10
| * | doc page for the new channel_links hookzotlabs2017-09-241-0/+12
| * | update the trusted CA cert databasezotlabs2017-09-242-560/+740
| * | missing Zlib filezotlabs2017-09-241-0/+25
| * | server/hub config storage for zot6zotlabs2017-09-241-0/+16
| * | ostatus - support likes of commentszotlabs2017-09-241-11/+19
| * | handle jsonld parse errors and send them to the app log instead of the php log.zotlabs2017-09-241-1/+9
| * | Merge branch 'tagging'zotlabs2017-09-247-48/+119
| |\ \
| | * | tagging changes - provides ability to mention a forum by using !forumname as ...zotlabs2017-09-247-46/+110
| | * | typozotlabs2017-09-241-1/+1
| | * | Merge branch 'master' into taggingzotlabs2017-09-2439-128/+364
| | |\ \
| | * | | acl issue with some ActivityPub completionszotlabs2017-09-171-3/+8
| | * | | more tag stuffzotlabs2017-09-171-1/+1
| | * | | tagging changeszotlabs2017-09-171-4/+11
| * | | | typozotlabs2017-09-241-1/+1
| | |/ / | |/| |
| * | | For zot6, allow HTTP Signatures to be encrypted, as they may contain sensitiv...zotlabs2017-09-241-6/+46
* | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2017-09-247-25/+44
|\| | |
| * | | fix missing content on channel pageMario Vavti2017-09-231-0/+1
| * | | delivery report decryption is not needed for local deliveryzotlabs2017-09-211-19/+14
| * | | encrypt delivery reports. This will cause a bit of consternation because this...zotlabs2017-09-212-3/+21
| * | | no visible feedback when moving the affinity slider and waiting for content t...zotlabs2017-09-211-0/+2
| * | | pubsites broken and directory server admin selection includes known dead siteszotlabs2017-09-212-2/+3
| * | | log the lack of http sig infozotlabs2017-09-211-1/+3
* | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2017-09-218-11/+76
|\| | |
| * | | Merge remote-tracking branch 'mike/master' into devMario Vavti2017-09-211-1/+10
| |\ \ \
| | * | | go back to the un-versioned jsonld contextzotlabs2017-09-211-1/+10
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-01 15:33:09 +0000