Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| | * | | | include photos.php | Herbert Thielen | 2018-05-27 | 1 | -0/+1 | |
| | | | | | | | | | | | | | | | | | | | | required for photo_calculate_scale() | |||||
| * | | | | Merge pull request #1198 from mjfriaza/dev | git-marijus | 2018-05-29 | 2 | -0/+21 | |
| |\ \ \ \ | | | |_|/ | | |/| | | Some stuff of the Spanish Hubzilla | |||||
| | * | | | Some stuff of the Spanish Hubzilla | Manuel Jiménez Friaza | 2018-05-26 | 2 | -0/+21 | |
| | | | | | ||||||
| * | | | | Merge pull request #1197 from galettesaucisse/patch-52 | git-marijus | 2018-05-29 | 1 | -2/+2 | |
| |\ \ \ \ | | | | | | | | | | | | | Update hstrings.php | |||||
| | * | | | | Update hstrings.php | Galette Saucisse | 2018-05-26 | 1 | -2/+2 | |
| | | | | | | ||||||
| * | | | | | Merge pull request #1196 from galettesaucisse/patch-51 | git-marijus | 2018-05-29 | 1 | -3/+3 | |
| |\ \ \ \ \ | | | | | | | | | | | | | | | Update hmessages.po | |||||
| | * | | | | | Update hmessages.po | Galette Saucisse | 2018-05-26 | 1 | -3/+3 | |
| | |/ / / / | ||||||
| * | | | | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-05-28 | 1 | -2/+2 | |
| |\ \ \ \ \ | | |_|_|/ / | |/| | | | | ||||||
* | | | | | | provide possibility of using different orderings (post, commented) on ↵ | zotlabs | 2018-05-29 | 1 | -4/+11 | |
| |_|_|_|/ |/| | | | | | | | | | | | | | | channel page | |||||
* | | | | | we probably don't need to delivery local items more than once | zotlabs | 2018-05-28 | 1 | -0/+2 | |
| | | | | | ||||||
* | | | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2018-05-27 | 1 | -2/+2 | |
|\| | | | | |/ / / |/| | | | ||||||
| * | | | fix js error with catalan language (unescaped strings) | Mario Vavti | 2018-05-27 | 1 | -2/+2 | |
| | | | | ||||||
* | | | | hubzilla issue #1200 | zotlabs | 2018-05-27 | 1 | -2/+2 | |
|/ / / | ||||||
* / / | DB update to fix wrong hubloc_url for activitypub hublocs | Mario Vavti | 2018-05-26 | 2 | -1/+27 | |
|/ / | ||||||
* | | differentiate between direct messages and followers-only messages | Mario Vavti | 2018-05-25 | 1 | -2/+6 | |
| | | ||||||
* | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-05-25 | 1 | -6/+14 | |
|\ \ | ||||||
| * | | alternate fix for z_check_dns | zotlabs | 2018-05-24 | 1 | -6/+14 | |
| | | | ||||||
* | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev | Mario Vavti | 2018-05-25 | 6 | -14880/+16835 | |
|\ \ \ | ||||||
| * | | | Finaly an update of Dutch language strings | Jeroen | 2018-05-24 | 2 | -11655/+12317 | |
| | | | | ||||||
| * | | | Merge pull request #1190 from fadelkon/dev | git-marijus | 2018-05-24 | 2 | -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 ↵ | fadelkon | 2018-05-24 | 2 | -3225/+4431 | |
| | | | | | | | | | | | | | | | | | | | | 23rd 2018, 07:35. | |||||
| * | | | | Merge pull request #1183 from galettesaucisse/patch-50 | git-marijus | 2018-05-24 | 1 | -0/+10 | |
| |\ \ \ \ | | | | | | | | | | | | | Create TermsOfService.md | |||||
| | * | | | | Create TermsOfService.md | Galette Saucisse | 2018-05-21 | 1 | -0/+10 | |
| | | | | | | ||||||
| * | | | | | Merge pull request #1182 from galettesaucisse/patch-49 | git-marijus | 2018-05-24 | 1 | -0/+77 | |
| |\ \ \ \ \ | | |_|/ / / | |/| | | | | Create gdpr1.md | |||||
| | * | | | | Update gdpr1.md | Galette Saucisse | 2018-05-21 | 1 | -13/+6 | |
| | | | | | | ||||||
| | * | | | | Update gdpr1.md | Galette Saucisse | 2018-05-21 | 1 | -8/+3 | |
| | | | | | | ||||||
| | * | | | | Update gdpr1.md | Galette Saucisse | 2018-05-21 | 1 | -17/+5 | |
| | | | | | | ||||||
| | * | | | | Create gdpr1.md | Galette Saucisse | 2018-05-21 | 1 | -0/+101 | |
| | |/ / / | ||||||
* | / / / | Update remote_friends_common.tpl | antil0pa | 2018-05-24 | 1 | -1/+1 | |
|/ / / / | | | | | | | | | Found an improperly closed <div> tag. It breaks the way widget are displayed on the page. | |||||
* | / / | 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 | |
| | | | |