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

implemented multiple properties view #79

Open
wants to merge 36 commits into
base: master
Choose a base branch
from
Open

implemented multiple properties view #79

wants to merge 36 commits into from

Commits on Feb 23, 2017

  1. Updates jointjs and requirejs config

    @anastasia143
    anastasia143 committed Feb 23, 2017
    Configuration menu
    Copy the full SHA
    6080cc2 View commit details
    Browse the repository at this point in the history

  2. Updates jointjs in editor-core

    @anastasia143
    anastasia143 committed Feb 23, 2017
    Configuration menu
    Copy the full SHA
    fe9a6a8 View commit details
    Browse the repository at this point in the history

Commits on Feb 24, 2017

  1. Changes pathes in requirejs

    @anastasia143
    anastasia143 committed Feb 24, 2017
    Configuration menu
    Copy the full SHA
    eba2774 View commit details
    Browse the repository at this point in the history

  2. Adds bacbone path to jointjs d ts

    @anastasia143
    anastasia143 committed Feb 24, 2017
    Configuration menu
    Copy the full SHA
    1d4ed39 View commit details
    Browse the repository at this point in the history

  3. Adds attrs description to jointObjectAttributes in DefaultDiagramNode.ts

    @anastasia143
    anastasia143 committed Feb 24, 2017
    Configuration menu
    Copy the full SHA
    393ff0a View commit details
    Browse the repository at this point in the history

  4. Updates grunt and typescript in package.json

    @anastasia143
    anastasia143 committed Feb 24, 2017
    Configuration menu
    Copy the full SHA
    b165697 View commit details
    Browse the repository at this point in the history

  5. Changes diagramElementView to elementView in DiagramScene.ts

    @anastasia143
    anastasia143 committed Feb 24, 2017
    Configuration menu
    Copy the full SHA
    d97537b View commit details
    Browse the repository at this point in the history

  6. Adds PortsModelInterface to jointjs.d.ts

    @anastasia143
    anastasia143 committed Feb 24, 2017
    Configuration menu
    Copy the full SHA
    adea85c View commit details
    Browse the repository at this point in the history

  7. Adds empty ImageWithPorts to DefaultDiagramNode.ts

    @anastasia143
    anastasia143 committed Feb 24, 2017
    Configuration menu
    Copy the full SHA
    3f6098a View commit details
    Browse the repository at this point in the history

  8. Removes TextAttrs from Text constructor

    @anastasia143
    anastasia143 committed Feb 24, 2017
    Configuration menu
    Copy the full SHA
    fc72909 View commit details
    Browse the repository at this point in the history

Commits on Feb 26, 2017

  1. Updates requirejs with new libs in []

    @anastasia143
    anastasia143 committed Feb 26, 2017
    Configuration menu
    Copy the full SHA
    ed60e55 View commit details
    Browse the repository at this point in the history

  2. Adds backbone

    @anastasia143
    anastasia143 committed Feb 26, 2017
    Configuration menu
    Copy the full SHA
    d89b147 View commit details
    Browse the repository at this point in the history

  3. Adds lodash

    @anastasia143
    anastasia143 committed Feb 26, 2017
    Configuration menu
    Copy the full SHA
    e2ec1f4 View commit details
    Browse the repository at this point in the history

Commits on Mar 1, 2017

  1. Fix requirejs config. 

    Few fixes for requirejs config to make JointJS load properly.
Also jQuery updated to 2.2.4.
    @TanVD
    TanVD committed Mar 1, 2017
    Configuration menu
    Copy the full SHA
    80ce591 View commit details
    Browse the repository at this point in the history

Commits on Mar 5, 2017

  1. Adds ports tp the ImageWithPorts

    @anastasia143
    anastasia143 committed Mar 5, 2017
    Configuration menu
    Copy the full SHA
    92e0c07 View commit details
    Browse the repository at this point in the history

Commits on Mar 12, 2017

  1. Merge branch 'create-modules' of https://github.com/qreal/wmp into cr… 

    …eate-modules
    @anastasia143
    anastasia143 committed Mar 12, 2017
    Configuration menu
    Copy the full SHA
    547335d View commit details
    Browse the repository at this point in the history

  2. Merge branch 'create-modules' into jointjs-update-merge

    @anastasia143
    anastasia143 committed Mar 12, 2017
    Configuration menu
    Copy the full SHA
    462ae1d View commit details
    Browse the repository at this point in the history

