Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| | * | | | | | | | | Merge pull request #3 from redmatrix/dev | mrjive | 2018-04-05 | 48 | -222/+1068 | |
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Dev | |||||
| | * \ \ \ \ \ \ \ \ | Merge pull request #1 from redmatrix/dev | mrjive | 2018-03-29 | 14 | -28/+57 | |
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Dev | |||||
| * | | | | | | | | | | | update zot.php to fix php warning invalid argument supplied for foreach() | Mario Vavti | 2018-04-23 | 1 | -16/+18 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - this is taken from pr #1085 which was against wrong branch | |||||
| * | | | | | | | | | | | Proposed fix for issue #1091 - mod-help.css | Mario Vavti | 2018-04-23 | 1 | -2/+2 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - this is taken from pr #1098 which was against wrong branch | |||||
| * | | | | | | | | | | | Merge pull request #1097 from galettesaucisse/patch-13 | git-marijus | 2018-04-23 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Proposed fix for issue #1091 - mod-help.js | |||||
| | * | | | | | | | | | | | Proposed fix for issue #1091 | Galette Saucisse | 2018-04-20 | 1 | -1/+1 | |
| | | |_|_|_|_|_|_|/ / / | | |/| | | | | | | | | | ||||||
| * | | | | | | | | | | | Merge pull request #1093 from mjfriaza/dev | git-marijus | 2018-04-23 | 2 | -1499/+1764 | |
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | Updated Spanish translation | |||||
| | * | | | | | | | | | | Updated Spanish translation | Manuel Jiménez Friaza | 2018-04-20 | 2 | -1499/+1764 | |
| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | Merge pull request #1090 from galettesaucisse/patch-12 | git-marijus | 2018-04-23 | 1 | -0/+73 | |
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Create /doc/fr/toc.html | |||||
| | * | | | | | | | | | | | Create /doc/fr/toc.html | Galette Saucisse | 2018-04-19 | 1 | -0/+73 | |
| | | |/ / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | please add translated file toc.html | |||||
| * | | | | | | | | | | | Merge pull request #1089 from galettesaucisse/patch-11 | git-marijus | 2018-04-23 | 1 | -25/+0 | |
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | delete /doc/fr/about.bb | |||||
| | * | | | | | | | | | | | delete /doc/fr/about.bb | Galette Saucisse | 2018-04-19 | 1 | -25/+0 | |
| | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | file is in wrong place, and supersceded by /doc/fr/about/about.bb | |||||
| * | | | | | | | | | | | Merge pull request #1088 from galettesaucisse/patch-10 | git-marijus | 2018-04-23 | 1 | -0/+198 | |
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | create new file /doc/fr/about/about.bb | |||||
| | * | | | | | | | | | | | Update about.bb | Galette Saucisse | 2018-04-19 | 1 | -0/+31 | |
| | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | create new folder and file about.bb | Galette Saucisse | 2018-04-19 | 1 | -0/+167 | |
| | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the current about.bb is under /doc/fr/ and should be under /doc/fr/about/ this file is a complete French translation of the original English file | |||||
| * | | | | | | | | | | | Merge pull request #1084 from galettesaucisse/patch-9 | git-marijus | 2018-04-23 | 1 | -1434/+1642 | |
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Update French hmessages.po from Transifex | |||||
| | * | | | | | | | | | | | Update French hmessages.po from Transifex | Galette Saucisse | 2018-04-18 | 1 | -1434/+1642 | |
| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | Merge pull request #1083 from galettesaucisse/patch-8 | git-marijus | 2018-04-23 | 1 | -62/+105 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update French hstrings.php from Transifex | |||||
| | * | | | | | | | | | | | | Update French hstrings.php from Transifex | Galette Saucisse | 2018-04-18 | 1 | -62/+105 | |
| | |/ / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | fix permission role test | Mario Vavti | 2018-04-23 | 1 | -1/+1 | |
| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev | Mario Vavti | 2018-04-23 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | back to only nickname | Jeroen | 2018-04-22 | 1 | -1/+1 | |
| | | |_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | ||||||
| | * | | | | | | | | | | | Merge pull request #1099 from zotlabs/dev | Mike Macgirvin | 2018-04-21 | 3 | -4/+28 | |
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / | | |/| | | | | | | | | | | This is important | |||||
| | | * | | | | | | | | | | anonymous comments shouldn't be allowed in StdLimits | zotlabs | 2018-04-20 | 1 | -3/+1 | |
| | | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | fix any misconfigured channel permission limits | zotlabs | 2018-04-20 | 2 | -1/+27 | |
| | |/ / / / / / / / / / | ||||||
* | / / / / / / / / / / | provide a short term compatibility mapping between social_party and ↵ | zotlabs | 2018-04-23 | 1 | -0/+8 | |
|/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | social_federation | |||||
* | | | | | | | | | | | as_fetch depends on the pubcrawl plugin, but is referenced in core. Ensure ↵ | zotlabs | 2018-04-22 | 1 | -1/+3 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | that it doesn't chuck a wobbly if the function isn't found. This is undergoing significant revision for zot6 so this action is considered a short-term workaround until that work work stabilises. | |||||
* | | | | | | | | | | | owa: attempt channel discovery if not found | zotlabs | 2018-04-22 | 1 | -0/+9 | |
| | | | | | | | | | | | ||||||
* | | | | | | | | | | | use consistent naming for 'Channel role and privacy' | zotlabs | 2018-04-22 | 1 | -1/+1 | |
| | | | | | | | | | | | ||||||
* | | | | | | | | | | | imagemagick preserves exif when scaling. GD does not. We do not want to ↵ | zotlabs | 2018-04-22 | 5 | -23/+28 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | preserve exif on thumbnails which we have rotated, as a browser reading the exif information could rotate them yet again. This checkin adds an abstract function to the generic photo driver which makes the behaviour consistent by stripping EXIF from imagick processed images. However, we will attempt to preserve any ICC colour profiles. See http://php.net/manual/en/imagick.stripimage.php | |||||
* | | | | | | | | | | | fix permissionlimitstest after recent changes | zotlabs | 2018-04-21 | 1 | -1/+1 | |
| | | | | | | | | | | | ||||||
* | | | | | | | | | | | fix any misconfigured channel permission limits | zotlabs | 2018-04-20 | 2 | -1/+27 | |
| | | | | | | | | | | | ||||||
* | | | | | | | | | | | anonymous comments shouldn't be allowed in StdLimits | zotlabs | 2018-04-20 | 1 | -3/+1 | |
| | | | | | | | | | | | ||||||
* | | | | | | | | | | | This fix needs to go deeper in the code. PermissionLimits::Get is called in ↵ | zotlabs | 2018-04-19 | 1 | -3/+3 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a lot of places. If we have no stored setting for a particular permission, return 0 - which is basically no permission except to self. | |||||
* | | | | | | | | | | | better fix to permisisons.php - just cast to int. That's exactly what we want. | zotlabs | 2018-04-19 | 1 | -4/+1 | |
| | | | | | | | | | | | ||||||
* | | | | | | | | | | | permissions php error applying bit compare operation on a (presumed) boolean | zotlabs | 2018-04-19 | 1 | -0/+3 | |
| | | | | | | | | | | | ||||||
* | | | | | | | | | | | fix navbar contact autocomplete 'undefined' hovertip | zotlabs | 2018-04-19 | 1 | -1/+1 | |
| | | | | | | | | | | | ||||||
* | | | | | | | | | | | fix link to renamed permission roles doc subsection | zotlabs | 2018-04-19 | 1 | -1/+1 | |
| | | | | | | | | | | | ||||||
* | | | | | | | | | | | rename social - party to social - federation. Cleanup some of the ↵ | zotlabs | 2018-04-19 | 3 | -63/+63 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | documentation surrounding channels. This checkin contains translatable string changes. | |||||
* | | | | | | | | | | | code booboo may have degraded the performance of the Trending tag query more ↵ | zotlabs | 2018-04-19 | 1 | -1/+2 | |
|/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | than necessary | |||||
* | | | | | | | | | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-04-19 | 15 | -31/+34 | |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | ||||||
| * | | | | | | | | | follow activitypub by webfinger; requires addon update to all federation ↵ | zotlabs | 2018-04-18 | 2 | -8/+9 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | protocols | |||||
| * | | | | | | | | | relax restrictions to the design tools menu to allow those with write_pages ↵ | zotlabs | 2018-04-18 | 2 | -11/+4 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | permission; this doesn't fix the underlying modules though as there are some potential security issues at the moment. | |||||
| * | | | | | | | | | do not queue anything which lacks a destination url | zotlabs | 2018-04-18 | 1 | -0/+6 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | just provide the trending tags in public stream by default and simplify the ↵ | zotlabs | 2018-04-18 | 2 | -2/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | query to improve load times; I intend to do additional work on this feature later | |||||
| * | | | | | | | | | add alt_pager to mod_moderate, remove legacy $a parameter from all ↵ | zotlabs | 2018-04-17 | 9 | -10/+14 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | occurrences of alt_pager | |||||
* | | | | | | | | | | bump version | Mario Vavti | 2018-04-18 | 1 | -1/+1 | |
| | | | | | | | | | | ||||||
* | | | | | | | | | | version bump and strings | Mario Vavti | 2018-04-18 | 2 | -89/+101 | |
| | | | | | | | | | | ||||||
* | | | | | | | | | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-04-18 | 8 | -11/+144 | |
|\| | | | | | | | | | ||||||
| * | | | | | | | | | minor code optimisation | zotlabs | 2018-04-17 | 2 | -10/+22 | |
| | | | | | | | | | |