| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev | Andrew Manning | 2018-05-24 | 63 | -469/+1010 |
| |\ | |||||
| | * | paint the locks on private activitypub items red. their privacy model is ↵ | Mario Vavti | 2018-05-23 | 2 | -1/+5 |
| | | | | | | | | | "slightly" different from ours | ||||
| | * | deal with db failure gracefully | zotlabs | 2018-05-23 | 1 | -2/+2 |
| | | | |||||
| | * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2018-05-21 | 10 | -16/+29 |
| | |\ | |||||
| | | * | address globbing issue in #1170 | Mario Vavti | 2018-05-21 | 6 | -6/+18 |
| | | | | |||||
| | | * | missing permission description | Mario Vavti | 2018-05-21 | 3 | -6/+3 |
| | | | | |||||
| | | * | bring jot reset to some more places | Mario Vavti | 2018-05-21 | 4 | -4/+8 |
| | | | | |||||
| | * | | new_channel - make text strings translatable and use the name as a base for ↵ | zotlabs | 2018-05-21 | 4 | -9/+46 |
| | | | | | | | | | | | | | the nick if you try to create without entering a nick | ||||
| | * | | update response types | zotlabs | 2018-05-21 | 1 | -1/+1 |
| | | | | |||||
| | * | | oauth2 discovery per draft-ietf-oauth-discovery-10 | zotlabs | 2018-05-21 | 2 | -1/+32 |
| | | | | |||||
| | * | | add hook 'get_system_apps' | zotlabs | 2018-05-21 | 1 | -0/+2 |
| | | | | |||||
| | * | | not null violation oauth1 | zotlabs | 2018-05-21 | 1 | -1/+1 |
| | |/ | |||||
| | * | first cut at a general purpose gdpr document. What we would like to do is ↵ | zotlabs | 2018-05-20 | 2 | -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_merge | zotlabs | 2018-05-20 | 46 | -436/+772 |
| | |\ | |||||
| | | * | update oauth related tables to use bigint/int(10) for user_id column. this ↵ | Mario | 2018-05-20 | 5 | -10/+68 |
| | | | | | | | | | | | | | is to be more consistent with the rest of the tables and fixes issue #1180 | ||||
| | | * | improve abconfig queries | Mario Vavti | 2018-05-20 | 3 | -3/+30 |
| | | | | |||||
| | | * | more local_channel() is not string | Mario Vavti | 2018-05-20 | 1 | -10/+10 |
| | | | | |||||
| | | * | local_channel() is not string | Mario Vavti | 2018-05-20 | 1 | -3/+3 |
| | | | | |||||
| | | * | css fix | Mario Vavti | 2018-05-20 | 1 | -1/+1 |
| | | | | |||||
| | | * | remove preview on jot reset | Mario Vavti | 2018-05-20 | 1 | -0/+1 |
| | | | | |||||
| | | * | Merge pull request #1176 from galettesaucisse/patch-48 | git-marijus | 2018-05-20 | 1 | -13/+22 |
| | | |\ | | | | | | | | | Update hstrings.php | ||||
| | | | * | Update hstrings.php | Galette Saucisse | 2018-05-18 | 1 | -2/+2 |
| | | | | | |||||
| | | | * | Update hstrings.php | Galette Saucisse | 2018-05-17 | 1 | -15/+24 |
| | | | | | |||||
| | | * | | Merge pull request #1175 from galettesaucisse/patch-47 | git-marijus | 2018-05-20 | 1 | -144/+188 |
| | | |\ \ | | | | | | | | | | | Update hmessages.po | ||||
| | | | * | | Update hmessages.po | Galette Saucisse | 2018-05-17 | 1 | -144/+188 |
| | | | |/ | |||||
| | | * | | Merge pull request #1174 from anaqreon/dev | git-marijus | 2018-05-20 | 3 | -6/+6 |
| | | |\ \ | | | | | | | | | | | Rename Permission Groups to Permission Categories and clarify feature… | ||||
| | | * \ \ | Merge pull request #1171 from mjfriaza/dev | git-marijus | 2018-05-20 | 2 | -24/+30 |
| | | |\ \ \ | | | | | | | | | | | | | Added one space & Grammatical consistency error on Spanish translation | ||||
| | | | * | | | Added spaces at PHP replacements & Grammatical consistency error on Spanish ↵ | Manuel Jiménez Friaza | 2018-05-15 | 2 | -17/+17 |
| | | | | | | | | | | | | | | | | | | | | | | | | | translation | ||||
| | | | * | | | Added one space & Grammatical consistency error on Spanish translation | Manuel Jiménez Friaza | 2018-05-13 | 1 | -5/+11 |
| | | | | | | | |||||
| | | | * | | | Added one space & Grammatical consistency error on Spanish translation | Manuel Jiménez Friaza | 2018-05-13 | 1 | -3/+3 |
| | | | | | | | |||||
| | | * | | | | backport waitmans changes #1170 from master | Mario Vavti | 2018-05-20 | 13 | -13/+13 |
| | | | | | | | |||||
| | | * | | | | do not update #acl-list-content on every click in jot. we just need this ↵ | Mario Vavti | 2018-05-20 | 1 | -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 Vavti | 2018-05-20 | 1 | -70/+10 |
| | | | | | | | |||||
| | | * | | | | implement jot reset button | Mario Vavti | 2018-05-20 | 6 | -6/+37 |
| | | | | | | | |||||
| | | * | | | | update to fork-awesome 1.1 and fix an old font-awesome reference | Mario Vavti | 2018-05-19 | 9 | -51/+215 |
| | | | | | | | |||||
| | | * | | | | fix issue where images were not visible in acl selector after using search | Mario Vavti | 2018-05-19 | 1 | -0/+4 |
| | | | | | | | |||||
| | | * | | | | fix issues with attachment labels | Mario Vavti | 2018-05-19 | 1 | -2/+8 |
| | | | | | | | |||||
| | | * | | | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-05-19 | 1 | -2/+6 |
| | | |\ \ \ \ | |||||
| | | * \ \ \ \ | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-05-19 | 4 | -14/+7 |
| | | |\ \ \ \ \ | |||||
| | | * | | | | | | remove debug code | Mario Vavti | 2018-05-18 | 1 | -4/+0 |
| | | | | | | | | | |||||
| | | * | | | | | | version | Mario Vavti | 2018-05-18 | 1 | -1/+1 |
| | | | | | | | | | |||||
| | | * | | | | | | an attempt to fix the new_channel validation situation | Mario Vavti | 2018-05-18 | 3 | -32/+80 |
| | | | |_|_|_|/ | | |/| | | | | |||||
| | * | | | | | | pleroma does not return a valid JRD when given an accept header of ↵ | zotlabs | 2018-05-20 | 1 | -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 method | zotlabs | 2018-05-20 | 1 | -3/+4 |
| | | |_|/ / / | |/| | | | | |||||
| | * | | | | | hubzilla issue #1086, pending count on admin summary page | zotlabs | 2018-05-19 | 1 | -2/+6 |
| | | |/ / / | |/| | | | |||||
| | * | | | | wrong default param for pubstream_incl (this checkin also picked up a few ↵ | zotlabs | 2018-05-18 | 4 | -14/+7 |
| | | | | | | | | | | | | | | | | | | | | | minor and hopefully non-significant changes) | ||||
| * | | | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev | Andrew Manning | 2018-05-18 | 5 | -12/+30 |
| |\ \ \ \ \ | | |/ / / | |/| | / | |_|_|/ |/| | | | |||||
| | * | | | display address in contact_format() instead of nick | Mario Vavti | 2018-05-17 | 1 | -1/+1 |
| | |/ / | |||||
| | * | | missing include | Mario Vavti | 2018-05-16 | 1 | -0/+1 |
| | | | | |||||
| | * | | provide function to fetch photo contents from url | zotlabs | 2018-05-15 | 3 | -10/+27 |
| | | | | |||||
 |
index : volse-hubzilla.git | |
| Volse Hubzilla -- soft fork of main Hubzilla core for Volse | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |