aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2018-04-2522-28/+304
|\
| * Update CHANGELOGMike Macgirvin2018-04-261-1/+1
| * bump versionMario Vavti2018-04-251-1/+1
| * drop box-shadow from generic-content-wrapper (it's probably too 90') and use ...Mario Vavti2018-04-253-9/+10
| * changelogMario Vavti2018-04-251-1/+3
| * Merge remote-tracking branch 'mike/master' into devMario Vavti2018-04-251-3/+6
| |\
| * | rename boxy schema to focus-boxy and bs-default to focus-lightMario Vavti2018-04-255-7/+15
| * | mark simple_* schemas unmaintained and deprecatedMario Vavti2018-04-256-0/+0
| * | more css fixes for bs-default schemaMario Vavti2018-04-251-1/+1
| * | css fixes for bs-default schemaMario Vavti2018-04-251-6/+3
| * | Merge pull request #1112 from galettesaucisse/patch-16git-marijus2018-04-251-0/+179
| |\ \
| | * | Create /doc/fr/project.bbGalette Saucisse2018-04-251-0/+179
| * | | Merge remote-tracking branch 'mike/master' into devMario Vavti2018-04-253-46/+77
| |\ \ \
| * | | | show caret-down on item-photo hover to indicate a dropdown menuMario Vavti2018-04-253-0/+19
| | |/ / | |/| |
| * | | changelogMario Vavti2018-04-241-0/+70
| * | | fix regression with forum widget unseen countMario Vavti2018-04-241-2/+2
| * | | fix php warningsMario Vavti2018-04-241-3/+3
* | | | function doc updatezotlabs2018-04-251-0/+1
* | | | mod_network: privacy group query returning results when group is empty. Notif...zotlabs2018-04-251-8/+5
* | | | don't load jot autosave content into other document types or edits of other i...zotlabs2018-04-252-11/+16
* | | | malformed embeds from gfycat hubzilla issue #1108zotlabs2018-04-251-2/+4
* | | | fine tuningzotlabs2018-04-251-1/+1
* | | | some tagging workzotlabs2018-04-253-24/+39
* | | | generating random numbers too large for 32-bit systemszotlabs2018-04-251-2/+2
| |_|/ |/| |
* | | undo_post_tagging - don't waste a connection query if we're undoing a hashtag...zotlabs2018-04-251-3/+6
| |/ |/|
* | make tag autocomplete less scary looking in the editor. If this works out we ...zotlabs2018-04-243-46/+77
|/
* 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
| |\ \ \ \ \ \ \ \ \ \ \