aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'mike/master' into devMario Vavti2018-04-271-1/+1
|\
| * sql errorzotlabs2018-04-271-1/+1
| * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2018-04-2611-1514/+2498
| |\
* | \ Merge pull request #1120 from phellmes/devgit-marijus2018-04-272-1553/+1856
|\ \ \
| * | | Update DE translation stringsphellmes2018-04-262-1553/+1856
* | | | Merge pull request #1117 from galettesaucisse/patch-19git-marijus2018-04-271-3/+3
|\ \ \ \
| * | | | Update FR toc.htmlGalette Saucisse2018-04-251-3/+3
* | | | | Merge pull request #1116 from galettesaucisse/patch-18git-marijus2018-04-271-179/+0
|\ \ \ \ \
| * | | | | Delete FR project.bb from wrong folderGalette Saucisse2018-04-251-179/+0
| |/ / / /
* | | | | Merge pull request #1115 from galettesaucisse/patch-17git-marijus2018-04-271-0/+174
|\ \ \ \ \
| * | | | | Update project.bbGalette Saucisse2018-04-251-7/+6
| * | | | | Update project.bb and place in correct folderGalette Saucisse2018-04-251-0/+175
| |/ / / /
* | | | | Merge pull request #1113 from mjfriaza/devgit-marijus2018-04-271-77/+109
|\ \ \ \ \
| * | | | | New strings: Spanish translationmjfriaza2018-04-251-77/+109
* | | | | | Merge remote-tracking branch 'mike/master' into devMario Vavti2018-04-275-63/+89
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | / | |_|_|_|/ |/| | | |
| * | | | where possible strip zid parameter from links that get pasted into posts so t...zotlabs2018-04-263-5/+11
| * | | | more testing of attach_move() uncovered some issueszotlabs2018-04-261-57/+73
| * | | | set the 'force' flag on attach_mkdir when initiated from a DAV operation. Thi...zotlabs2018-04-261-1/+5
* | | | | minor fixes for dark schemaMario Vavti2018-04-261-2/+2
* | | | | if there is more than one textarea we need to work through all of themMario Vavti2018-04-261-17/+26
| |_|_|/ |/| | |
* | | | versionMario Vavti2018-04-261-1/+1
* | | | a better way to deal with js errors in autocomplete plugins if the object is ...Mario Vavti2018-04-262-2/+20
* | | | omit js error if saved searsches are turned offMario Vavti2018-04-261-1/+2
* | | | Merge remote-tracking branch 'mike/master' into devMario Vavti2018-04-262-7/+7
|\| | |
| * | | work through a few more autocomplete minor nitszotlabs2018-04-261-7/+6
| * | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2018-04-2522-28/+304
| |\ \ \
| * | | | function doc updatezotlabs2018-04-251-0/+1
* | | | | fix the on select handlersMario Vavti2018-04-261-6/+6
* | | | | upgrade to textcomplete (jquery.textcomplete is discontinued), enable built-i...Mario Vavti2018-04-269-1511/+2467
* | | | | Merge remote-tracking branch 'mike/master' into devMario Vavti2018-04-268-47/+66
|\| | | | | |/ / / |/| | |
| * | | 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
* | | | 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
|\| |
| * | undo_post_tagging - don't waste a connection query if we're undoing a hashtag...zotlabs2018-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
|\ \ \ \ | | |/ / | |/| |
| * | | make tag autocomplete less scary looking in the editor. If this works out we ...zotlabs2018-04-243-46/+77