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

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
6080cc2
Updates jointjs and requirejs config
anastasia143 Feb 23, 2017
fe9a6a8
Updates jointjs in editor-core
anastasia143 Feb 23, 2017
eba2774
Changes pathes in requirejs
anastasia143 Feb 24, 2017
1d4ed39
Adds bacbone path to jointjs d ts
anastasia143 Feb 24, 2017
393ff0a
Adds attrs description to jointObjectAttributes in DefaultDiagramNode.ts
anastasia143 Feb 24, 2017
b165697
Updates grunt and typescript in package.json
anastasia143 Feb 24, 2017
d97537b
Changes diagramElementView to elementView in DiagramScene.ts
anastasia143 Feb 24, 2017
adea85c
Adds PortsModelInterface to jointjs.d.ts
anastasia143 Feb 24, 2017
3f6098a
Adds empty ImageWithPorts to DefaultDiagramNode.ts
anastasia143 Feb 24, 2017
fc72909
Removes TextAttrs from Text constructor
anastasia143 Feb 24, 2017
ed60e55
Updates requirejs with new libs in []
anastasia143 Feb 26, 2017
d89b147
Adds backbone
anastasia143 Feb 26, 2017
e2ec1f4
Adds lodash
anastasia143 Feb 26, 2017
80ce591
Fix requirejs config.
TanVD Mar 1, 2017
92e0c07
Adds ports tp the ImageWithPorts
anastasia143 Mar 5, 2017
547335d
Merge branch 'create-modules' of https://github.com/qreal/wmp into cr…
anastasia143 Mar 12, 2017
462ae1d
Merge branch 'create-modules' into jointjs-update-merge
anastasia143 Mar 12, 2017
9058ba7
Update joint.css
TanVD Mar 13, 2017
b8a629b
Change notation file format
saimonsaret Mar 19, 2017
2a9ec0a
Merge branch 'master' into containers
saimonsaret Mar 19, 2017
082aeb3
Add embedding saving and loading
saimonsaret Mar 20, 2017
b00aae5
Prepare for auto-embedding
saimonsaret Mar 20, 2017
c4c957c
Merge branch 'jointjs-update-merge' of https://github.com/anastasia14…
saimonsaret Mar 21, 2017
4c88447
Implement correct saving/loading/undo-redo/linking for containers
saimonsaret Mar 23, 2017
86ee3a1
Diagram saving and drawing bugfix
saimonsaret Mar 26, 2017
02928de
Fix resize and remove debug code
saimonsaret Mar 28, 2017
786929c
implemented multiple properties view
shavkunov Apr 1, 2017
2f19905
Merge remote-tracking branch 'origin/containers' into multiple-proper…
shavkunov May 5, 2017
73d9102
implemented text joint labels
shavkunov May 9, 2017
347eef1
few comments added
shavkunov May 9, 2017
162c400
replaced var into let
shavkunov May 9, 2017
2366a93
more cosmetic changes
shavkunov May 9, 2017
446702f
replaced magic numbers with magic variables
shavkunov May 9, 2017
2655512
added center text align
shavkunov May 14, 2017
bb2e3de
fixed requested changes
shavkunov May 14, 2017
614fa4a
fixed saving properties coordinates
shavkunov May 21, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
57 changes: 57 additions & 0 deletions auth-service/auth-service.iml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,63 @@
<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.6.2" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.6.2" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.6.0" level="project" />
<orderEntry type="library" name="Maven: com.sun.jersey:jersey-server:1.14" level="project" />
<orderEntry type="library" name="Maven: asm:asm:3.1" level="project" />
<orderEntry type="library" name="Maven: com.sun.jersey:jersey-core:1.14" level="project" />
<orderEntry type="library" name="Maven: com.sun.jersey:jersey-json:1.14" level="project" />
<orderEntry type="library" name="Maven: com.sun.xml.bind:jaxb-impl:2.2.3-1" level="project" />
<orderEntry type="library" name="Maven: javax.xml.bind:jaxb-api:2.2.2" level="project" />
<orderEntry type="library" name="Maven: javax.xml.stream:stax-api:1.0-2" level="project" />
<orderEntry type="library" name="Maven: javax.activation:activation:1.1" level="project" />
<orderEntry type="library" name="Maven: org.codehaus.jackson:jackson-jaxrs:1.9.2" level="project" />
<orderEntry type="library" name="Maven: org.codehaus.jackson:jackson-xc:1.9.2" level="project" />
<orderEntry type="library" name="Maven: com.sun.jersey:jersey-client:1.14" level="project" />
<orderEntry type="library" name="Maven: com.sun.jersey.contribs:jersey-spring:1.14" level="project" />
<orderEntry type="library" name="Maven: com.sun.jersey:jersey-servlet:1.14" level="project" />
<orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.1" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-beans:4.2.1.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-core:4.2.1.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-webmvc:4.2.1.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-expression:4.2.1.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-web:4.2.1.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-context:4.2.1.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-aop:4.2.1.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-tx:4.2.1.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-orm:4.2.1.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-jdbc:4.2.1.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.security:spring-security-config:3.2.3.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.security:spring-security-taglibs:3.2.3.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.security:spring-security-acl:3.2.3.RELEASE" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: javax.servlet:javax.servlet-api:3.1.0" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: javax.servlet.jsp:jsp-api:2.2" level="project" />
<orderEntry type="library" name="Maven: javax.servlet:jstl:1.2" level="project" />
<orderEntry type="library" name="Maven: org.hibernate:hibernate-core:5.0.2.Final" level="project" />
<orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging:3.3.0.Final" level="project" />
<orderEntry type="library" name="Maven: org.apache.geronimo.specs:geronimo-jta_1.1_spec:1.1.1" level="project" />
<orderEntry type="library" name="Maven: org.jboss:jandex:1.2.2.Final" level="project" />
<orderEntry type="library" name="Maven: org.hibernate.common:hibernate-commons-annotations:5.0.0.Final" level="project" />
<orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.12" level="project" />
<orderEntry type="library" name="Maven: org.codehaus.jettison:jettison:1.3.8" level="project" />
<orderEntry type="library" name="Maven: stax:stax-api:1.0.1" level="project" />
<orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-1.2-api:2.6.2" level="project" />
<orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-api:2.6.2" level="project" />
<orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-core:2.6.2" level="project" />
<orderEntry type="library" scope="RUNTIME" name="Maven: org.apache.logging.log4j:log4j-slf4j-impl:2.6.2" level="project" />
<orderEntry type="library" name="Maven: org.jetbrains:annotations:15.0" level="project" />
<orderEntry type="library" name="Maven: junit:junit:4.12" level="project" />
<orderEntry type="library" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
<orderEntry type="library" name="Maven: org.mockito:mockito-all:1.9.5" level="project" />
<orderEntry type="library" name="Maven: org.assertj:assertj-core:3.5.2" level="project" />
<orderEntry type="library" name="Maven: org.projectlombok:lombok:1.16.10" level="project" />
<orderEntry type="library" name="Maven: org.springframework.security:spring-security-core:3.2.3.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.security:spring-security-web:3.2.3.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.security.oauth:spring-security-oauth2:2.0.8.RELEASE" level="project" />
<orderEntry type="library" name="Maven: commons-codec:commons-codec:1.6" level="project" />
<orderEntry type="library" name="Maven: org.codehaus.jackson:jackson-mapper-asl:1.9.13" level="project" />
<orderEntry type="library" name="Maven: org.codehaus.jackson:jackson-core-asl:1.9.13" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.6.2" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.6.2" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.6.0" level="project" />
<orderEntry type="module" module-name="spring-security-oauth2-client" />
<orderEntry type="library" name="Maven: com.sun.jersey:jersey-server:1.14" level="project" />
<orderEntry type="library" name="Maven: asm:asm:3.1" level="project" />
Expand Down
58 changes: 58 additions & 0 deletions dashboard-service/dashboard-service.iml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,64 @@
<orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.1" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-beans:4.2.1.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-core:4.2.1.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-context:4.2.1.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-expression:4.2.1.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-webmvc:4.2.1.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-web:4.2.1.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-tx:4.2.1.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.security:spring-security-taglibs:3.2.3.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.security:spring-security-acl:3.2.3.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-jdbc:3.2.8.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-aop:4.2.1.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.aspectj:aspectjrt:1.8.9" level="project" />
<orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.8.9" level="project" />
<orderEntry type="library" name="Maven: cglib:cglib:3.2.4" level="project" />
<orderEntry type="library" name="Maven: org.ow2.asm:asm:5.1" level="project" />
<orderEntry type="library" name="Maven: org.apache.ant:ant:1.9.6" level="project" />
<orderEntry type="library" name="Maven: org.apache.ant:ant-launcher:1.9.6" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: javax.servlet:javax.servlet-api:3.1.0" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: javax.servlet.jsp:jsp-api:2.2" level="project" />
<orderEntry type="library" name="Maven: javax.servlet:jstl:1.2" level="project" />
<orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.12" level="project" />
<orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-1.2-api:2.6.2" level="project" />
<orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-api:2.6.2" level="project" />
<orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-core:2.6.2" level="project" />
<orderEntry type="library" scope="RUNTIME" name="Maven: org.apache.logging.log4j:log4j-slf4j-impl:2.6.2" level="project" />
<orderEntry type="library" name="Maven: org.jetbrains:annotations:15.0" level="project" />
<orderEntry type="library" name="Maven: junit:junit:4.12" level="project" />
<orderEntry type="library" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
<orderEntry type="library" name="Maven: org.mockito:mockito-all:1.9.5" level="project" />
<orderEntry type="library" name="Maven: org.assertj:assertj-core:3.5.2" level="project" />
<orderEntry type="library" name="Maven: org.projectlombok:lombok:1.16.10" level="project" />
<orderEntry type="library" name="Maven: org.springframework.security:spring-security-core:3.2.3.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.security:spring-security-web:3.2.3.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.security:spring-security-config:3.2.3.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.security.oauth:spring-security-oauth2:2.0.8.RELEASE" level="project" />
<orderEntry type="library" name="Maven: commons-codec:commons-codec:1.6" level="project" />
<orderEntry type="library" name="Maven: org.codehaus.jackson:jackson-mapper-asl:1.9.13" level="project" />
<orderEntry type="library" name="Maven: org.codehaus.jackson:jackson-core-asl:1.9.13" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.6.2" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.6.2" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.6.0" level="project" />
<orderEntry type="module" module-name="spring-security-oauth2-client" />
<orderEntry type="library" name="Maven: com.sun.jersey:jersey-server:1.14" level="project" />
<orderEntry type="library" name="Maven: asm:asm:3.1" level="project" />
<orderEntry type="library" name="Maven: com.sun.jersey:jersey-core:1.14" level="project" />
<orderEntry type="library" name="Maven: com.sun.jersey:jersey-json:1.14" level="project" />
<orderEntry type="library" name="Maven: org.codehaus.jettison:jettison:1.1" level="project" />
<orderEntry type="library" name="Maven: stax:stax-api:1.0.1" level="project" />
<orderEntry type="library" name="Maven: com.sun.xml.bind:jaxb-impl:2.2.3-1" level="project" />
<orderEntry type="library" name="Maven: javax.xml.bind:jaxb-api:2.2.2" level="project" />
<orderEntry type="library" name="Maven: javax.xml.stream:stax-api:1.0-2" level="project" />
<orderEntry type="library" name="Maven: javax.activation:activation:1.1" level="project" />
<orderEntry type="library" name="Maven: org.codehaus.jackson:jackson-jaxrs:1.9.2" level="project" />
<orderEntry type="library" name="Maven: org.codehaus.jackson:jackson-xc:1.9.2" level="project" />
<orderEntry type="library" name="Maven: com.sun.jersey:jersey-client:1.14" level="project" />
<orderEntry type="library" name="Maven: com.sun.jersey.contribs:jersey-spring:1.14" level="project" />
<orderEntry type="library" name="Maven: com.sun.jersey:jersey-servlet:1.14" level="project" />
<orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.1" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-beans:4.2.1.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-core:4.2.1.RELEASE" level="project" />
<orderEntry type="library" name="Maven: commons-logging:commons-logging:1.2" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-context:4.2.1.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-expression:4.2.1.RELEASE" level="project" />
Expand Down
Loading