aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
| |/
* | 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
| * remove preview on jot resetMario Vavti2018-05-201-0/+1
| * Merge pull request #1176 from galettesaucisse/patch-48git-marijus2018-05-201-13/+22
| |\
| | * Update hstrings.phpGalette Saucisse2018-05-181-2/+2
| | * Update hstrings.phpGalette Saucisse2018-05-171-15/+24
| * | Merge pull request #1175 from galettesaucisse/patch-47git-marijus2018-05-201-144/+188
| |\ \
| | * | Update hmessages.poGalette Saucisse2018-05-171-144/+188
| | |/
| * | Merge pull request #1174 from anaqreon/devgit-marijus2018-05-203-6/+6
| |\ \
| | * | Rename Permission Groups to Permission Categories and clarify feature setting...Andrew Manning2018-05-153-6/+6
| * | | Merge pull request #1171 from mjfriaza/devgit-marijus2018-05-202-24/+30
| |\ \ \
| | * | | Added spaces at PHP replacements & Grammatical consistency error on Spanish t...Manuel Jiménez Friaza2018-05-152-17/+17
| | * | | Added one space & Grammatical consistency error on Spanish translationManuel Jiménez Friaza2018-05-131-5/+11
| | * | | Added one space & Grammatical consistency error on Spanish translationManuel Jiménez Friaza2018-05-131-3/+3
| * | | | backport waitmans changes #1170 from masterMario Vavti2018-05-2013-13/+13
| * | | | do not update #acl-list-content on every click in jot. we just need this upda...Mario Vavti2018-05-201-49/+51
| * | | | remove some cruft from initEditor();Mario Vavti2018-05-201-70/+10
| * | | | implement jot reset buttonMario Vavti2018-05-206-6/+37
| * | | | update to fork-awesome 1.1 and fix an old font-awesome referenceMario Vavti2018-05-199-51/+215
| * | | | fix issue where images were not visible in acl selector after using searchMario Vavti2018-05-191-0/+4
| * | | | fix issues with attachment labelsMario Vavti2018-05-191-2/+8
| * | | | Merge remote-tracking branch 'mike/master' into devMario Vavti2018-05-191-2/+6
| |\ \ \ \
| * \ \ \ \ Merge remote-tracking branch 'mike/master' into devMario Vavti2018-05-194-14/+7
| |\ \ \ \ \
| * | | | | | remove debug codeMario Vavti2018-05-181-4/+0
| * | | | | | versionMario Vavti2018-05-181-1/+1