Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Text based labels, new shape #101

Merged
merged 22 commits into from
Jan 14, 2015
Merged

Text based labels, new shape #101

merged 22 commits into from
Jan 14, 2015

Commits on Dec 20, 2014

  1. Merge pull request #3 from knsv/master 

    Merge from master
    @bjowes
    bjowes committed Dec 20, 2014
    Configuration menu
    Copy the full SHA
    6a1550f View commit details
    Browse the repository at this point in the history

Commits on Jan 11, 2015

  1. Merge pull request #4 from knsv/master 

    Merge from master
    @bjowes
    bjowes committed Jan 11, 2015
    Configuration menu
    Copy the full SHA
    58659c4 View commit details
    Browse the repository at this point in the history

  2. Generated

    @bjowes
    bjowes committed Jan 11, 2015
    Configuration menu
    Copy the full SHA
    d9f8ef6 View commit details
    Browse the repository at this point in the history

  3. Break out dagre-d3 dependency

    @bjowes
    bjowes committed Jan 11, 2015
    Configuration menu
    Copy the full SHA
    1b76160 View commit details
    Browse the repository at this point in the history

  4. Break out dagre-d3, new label styling

    @bjowes
    bjowes committed Jan 11, 2015
    Configuration menu
    Copy the full SHA
    367d620 View commit details
    Browse the repository at this point in the history

  5. Improved style handling

    @bjowes
    bjowes committed Jan 11, 2015
    Configuration menu
    Copy the full SHA
    43d2b0b View commit details
    Browse the repository at this point in the history

  6. Improved style handling

    @bjowes
    bjowes committed Jan 11, 2015
    Configuration menu
    Copy the full SHA
    5ad30c8 View commit details
    Browse the repository at this point in the history

  7. Break out dagre-d3 dependency

    @bjowes
    bjowes committed Jan 11, 2015
    Configuration menu
    Copy the full SHA
    9246df4 View commit details
    Browse the repository at this point in the history

  8. Added edge labels

    @bjowes
    bjowes committed Jan 11, 2015
    Configuration menu
    Copy the full SHA
    a27b3d8 View commit details
    Browse the repository at this point in the history

  9. Additional tests for labels

    @bjowes
    bjowes committed Jan 11, 2015
    Configuration menu
    Copy the full SHA
    cbd7393 View commit details
    Browse the repository at this point in the history

Commits on Jan 13, 2015

  1. Merge branch 'master' into text-labels 

    Conflicts:
	dist/mermaid.full.js
	dist/mermaid.full.min.js
	dist/mermaid.slim.js
	dist/mermaid.slim.min.js
	src/diagrams/flowchart/flowRenderer.js
	src/utils.js
	test/web_style.html
    @bjowes
    bjowes committed Jan 13, 2015
    Configuration menu
    Copy the full SHA
    9f970ed View commit details
    Browse the repository at this point in the history

  2. Cleanup after merge

    @bjowes
    bjowes committed Jan 13, 2015
    Configuration menu
    Copy the full SHA
    a23fce6 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #5 from knsv/master 

    Update README.md
    @bjowes
    bjowes committed Jan 13, 2015
    Configuration menu
    Copy the full SHA
    fec3101 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'master' into text-labels

    @bjowes
    bjowes committed Jan 13, 2015
    Configuration menu
    Copy the full SHA
    1abb53c View commit details
    Browse the repository at this point in the history

  5. New shape, text labels 

    Added support to configure mermaid to use plain text labels for better
SVG compatibility
Added a reverse asymmetric shape, not in the graph syntax yet
    @bjowes
    bjowes committed Jan 13, 2015
    Configuration menu
    Copy the full SHA
    8e9890d View commit details
    Browse the repository at this point in the history

  6. Syntax suggestion for reverse asymmetric shape

    @bjowes
    bjowes committed Jan 13, 2015
    Configuration menu
    Copy the full SHA
    9c8e36e View commit details
    Browse the repository at this point in the history

  7. New config attribute, htmlLabels

    @bjowes
    bjowes committed Jan 13, 2015
    Configuration menu
    Copy the full SHA
    3fe3823 View commit details
    Browse the repository at this point in the history

  8. Improved CSS cloning 

    Better separation of styles between multiple mermaid SVGs on the same
page
Added support for text label styling
    @bjowes
    bjowes committed Jan 13, 2015
    Configuration menu
    Copy the full SHA
    84124c9 View commit details
    Browse the repository at this point in the history

  9. Test cases for styling

    @bjowes
    bjowes committed Jan 13, 2015
    Configuration menu
    Copy the full SHA
    fe43755 View commit details
    Browse the repository at this point in the history

  10. Removed extraction of dagre-d3 

    Pending resolution of a issue with globals
    @bjowes
    bjowes committed Jan 13, 2015
    Configuration menu
    Copy the full SHA
    8e45e72 View commit details
    Browse the repository at this point in the history

  11. Corrected example syntax

    @bjowes
    bjowes committed Jan 13, 2015
    Configuration menu
    Copy the full SHA
    9095b2d View commit details
    Browse the repository at this point in the history

  12. New build

    @bjowes
    bjowes committed Jan 13, 2015
    Configuration menu
    Copy the full SHA
    595fe1f View commit details
    Browse the repository at this point in the history