aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2018-05-295-5/+27
|\
| * Merge remote-tracking branch 'mike/master' into devMario Vavti2018-05-291-0/+2
| |\
| * \ Merge pull request #1202 from aninf-wo/devgit-marijus2018-05-291-0/+1
| |\ \
| | * | include photos.phpHerbert Thielen2018-05-271-0/+1
| * | | Merge pull request #1198 from mjfriaza/devgit-marijus2018-05-292-0/+21
| |\ \ \
| | * | | Some stuff of the Spanish HubzillaManuel Jiménez Friaza2018-05-262-0/+21
| * | | | Merge pull request #1197 from galettesaucisse/patch-52git-marijus2018-05-291-2/+2
| |\ \ \ \
| | * | | | Update hstrings.phpGalette Saucisse2018-05-261-2/+2
| * | | | | Merge pull request #1196 from galettesaucisse/patch-51git-marijus2018-05-291-3/+3
| |\ \ \ \ \
| | * | | | | Update hmessages.poGalette Saucisse2018-05-261-3/+3
| | |/ / / /
| * | | | | Merge remote-tracking branch 'mike/master' into devMario Vavti2018-05-281-2/+2
| |\ \ \ \ \ | | |_|_|/ / | |/| | | |
* | | | | | provide possibility of using different orderings (post, commented) on channel...zotlabs2018-05-291-4/+11
| |_|_|_|/ |/| | | |
* | | | | we probably don't need to delivery local items more than oncezotlabs2018-05-281-0/+2
* | | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2018-05-271-2/+2
|\| | | | | |/ / / |/| | |
| * | | fix js error with catalan language (unescaped strings)Mario Vavti2018-05-271-2/+2
* | | | hubzilla issue #1200zotlabs2018-05-271-2/+2
|/ / /
* / / DB update to fix wrong hubloc_url for activitypub hublocsMario Vavti2018-05-262-1/+27
|/ /
* | differentiate between direct messages and followers-only messagesMario Vavti2018-05-251-2/+6
* | Merge remote-tracking branch 'mike/master' into devMario Vavti2018-05-251-6/+14
|\ \
| * | alternate fix for z_check_dnszotlabs2018-05-241-6/+14
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into devMario Vavti2018-05-256-14880/+16835
|\ \ \
| * | | Finaly an update of Dutch language stringsJeroen2018-05-242-11655/+12317
| * | | Merge pull request #1190 from fadelkon/devgit-marijus2018-05-242-3225/+4431
| |\ \ \
| | * | | Update catalan translation (both po and php) for sources changes up to Apr 23...fadelkon2018-05-242-3225/+4431
| * | | | Merge pull request #1183 from galettesaucisse/patch-50git-marijus2018-05-241-0/+10
| |\ \ \ \
| | * | | | Create TermsOfService.mdGalette Saucisse2018-05-211-0/+10
| * | | | | Merge pull request #1182 from galettesaucisse/patch-49git-marijus2018-05-241-0/+77
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | Update gdpr1.mdGalette Saucisse2018-05-211-13/+6
| | * | | | Update gdpr1.mdGalette Saucisse2018-05-211-8/+3
| | * | | | Update gdpr1.mdGalette Saucisse2018-05-211-17/+5
| | * | | | Create gdpr1.mdGalette Saucisse2018-05-211-0/+101
| | |/ / /
* | / / / Update remote_friends_common.tplantil0pa2018-05-241-1/+1
|/ / / /
* | / / paint the locks on private activitypub items red. their privacy model is "sli...Mario Vavti2018-05-232-1/+5
| |/ / |/| |
* | | deal with db failure gracefullyzotlabs2018-05-231-2/+2
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2018-05-2110-16/+29
|\ \ \
| * | | address globbing issue in #1170Mario Vavti2018-05-216-6/+18
| |/ /
| * | missing permission descriptionMario Vavti2018-05-213-6/+3
| * | bring jot reset to some more placesMario Vavti2018-05-214-4/+8
* | | new_channel - make text strings translatable and use the name as a base for t...zotlabs2018-05-214-9/+46
* | | update response typeszotlabs2018-05-211-1/+1
* | | oauth2 discovery per draft-ietf-oauth-discovery-10zotlabs2018-05-212-1/+32
* | | add hook 'get_system_apps'zotlabs2018-05-211-0/+2
* | | not null violation oauth1zotlabs2018-05-211-1/+1
|/ /
* | first cut at a general purpose gdpr document. What we would like to do is use...zotlabs2018-05-202-0/+120
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2018-05-2046-436/+772
|\ \
| * | update oauth related tables to use bigint/int(10) for user_id column. this is...Mario2018-05-205-10/+68
| * | improve abconfig queriesMario Vavti2018-05-203-3/+30
| * | more local_channel() is not stringMario Vavti2018-05-201-10/+10
| * | local_channel() is not stringMario Vavti2018-05-201-3/+3
| * | css fixMario Vavti2018-05-201-1/+1