Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of https://github.com/redmatrix/hubzilla | Mario | 2018-04-30 | 7 | -3336/+4300 |
|\ | |||||
| * | Update PermissionLimits.php | Mike Macgirvin | 2018-04-22 | 1 | -4/+2 |
| | | | | | | Difficult for me to do this locally at the moment so updating in git | ||||
| * | Merge pull request #1067 from galettesaucisse/patch-7 | git-marijus | 2018-04-13 | 1 | -0/+12 |
| |\ | | | | | | | Create /doc/context/fr/settings/features/help.html | ||||
| | * | Create /doc/context/fr/settings/features/help.html | Galette Saucisse | 2018-04-10 | 1 | -0/+12 |
| | | | | | | | | | French translation for context help | ||||
| * | | Merge pull request #1066 from galettesaucisse/patch-6 | git-marijus | 2018-04-13 | 1 | -338/+478 |
| |\ \ | | | | | | | | | Update French hstrings.php | ||||
| | * | | Update hstrings.php | Galette Saucisse | 2018-04-10 | 1 | -338/+478 |
| | |/ | |||||
| * | | Merge pull request #1063 from galettesaucisse/patch-5 | git-marijus | 2018-04-13 | 1 | -3013/+3790 |
| |\ \ | | | | | | | | | Update French hmessages.po | ||||
| | * | | Update hmessages.po | Galette Saucisse | 2018-04-10 | 1 | -3013/+3790 |
| | |/ | |||||
| * | | Merge pull request #1060 from galettesaucisse/patch-4 | git-marijus | 2018-04-13 | 1 | -0/+4 |
| |\ \ | | | | | | | | | Create /doc/context/fr/admin/queue/help.html | ||||
| | * | | Create /doc/context/fr/admin/queue/help.html | Galette Saucisse | 2018-04-10 | 1 | -0/+4 |
| | |/ | | | | | | | French translation for context help | ||||
| * | | Merge pull request #1059 from galettesaucisse/patch-3 | git-marijus | 2018-04-13 | 1 | -0/+8 |
| |\ \ | | | | | | | | | Create /doc/context/fr/admin/logs/help.html | ||||
| | * | | translation correction | Galette Saucisse | 2018-04-10 | 1 | -1/+1 |
| | | | | |||||
| | * | | Create /doc/context/fr/admin/logs/help.html | Galette Saucisse | 2018-04-10 | 1 | -0/+8 |
| | |/ | | | | | | | French translation of context help | ||||
| * | | Merge pull request #1056 from galettesaucisse/patch-2 | git-marijus | 2018-04-13 | 1 | -0/+6 |
| |\ \ | | |/ | |/| | Create /doc/context/fr/channel | ||||
| | * | Update help.html | Galette Saucisse | 2018-04-10 | 1 | -1/+1 |
| | | | |||||
| | * | Create /doc/context/fr/channel | Galette Saucisse | 2018-04-10 | 1 | -0/+6 |
| |/ | | | | | French translation for context help | ||||
| * | Merge pull request #1054 from galettesaucisse/patch-1 | git-marijus | 2018-04-10 | 1 | -0/+19 |
| |\ | | | | | | | Update French hstrings.php | ||||
| | * | Update French hstrings.php | Galette Saucisse | 2018-04-10 | 1 | -0/+19 |
| |/ | | | | | added some missing strings | ||||
* / | we shouldn't need distinct here, since ids_to_querystr() will filter ↵ | zotlabs | 2018-04-08 | 1 | -1/+1 |
|/ | | | | duplicates. It might have an effect on pager totals. Need to monitor for a few days. | ||||
* | bump version3.2.2 | Mario Vavti | 2018-04-05 | 1 | -1/+1 |
| | |||||
* | change hearts for heart in reactions but cheet with the unicode | Mario Vavti | 2018-04-05 | 1 | -0/+0 |
| | |||||
* | use transform to scale emojis. this prevents text jumping on hover | Mario Vavti | 2018-04-05 | 1 | -2/+3 |
| | |||||
* | fix missing login/out buttons for medium screensize | Mario Vavti | 2018-04-05 | 2 | -6/+6 |
| | |||||
* | wrong function | zotlabs | 2018-04-05 | 1 | -1/+1 |
| | |||||
* | display and link issues with quoted tags | zotlabs | 2018-04-05 | 1 | -6/+7 |
| | |||||
* | don't include the q and PHPSESSID request variables in a redirected rpost | zotlabs | 2018-04-05 | 1 | -1/+3 |
| | |||||
* | php strpos() empty needle warning when a term entry has no url | zotlabs | 2018-04-05 | 1 | -1/+1 |
| | |||||
* | preserve existing categories when updating an app from an embed source | zotlabs | 2018-04-05 | 1 | -0/+6 |
| | |||||
* | app sellpage not being stored | zotlabs | 2018-04-05 | 2 | -0/+2 |
| | |||||
* | new markdown lib seems to handle < and > correct. remove the workaraound. | Mario Vavti | 2018-04-05 | 1 | -2/+2 |
| | |||||
* | tagadelic was being overly protective of permissions. | zotlabs | 2018-04-05 | 1 | -2/+2 |
| | |||||
* | make list mode work in cards and articles | zotlabs | 2018-04-05 | 4 | -8/+42 |
| | |||||
* | make alt_pager work for articles/cards | zotlabs | 2018-04-05 | 2 | -6/+29 |
| | |||||
* | hubzilla issue #1013 - comments not displayed in single card/article view | zotlabs | 2018-04-05 | 2 | -4/+6 |
| | |||||
* | prevent reload loop if somebody lands on /ochannel (without channel_address ↵ | Mario Vavti | 2018-03-23 | 1 | -0/+3 |
| | | | | and without trailing slash) | ||||
* | Add Ochannel module for testing OStatus bad behaviour | zotlabs | 2018-03-23 | 1 | -0/+66 |
| | |||||
* | Merge pull request #1004 from goofy-bz/patch-1 | git-marijus | 2018-03-23 | 1 | -6/+6 |
|\ | | | | | Update hmessages.po | ||||
| * | Update hmessages.po | goofy-bz | 2018-03-17 | 1 | -6/+6 |
| | | | | | | typofix | ||||
* | | Merge pull request #1008 from fadelkon/update_cat_translation | git-marijus | 2018-03-23 | 6 | -6966/+11194 |
|\ \ | |/ |/| | Update translations for catalan (ca/ca_ES) from transifex | ||||
| * | Update translations for catalan (ca/ca_ES) from transifex | fadelkon | 2018-03-17 | 6 | -6966/+11194 |
|/ | |||||
* | fix channel_address | Mario Vavti | 2018-03-15 | 1 | -1/+1 |
| | |||||
* | make the oneway-overlay slightly opaque | Mario Vavti | 2018-03-15 | 1 | -0/+1 |
| | |||||
* | Partial italina translationhmessages.po hstrings.php | mrjive | 2018-03-13 | 2 | -8482/+13199 |
| | |||||
* | Spanish translation: adapted the new timeago's stuff | Manuel Jiménez Friaza | 2018-03-13 | 2 | -9/+9 |
| | |||||
* | bump version | Mario Vavti | 2018-03-13 | 1 | -1/+1 |
| | |||||
* | Spanish translation: added el before artículo, which is the correct ↵3.2.1 | Manuel Jiménez Friaza | 2018-03-13 | 2 | -5/+5 |
| | | | | construction. | ||||
* | obscure permission issue with custom permissions when using the highly ↵ | zotlabs | 2018-03-13 | 2 | -0/+10 |
| | | | | discouraged advisory privacy modes | ||||
* | add extra firstpage check | Mario Vavti | 2018-03-12 | 1 | -0/+4 |
| | |||||
* | update mysql schema | Mario Vavti | 2018-03-11 | 1 | -3/+0 |
| | |||||
* | do not use trim on array | Mario Vavti | 2018-03-10 | 1 | -1/+1 |
| |