aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of github.com:Zestylogic/FMarkHEADmasterYann Herklotz2019-10-010-0/+0
|\
| * Update Travis-CI icon in README (#192)Yann Herklotz2019-09-221-1/+1
* | Update Travis-CI icon in READMEYann Herklotz2019-09-211-1/+1
|/
* Update javascript and lock fileYann Herklotz2018-10-213-61/+505
* Cleaned whitespaceYann Herklotz2018-08-261-2/+0
* Cleaning up some moreYann Herklotz2018-08-254-29/+2840
* Cleaning up repositoryYann Herklotz2018-08-254-122/+45
* [js] Rebuilding JSYann Herklotz2018-03-232-1092/+1092
* Adding more documentationYann Herklotz2018-03-232-6/+91
* Merge pull request #174 from ymherklotz/MillerfixQieerb2018-03-234-1203/+1228
|\
| * Miller example returns!Qieerb2018-03-231-1/+4
| * make jsQieerb2018-03-232-1199/+1212
| * miller fixQieerb2018-03-231-3/+12
|/
* Merge pull request #173 from ymherklotz/toclinkingfixQieerb2018-03-2313-378/+403
|\
| * Update example.fmarkQieerb2018-03-231-3/+1
| * testing + fixesQieerb2018-03-232-13/+2
| * build JSThunderMikey2018-03-232-310/+326
| * Merge branch 'htmlgen' into toclinkingfixThunderMikey2018-03-232-27/+29
| |\ | |/ |/|
* | Example (#172)ps-george2018-03-232-27/+29
| * fix markdowngen testerThunderMikey2018-03-231-3/+3
| * fix htmlgen testerThunderMikey2018-03-231-26/+27
| * example changeQieerb2018-03-231-1/+3
| * line breaks in referencesQieerb2018-03-231-2/+9
| * fix htmlgenThunderMikey2018-03-231-3/+3
| * Merge branch 'toclinkingfix' of https://github.com/ymherklotz/FMark into tocl...Qieerb2018-03-233-11/+11
| |\
| | * fix parser issuesThunderMikey2018-03-232-10/+10
| | * fix markdowngen issuesThunderMikey2018-03-231-1/+1
| * | fixed toc testsQieerb2018-03-231-12/+12
| |/
| * type changeQieerb2018-03-233-16/+28
|/
* Include fail (#170)ps-george2018-03-239-528/+529
* fix reference bug (#169)ThunderMikey2018-03-231-2/+2
* Adding tests for %% (#165)Yann Herklotz2018-03-2310-267/+198
* Logger update (#166)ThunderMikey2018-03-237-12/+9
* delete printfn in parser (#167)ThunderMikey2018-03-231-1/+0
* Remove function no longer used (#168)Qieerb2018-03-232-11/+6
* Merge pull request #164 from ymherklotz/passthroughYann Herklotz2018-03-237-29/+55
|\
| * [examples] Removing styleYann Herklotz2018-03-232-8/+1
| * [examples] Adding more examplesYann Herklotz2018-03-232-3/+6
| * [html] Removed ENDLINE from testYann Herklotz2018-03-231-3/+3
| * [html] Removing newlines from html blocksYann Herklotz2018-03-233-28/+27
| * Adding html typeYann Herklotz2018-03-231-0/+2
| * [html] Added HTMLLIT token to identify HTML blocks in parserYann Herklotz2018-03-232-24/+24
| * [html] Adding html typeYann Herklotz2018-03-233-1/+19
| * [Eg] Adding cool macrosYann Herklotz2018-03-232-1/+14
| * [Clean] Cleaning up a bitYann Herklotz2018-03-232-21/+19
|/
* Removed warning and rebuilding jsYann Herklotz2018-03-233-8/+10
* Merged #161 and regenerated jsYann Herklotz2018-03-234-67/+287
|\
| * build JSThunderMikey2018-03-222-1106/+1229
| * add toc exclude parser testsThunderMikey2018-03-221-0/+14
| * add toc exclude in parserThunderMikey2018-03-221-16/+99