aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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. ↵Mario Vavti2018-04-231-1/+0
| | | | | | | | there is a link to source in the item menu. we might consider linking the timestamp to the source item (like some of the federated networks do) but then remove it from the item dropdown (having things double proved to confuse people). imo the link in the dropdown menu should be sufficient though.
| * Merge pull request #1094 from mrjive/devgit-marijus2018-04-233-1600/+1416
| |\ | | | | | | Adding link to post source
| | * Merge pull request #10 from redmatrix/devmrjive2018-04-223-4/+28
| | |\ | | | | | | | | Dev
| | * | 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
| | |\ \ | | | | | | | | | | Dev
| | * \ \ Merge pull request #8 from redmatrix/devmrjive2018-04-166-17/+30
| | |\ \ \ | | | | | | | | | | | | Dev
| | * \ \ \ Merge pull request #7 from redmatrix/devmrjive2018-04-1417-4887/+5989
| | |\ \ \ \ | | | | | | | | | | | | | | Dev
| | * \ \ \ \ Merge pull request #6 from redmatrix/devmrjive2018-04-1312-49/+86
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | Dev
| | * \ \ \ \ \ Merge pull request #5 from redmatrix/devmrjive2018-04-1253-99/+922
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Dev
| | * \ \ \ \ \ \ Merge pull request #3 from redmatrix/devmrjive2018-04-0548-222/+1068
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Dev
| | * \ \ \ \ \ \ \ Merge pull request #1 from redmatrix/devmrjive2018-03-2914-28/+57
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Dev
| * | | | | | | | | | update zot.php to fix php warning invalid argument supplied for foreach()Mario Vavti2018-04-231-16/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - this is taken from pr #1085 which was against wrong branch
| * | | | | | | | | | Proposed fix for issue #1091 - mod-help.cssMario Vavti2018-04-231-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - this is taken from pr #1098 which was against wrong branch
| * | | | | | | | | | Merge pull request #1097 from galettesaucisse/patch-13git-marijus2018-04-231-1/+1
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Proposed fix for issue #1091 - mod-help.js
| | * | | | | | | | | | Proposed fix for issue #1091Galette Saucisse2018-04-201-1/+1
| | | |_|_|_|_|_|_|/ / | | |/| | | | | | | |
| * | | | | | | | | | Merge pull request #1093 from mjfriaza/devgit-marijus2018-04-232-1499/+1764
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Updated Spanish translation
| | * | | | | | | | | | 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.html
| | * | | | | | | | | | | Create /doc/fr/toc.htmlGalette Saucisse2018-04-191-0/+73
| | | |/ / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | please add translated file toc.html
| * | | | | | | | | | | Merge pull request #1089 from galettesaucisse/patch-11git-marijus2018-04-231-25/+0
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | delete /doc/fr/about.bb
| | * | | | | | | | | | | delete /doc/fr/about.bbGalette Saucisse2018-04-191-25/+0
| | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | file is in wrong place, and supersceded by /doc/fr/about/about.bb
| * | | | | | | | | | | Merge pull request #1088 from galettesaucisse/patch-10git-marijus2018-04-231-0/+198
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | create new file /doc/fr/about/about.bb
| | * | | | | | | | | | | Update about.bbGalette Saucisse2018-04-191-0/+31
| | | | | | | | | | | | |
| | * | | | | | | | | | | create new folder and file about.bbGalette Saucisse2018-04-191-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-9git-marijus2018-04-231-1434/+1642
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Update French hmessages.po from Transifex
| | * | | | | | | | | | | 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 Transifex
| | * | | | | | | | | | | | 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
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / | | |/| | | | | | | | | | This is important
| | | * | | | | | | | | | 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 ↵zotlabs2018-04-231-0/+8
|/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | social_federation
* | | | | | | | | | | as_fetch depends on the pubcrawl plugin, but is referenced in core. Ensure ↵zotlabs2018-04-221-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 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 ↵zotlabs2018-04-225-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 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 ↵zotlabs2018-04-191-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.zotlabs2018-04-191-4/+1
| | | | | | | | | | |
* | | | | | | | | | | permissions php error applying bit compare operation on a (presumed) booleanzotlabs2018-04-191-0/+3
| | | | | | | | | | |
* | | | | | | | | | | fix navbar contact autocomplete 'undefined' hovertipzotlabs2018-04-191-1/+1
| | | | | | | | | | |