aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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…
| | * | Rename Permission Groups to Permission Categories and clarify feature ↵Andrew Manning2018-05-153-6/+6
| | | | | | | | | | | | | | | | settings text.
| * | | 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
| | | | |
| * | | | 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
| | | | | | |
| * | | | | | an attempt to fix the new_channel validation situationMario Vavti2018-05-183-32/+80
| | |_|_|_|/ | |/| | | |
| * | | | | display address in contact_format() instead of nickMario Vavti2018-05-171-1/+1
| | | | | |
* | | | | | pleroma does not return a valid JRD when given an accept header of ↵zotlabs2018-05-201-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | application/jrd+json - it only returns a JRD when passed an accept header of application/json (ahead of anything else because XRD is served at the same endpoint)
* | | | | | remove unused mindate parameter in the network/stream API methodzotlabs2018-05-201-3/+4
| |_|/ / / |/| | | |
* | | | | hubzilla issue #1086, pending count on admin summary pagezotlabs2018-05-191-2/+6
| |/ / / |/| | |
* | | | wrong default param for pubstream_incl (this checkin also picked up a few ↵zotlabs2018-05-184-14/+7
|/ / / | | | | | | | | | minor and hopefully non-significant changes)
* | | missing includeMario Vavti2018-05-161-0/+1
| | |
* | | provide function to fetch photo contents from urlzotlabs2018-05-153-10/+27
| | |
* | | anybody authenticated not correctly handled in can_comment_on_post()zotlabs2018-05-151-1/+1
| |/ |/|
* | we must now provide the full path to the profile image for the cavatar ↵Mario Vavti2018-05-154-15/+15
| | | | | | | | plugin to work
* | make get_default_profile_photo() pluggablezotlabs2018-05-141-0/+11
| |
* | code whitespace and formattingzotlabs2018-05-141-6/+6
| |
* | If somebody used hooks to create a new permission role, there was no ↵zotlabs2018-05-141-0/+2
| | | | | | | | mechanism to insert the new role into the dropdown list of roles at selection time.
* | ensure all password checking goes through the authenticate plugin hook (for ↵zotlabs2018-05-141-80/+98
| | | | | | | | instance in mod_removeme)
* | refactor the 'where does the register link point?' logiczotlabs2018-05-145-18/+43
| |
* | fine tuning the refactored tag/mention codezotlabs2018-05-141-1/+2
| |
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2018-05-14197-5920/+7334
|\ \
| * | Revert "We're no longer setting a backup ACL for private mention typos."Mario Vavti2018-05-141-0/+4
| | | | | | | | | | | | This reverts commit 356c7003f2d18a283a819c22c255f03397e99fc9.
| * | Merge remote-tracking branch 'mike/master' into devMario Vavti2018-05-141-4/+0
| |\ \