aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'dev' of https://github.com/redmatrix/hubzilla into devAndrew Manning2018-05-259-14889/+16856
|\
| * 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 for sources changes up to Apr 23rd 2018
| | | * | Update catalan translation (both po and php) for sources changes up to Apr ↵fadelkon2018-05-242-3225/+4431
| | | | | | | | | | | | | | | | | | | | 23rd 2018, 07:35.
| | * | | Merge pull request #1183 from galettesaucisse/patch-50git-marijus2018-05-241-0/+10
| | |\ \ \ | | | | | | | | | | | | Create TermsOfService.md
| | | * | | Create TermsOfService.mdGalette Saucisse2018-05-211-0/+10
| | | | | |
| | * | | | Merge pull request #1182 from galettesaucisse/patch-49git-marijus2018-05-241-0/+77
| | |\ \ \ \ | | | |_|/ / | | |/| | | Create gdpr1.md
| | | * | | 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
| |/ / / | | | | | | | | Found an improperly closed <div> tag. It breaks the way widget are displayed on the page.
* | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into devAndrew Manning2018-05-2463-469/+1010
|\| | |
| * | | paint the locks on private activitypub items red. their privacy model is ↵Mario Vavti2018-05-232-1/+5
| | |/ | |/| | | | | | | "slightly" different from ours
| * | 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 ↵zotlabs2018-05-214-9/+46
| | | | | | | | | | | | the nick if you try to create without entering a nick
| * | 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 ↵zotlabs2018-05-202-0/+120
| | | | | | | | use a conditional expression so that a site document will be loaded if it exists, and fallback to a project boiler plate document if it does not. This is an exercise for the community.
| * 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 ↵Mario2018-05-205-10/+68
| | | | | | | | | | | | is to be more consistent with the rest of the tables and fixes issue #1180
| | * 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.php
| | | * 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.po
| | | * | 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…
| | * \ \ Merge pull request #1171 from mjfriaza/devgit-marijus2018-05-202-24/+30
| | |\ \ \ | | | | | | | | | | | | Added one space & Grammatical consistency error on Spanish translation
| | | * | | Added spaces at PHP replacements & Grammatical consistency error on Spanish ↵Manuel Jiménez Friaza2018-05-152-17/+17
| | | | | | | | | | | | | | | | | | | | | | | | translation
| | | * | | 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 ↵Mario Vavti2018-05-201-49/+51
| | | | | | | | | | | | | | | | | | | | | | | | updated when in cutom mode (which is rarely the case). jot interaction was getting sluggish due to this when having lots of contacts.
| | * | | | remove some cruft from initEditor();Mario Vavti2018-05-201-70/+10
| | | | | |
| | * | | | implement jot reset buttonMario Vavti2018-05-206-6/+37
| | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-26 09:05:24 +0000