Commits on Mar 13, 2017

  1. Update joint.css

    @TanVD
    TanVD committed Mar 13, 2017
    Configuration menu
    Copy the full SHA
    9058ba7 View commit details
    Browse the repository at this point in the history

Commits on Mar 19, 2017

  1. Change notation file format

    @saimonsaret
    saimonsaret committed Mar 19, 2017
    Configuration menu
    Copy the full SHA
    b8a629b View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into containers

    @saimonsaret
    saimonsaret committed Mar 19, 2017
    Configuration menu
    Copy the full SHA
    2a9ec0a View commit details
    Browse the repository at this point in the history

Commits on Mar 20, 2017

  1. Add embedding saving and loading

    @saimonsaret
    saimonsaret committed Mar 20, 2017
    Configuration menu
    Copy the full SHA
    082aeb3 View commit details
    Browse the repository at this point in the history

  2. Prepare for auto-embedding

    @saimonsaret
    saimonsaret committed Mar 20, 2017
    Configuration menu
    Copy the full SHA
    b00aae5 View commit details
    Browse the repository at this point in the history

Commits on Mar 21, 2017

  1. Merge branch 'jointjs-update-merge' of https://github.com/anastasia14… 

    …3/wmp into containers
    @saimonsaret
    saimonsaret committed Mar 21, 2017
    Configuration menu
    Copy the full SHA
    c4c957c View commit details
    Browse the repository at this point in the history

Commits on Mar 23, 2017

  1. Implement correct saving/loading/undo-redo/linking for containers

    @saimonsaret
    saimonsaret committed Mar 23, 2017
    Configuration menu
    Copy the full SHA
    4c88447 View commit details
    Browse the repository at this point in the history

Commits on Mar 26, 2017

  1. Diagram saving and drawing bugfix

    @saimonsaret
    saimonsaret committed Mar 26, 2017
    Configuration menu
    Copy the full SHA
    86ee3a1 View commit details
    Browse the repository at this point in the history

Commits on Mar 30, 2017

  1. Fix resize and remove debug code

    @saimonsaret
    saimonsaret committed Mar 30, 2017
    Configuration menu
    Copy the full SHA
    02928de View commit details
    Browse the repository at this point in the history

Commits on Apr 1, 2017

  1. implemented multiple properties view

    @shavkunov
    shavkunov committed Apr 1, 2017
    Configuration menu
    Copy the full SHA
    786929c View commit details
    Browse the repository at this point in the history

Commits on May 5, 2017

  1. Merge remote-tracking branch 'origin/containers' into multiple-proper… 

    …ties

# Conflicts:
#	editor-core/src/main/webapp/app/core/editorCore/model/DefaultDiagramNode.ts
#	editor-core/src/main/webapp/app/core/editorCore/model/DiagramNode.ts
    @shavkunov
    shavkunov committed May 5, 2017
    Configuration menu
    Copy the full SHA
    2f19905 View commit details
    Browse the repository at this point in the history

Commits on May 9, 2017

  1. implemented text joint labels

    @shavkunov
    shavkunov committed May 9, 2017
    Configuration menu
    Copy the full SHA
    73d9102 View commit details
    Browse the repository at this point in the history

  2. few comments added

    @shavkunov
    shavkunov committed May 9, 2017
    Configuration menu
    Copy the full SHA
    347eef1 View commit details
    Browse the repository at this point in the history

  3. replaced var into let

    @shavkunov
    shavkunov committed May 9, 2017
    Configuration menu
    Copy the full SHA
    162c400 View commit details
    Browse the repository at this point in the history

  4. more cosmetic changes

    @shavkunov
    shavkunov committed May 9, 2017
    Configuration menu
    Copy the full SHA
    2366a93 View commit details
    Browse the repository at this point in the history

  5. replaced magic numbers with magic variables

    @shavkunov
    shavkunov committed May 9, 2017
    Configuration menu
    Copy the full SHA
    446702f View commit details
    Browse the repository at this point in the history

Commits on May 14, 2017

  1. added center text align

    @shavkunov
    shavkunov committed May 14, 2017
    Configuration menu
    Copy the full SHA
    2655512 View commit details
    Browse the repository at this point in the history

  2. fixed requested changes

    @shavkunov
    shavkunov committed May 14, 2017
    Configuration menu
    Copy the full SHA
    bb2e3de View commit details
    Browse the repository at this point in the history

Commits on May 21, 2017

  1. fixed saving properties coordinates

    @shavkunov
    shavkunov committed May 21, 2017
    Configuration menu
    Copy the full SHA
    614fa4a View commit details
    Browse the repository at this point in the history