aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* added variable to store the raw json string as received, since this is signed...zotlabs2018-04-231-0/+2
* minor tweak to utf8 usernames after some testing of the underlying encode/dec...zotlabs2018-04-232-0/+10
* Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2018-04-2317-4718/+5329
|\
| * possible fix for issue #1101Mario Vavti2018-04-231-1/+1
| * strings updateMario Vavti2018-04-232-76/+108
| * reverse f325c29b48b2bf954d13e89035c1e9abecdca780 - this needs discussion. the...Mario Vavti2018-04-231-1/+0
| * Merge pull request #1094 from mrjive/devgit-marijus2018-04-233-1600/+1416
| |\
| | * Merge pull request #10 from redmatrix/devmrjive2018-04-223-4/+28
| | |\
| | * | updated Italian translationmrjive2018-04-202-1600/+1415
| | * | adding link to post sourcemrjive2018-04-201-0/+1
| | * | Merge pull request #9 from redmatrix/devmrjive2018-04-1954-9094/+9274
| | |\ \
| | * \ \ Merge pull request #8 from redmatrix/devmrjive2018-04-166-17/+30
| | |\ \ \
| | * \ \ \ Merge pull request #7 from redmatrix/devmrjive2018-04-1417-4887/+5989
| | |\ \ \ \
| | * \ \ \ \ Merge pull request #6 from redmatrix/devmrjive2018-04-1312-49/+86
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge pull request #5 from redmatrix/devmrjive2018-04-1253-99/+922
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge pull request #3 from redmatrix/devmrjive2018-04-0548-222/+1068
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge pull request #1 from redmatrix/devmrjive2018-03-2914-28/+57
| | |\ \ \ \ \ \ \ \
| * | | | | | | | | | update zot.php to fix php warning invalid argument supplied for foreach()Mario Vavti2018-04-231-16/+18
| * | | | | | | | | | Proposed fix for issue #1091 - mod-help.cssMario Vavti2018-04-231-2/+2
| * | | | | | | | | | Merge pull request #1097 from galettesaucisse/patch-13git-marijus2018-04-231-1/+1
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Proposed fix for issue #1091Galette Saucisse2018-04-201-1/+1
| | | |_|_|_|_|_|_|/ / | | |/| | | | | | | |
| * | | | | | | | | | Merge pull request #1093 from mjfriaza/devgit-marijus2018-04-232-1499/+1764
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Updated Spanish translationManuel Jiménez Friaza2018-04-202-1499/+1764
| * | | | | | | | | | | Merge pull request #1090 from galettesaucisse/patch-12git-marijus2018-04-231-0/+73
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Create /doc/fr/toc.htmlGalette Saucisse2018-04-191-0/+73
| | | |/ / / / / / / / / | | |/| | | | | | | | |
| * | | | | | | | | | | Merge pull request #1089 from galettesaucisse/patch-11git-marijus2018-04-231-25/+0
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | delete /doc/fr/about.bbGalette Saucisse2018-04-191-25/+0
| | |/ / / / / / / / / /
| * | | | | | | | | | | Merge pull request #1088 from galettesaucisse/patch-10git-marijus2018-04-231-0/+198
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Update about.bbGalette Saucisse2018-04-191-0/+31
| | * | | | | | | | | | | create new folder and file about.bbGalette Saucisse2018-04-191-0/+167
| | |/ / / / / / / / / /
| * | | | | | | | | | | Merge pull request #1084 from galettesaucisse/patch-9git-marijus2018-04-231-1434/+1642
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Update French hmessages.po from TransifexGalette Saucisse2018-04-181-1434/+1642
| * | | | | | | | | | | | Merge pull request #1083 from galettesaucisse/patch-8git-marijus2018-04-231-62/+105
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | Update French hstrings.php from TransifexGalette Saucisse2018-04-181-62/+105
| | |/ / / / / / / / / / /
| * | | | | | | | | | | | fix permission role testMario Vavti2018-04-231-1/+1
| * | | | | | | | | | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into devMario Vavti2018-04-231-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | back to only nicknameJeroen2018-04-221-1/+1
| | | |_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | |
| | * | | | | | | | | | | Merge pull request #1099 from zotlabs/devMike Macgirvin2018-04-213-4/+28
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / | | |/| | | | | | | | | |
| | | * | | | | | | | | | anonymous comments shouldn't be allowed in StdLimitszotlabs2018-04-201-3/+1
| | | * | | | | | | | | | fix any misconfigured channel permission limitszotlabs2018-04-202-1/+27
| | |/ / / / / / / / / /
* | / / / / / / / / / / provide a short term compatibility mapping between social_party and social_fe...zotlabs2018-04-231-0/+8
|/ / / / / / / / / / /
* | | | | | | | | | | as_fetch depends on the pubcrawl plugin, but is referenced in core. Ensure th...zotlabs2018-04-221-1/+3
* | | | | | | | | | | owa: attempt channel discovery if not foundzotlabs2018-04-221-0/+9
* | | | | | | | | | | use consistent naming for 'Channel role and privacy'zotlabs2018-04-221-1/+1
* | | | | | | | | | | imagemagick preserves exif when scaling. GD does not. We do not want to prese...zotlabs2018-04-225-23/+28
* | | | | | | | | | | fix permissionlimitstest after recent changeszotlabs2018-04-211-1/+1
* | | | | | | | | | | fix any misconfigured channel permission limitszotlabs2018-04-202-1/+27
* | | | | | | | | | | anonymous comments shouldn't be allowed in StdLimitszotlabs2018-04-201-3/+1
* | | | | | | | | | | This fix needs to go deeper in the code. PermissionLimits::Get is called in a...zotlabs2018-04-191-3/+3
* | | | | | | | | | | better fix to permisisons.php - just cast to int. That's exactly what we want.zotlabs2018-04-191-4/+1