aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* profile photo propagation issue if the local xchan_photo_[l|m|s] fields were ↵zotlabs2017-10-011-2/+10
| | | | changed from the /photo/profile/l/n form to photo/[hash] form by a clone operation.
* Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-10-015-24/+24
|\
| * Merge pull request #863 from mjfriaza/devgit-marijus2017-10-012-11/+11
| |\ | | | | | | Fixed some errors in the Spanish translation
| | * Fixed the Spanish translationManuel Jiménez Friaza2017-10-012-11/+11
| | |
| * | card_edit: fix lockstate and current permissions not handed over to editorMario Vavti2017-10-011-0/+2
| | |
| * | fix profile edit dropdown for multiple profilesMario Vavti2017-10-011-11/+9
| | |
| * | Update administrator_guide.mdAndrew Manning2017-09-301-2/+2
| | |
* | | use imagick converter for large photoszotlabs2017-09-303-2/+81
|/ /
* | 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 form
| * | add remote login to login formWaitman Gobble2017-09-181-0/+1
| | | | | | | | | This exists in nav login but not login.tpl
* | | Merge pull request #861 from waitman/patch-3git-marijus2017-09-281-0/+1
|\ \ \ | | | | | | | | add remote login to login.tpl
| * | | add remote login to login.tplWaitman Gobble2017-09-181-0/+1
| |/ / | | | | | | Add Remote login option to login.tpl, this exists in nav login.
* | | Merge pull request #862 from waitman/patch-4git-marijus2017-09-281-1/+5
|\ \ \ | | | | | | | | prevent 'my_address' being set with bogus info
| * | | prevent 'my_address' being set with bogus infoWaitman Gobble2017-09-181-1/+5
| |/ / | | | | | | After a user has authenticated, it is possible to set my_address in $_SESSION to 'anything' using zid= parameter in URL - if user is authenticated then zid is never set. This change kills the authenticated switch if a person sends a new zid through for processing, which will trigger remote authentication.
* | | process activity deletes from OStatus which for whatever reason do not use ↵zotlabs2017-09-272-37/+59
| | | | | | | | | | | | the industry standard tombstone mechanism
* | | 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 ↵Mario Vavti2017-09-271-1/+3
| | | | | | | | | | | | same classname hardcoded
* | | 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 ↵zotlabs2017-09-254-28/+36
| | | | | | | | | | | | | | | | belong) to Webserver, where we do similar module specific initialisations prior to calling Router->Dispatch()
| * | | 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
|/ / /
* | | 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
| | | | | | | | | | | | | | | | well as the traditional red style (@forumname+). This should probably not be advertised on a wide scale until after a critical mass of sites have updated to a version containing these changes. This adds yet another option type to the ACL module which probably needs refactoring soon since it is turning into option type spaghetti.
| * | | 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 ↵zotlabs2017-09-241-6/+46
| | | | | | | | | | | | | | | | sensitive (envelope, metadata) information.
* | | | 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 ↵zotlabs2017-09-212-3/+21
| | | | | | | | | | | | | | | | this is not backward compatible and older sites will see some incorrect delivery reports from newer sites until the next upgrade; as their systems will not know how to read the ecnrypted final reports.
* | | | no visible feedback when moving the affinity slider and waiting for content ↵zotlabs2017-09-211-0/+2
| | | | | | | | | | | | | | | | to load, the appropriate spinner div seems to have gone missing at some time in the past
* | | | pubsites broken and directory server admin selection includes known dead siteszotlabs2017-09-212-2/+3
| | | |