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

Ui configs #82

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

Ui configs #82

wants to merge 84 commits into from

Commits on Nov 3, 2016

  1. Prepare for diagram constructing 

    1. Add spring framework support
2. Add Opener and Auther services
3. Add PropertySourcesPlaceholderConfigurer
4. Add some auth and open page tests
    @artbez
    artbez committed Nov 3, 2016
    Configuration menu
    Copy the full SHA
    9bbb9a6 View commit details
    Browse the repository at this point in the history

  2. Create Scene and Pallete services 

    1. Create Scene service
2. Create Pallete service
3. Add dragAndDrop test
    @artbez
    artbez committed Nov 3, 2016
    Configuration menu
    Copy the full SHA
    13eb1ef View commit details
    Browse the repository at this point in the history

  3. Add exist method to Scene

    @artbez
    artbez committed Nov 3, 2016
    Configuration menu
    Copy the full SHA
    f88ade9 View commit details
    Browse the repository at this point in the history

Commits on Nov 4, 2016

  1. Add remove and move methods 

    1. Add remove method
2. Add move method
3. Test them
4. Add getPosition method
5. Add JavaDoc
    @artbez
    artbez committed Nov 4, 2016
    Configuration menu
    Copy the full SHA
    218c5ff View commit details
    Browse the repository at this point in the history

  2. Add logging 

    1. Add logging to Scene
2. Add logging to Pallete
    @artbez
    artbez committed Nov 4, 2016
    Configuration menu
    Copy the full SHA
    3a55d67 View commit details
    Browse the repository at this point in the history

  3. Add addLink method 

    1. Now scene can link two elements
2. Add test for it
3. Add JavaDoc
    @artbez
    artbez committed Nov 4, 2016
    Configuration menu
    Copy the full SHA
    d4e6d8b View commit details
    Browse the repository at this point in the history

  4. Codacy

    @artbez
    artbez committed Nov 4, 2016
    Configuration menu
    Copy the full SHA
    00ccd70 View commit details
    Browse the repository at this point in the history

  5. Add PropertyEditor service 

    1. Add setProperty
2. Add getProperty
3. Add test of them
    @artbez
    artbez committed Nov 4, 2016
    Configuration menu
    Copy the full SHA
    69b61d0 View commit details
    Browse the repository at this point in the history

Commits on Nov 14, 2016

  1. Add possibility to move element to any point in the scene 

    1. Add SceneWindow class which describes part of the scene that user see
2. Add moveElement test
    @artbez
    artbez committed Nov 14, 2016
    Configuration menu
    Copy the full SHA
    ec6feba View commit details
    Browse the repository at this point in the history

Commits on Nov 15, 2016

  1. Code refactor of SceneWindow 

    1. Code refactor
2. Add moveToCell method in Scene
3. Add focus method in Scene
4. Add tests
    @artbez
    artbez committed Nov 15, 2016
    Configuration menu
    Copy the full SHA
    a026b52 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into diagram-gui

    @artbez
    artbez committed Nov 15, 2016
    Configuration menu
    Copy the full SHA
    8bc01b9 View commit details
    Browse the repository at this point in the history

Commits on Nov 22, 2016

  1. Create testspace for tasting 

    1. Add test with 3 nodes and 2 links
2. Add Exception for authorization
    @artbez
    artbez committed Nov 22, 2016
    Configuration menu
    Copy the full SHA
    3fb78a3 View commit details
    Browse the repository at this point in the history

Commits on Nov 23, 2016

  1. Fix movement bug 

    1. Fix movement bug
2. Fix remove element bug
    @artbez
    artbez committed Nov 23, 2016
    Configuration menu
    Copy the full SHA
    d44c095 View commit details
    Browse the repository at this point in the history

  2. Change namespace of nodes 

    1. Change names of nodes to string values, which are shown in browser
2. Add moveSomeNodes test
    @artbez
    artbez committed Nov 23, 2016
    Configuration menu
    Copy the full SHA
    a55e457 View commit details
    Browse the repository at this point in the history

Commits on Nov 25, 2016

  1. Fix bug with property checkbox 

    1. Make checkbox property working
2. Add fillProperty test
3. Removed unused package
    @artbez
    artbez committed Nov 25, 2016
    Configuration menu
    Copy the full SHA
    60a30c6 View commit details
    Browse the repository at this point in the history

Commits on Nov 30, 2016

  1. Add HeaderPanel 

    1. Add clickToDashboard functional
2. Add newDiagram functional
3. Add corresponding tests
    @artbez
    artbez committed Nov 30, 2016
    Configuration menu
    Copy the full SHA
    aaaeb59 View commit details
    Browse the repository at this point in the history

Commits on Jan 15, 2017

  1. Some experiments with JSExecutor

    @artbez
    artbez committed Jan 15, 2017
    Configuration menu
    Copy the full SHA
    bf95628 View commit details
    Browse the repository at this point in the history

  2. Add Block and Coordinate classes

    @artbez
    artbez committed Jan 15, 2017
    Configuration menu
    Copy the full SHA
    8e6c356 View commit details
    Browse the repository at this point in the history

Commits on Jan 18, 2017

  1. Add Link and change SelenideElement to links and blocks in scene service

    @artbez
    artbez committed Jan 18, 2017
    Configuration menu
    Copy the full SHA
    970860c View commit details
    Browse the repository at this point in the history

Commits on Feb 12, 2017

  1. Code refactor

    @artbez
    artbez committed Feb 12, 2017
    Configuration menu
    Copy the full SHA
    1ddddf8 View commit details
    Browse the repository at this point in the history

Commits on Feb 14, 2017

  1. Fix focus

    @artbez
    artbez committed Feb 14, 2017
    Configuration menu
    Copy the full SHA
    af4b4be View commit details
    Browse the repository at this point in the history

Commits on Feb 18, 2017

  1. Fix clean scene

    @artbez
    artbez committed Feb 18, 2017
    Configuration menu
    Copy the full SHA
    0b62cb2 View commit details
    Browse the repository at this point in the history

  2. Make SceneWindow steps calculated automatically

    @artbez
    artbez committed Feb 18, 2017
    Configuration menu
    Copy the full SHA
    70e67bf View commit details
    Browse the repository at this point in the history

Commits on Feb 19, 2017

  1. Code refactor

    @artbez
    artbez committed Feb 19, 2017
    Configuration menu
    Copy the full SHA
    64e8b53 View commit details
    Browse the repository at this point in the history

  2. Code refactor

    @artbez
    artbez committed Feb 19, 2017
    Configuration menu
    Copy the full SHA
    6124f7a View commit details
    Browse the repository at this point in the history

  3. Add class PalleteElement + code refactor

    @artbez
    artbez committed Feb 19, 2017
    Configuration menu
    Copy the full SHA
    7403a31 View commit details
    Browse the repository at this point in the history

  4. Code refactor

    @artbez
    artbez committed Feb 19, 2017
    Configuration menu
    Copy the full SHA
    dc0b9c2 View commit details
    Browse the repository at this point in the history

  5. Code refactor

    @artbez
    artbez committed Feb 19, 2017
    Configuration menu
    Copy the full SHA
    56672d0 View commit details
    Browse the repository at this point in the history

  6. Merge remote-tracking branch 'remotes/origin/master' into diagram-gui

    @artbez
    artbez committed Feb 19, 2017
    Configuration menu
    Copy the full SHA
    de3d452 View commit details
    Browse the repository at this point in the history

  7. Add callTomcat.sh

    @artbez
    artbez committed Feb 19, 2017
    Configuration menu
    Copy the full SHA
    ffdfc41 View commit details
    Browse the repository at this point in the history

  8. Code refactor

    @artbez
    artbez committed Feb 19, 2017
    Configuration menu
    Copy the full SHA
    b17459c View commit details
    Browse the repository at this point in the history

Commits on Feb 23, 2017

  1. Divide editor to editor/robots and editor/bpmn 

    1. Change editor uri to editor/robots
2. Add auth test to editor/bpmn
3. Code refactor
    @artbez
    artbez committed Feb 23, 2017
    Configuration menu
    Copy the full SHA
    65f2482 View commit details
    Browse the repository at this point in the history

Commits on Feb 24, 2017

  1. Add Page as an object 

    1. Add enum page
2. Add page factory class
    @artbez
    artbez committed Feb 24, 2017
    Configuration menu
    Copy the full SHA
    4723a4c View commit details
    Browse the repository at this point in the history

  2. Remove Scene, PropertyEditor and Pallete from beans

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

  3. Code refactor

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

Commits on Feb 26, 2017

  1. Add Block and Link providers 

    1. Add Block and Link providers
2. Add Focus and Move helpers
    @artbez
    artbez committed Feb 26, 2017
    Configuration menu
    Copy the full SHA
    447413f View commit details
    Browse the repository at this point in the history

  2. Add additional condition for remove

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

  3. Make focus works by JavaScriptExecutor

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

  4. Add webdriver's timeouts

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

Commits on Mar 3, 2017

  1. Fix bug with movement 

    1. Fix bug with movement
2. Add scrolling by movement on the client side
3. Code refactor
    @artbez
    artbez committed Mar 3, 2017
    Configuration menu
    Copy the full SHA
    e0f2193 View commit details
    Browse the repository at this point in the history

  2. Remove unnecessary changes

    @artbez
    artbez committed Mar 3, 2017
    Configuration menu
    Copy the full SHA
    d2235ef View commit details
    Browse the repository at this point in the history

Commits on Mar 9, 2017

  1. Merge branch 'diagram-gui' into save-open-dia-test 

    # Conflicts:
#	ui-testing/src/main/java/com/qreal/wmp/uitesting/dia/Scene.java
#	ui-testing/src/test/java/com/qreal/wmp/uitesting/innertests/DiaTest.java
    @artbez
    artbez committed Mar 9, 2017
    Configuration menu
    Copy the full SHA
    e94789c View commit details
    Browse the repository at this point in the history

  2. Add titles in pages

    @artbez
    artbez committed Mar 9, 2017
    Configuration menu
    Copy the full SHA
    3a5ea63 View commit details
    Browse the repository at this point in the history

Commits on Mar 12, 2017

  1. Remove unnecessary modal call

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

Commits on Mar 13, 2017

  1. Add save diagram test

    @artbez
    artbez committed Mar 13, 2017
    Configuration menu
    Copy the full SHA
    3f41d7b View commit details
    Browse the repository at this point in the history

Commits on Mar 14, 2017

  1. Add equals check for diagrams

    @artbez
    artbez committed Mar 14, 2017
    Configuration menu
    Copy the full SHA
    7108d8d View commit details
    Browse the repository at this point in the history

Commits on Mar 19, 2017

  1. Fix bug with deleting folders and some code refactor

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

  2. Code refactor, java doc and style guide

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

Commits on Mar 20, 2017

  1. Merge branch 'diagram-gui' into save-open-dia-test

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

  2. Code refactor, java doc and style guide

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

Commits on Mar 21, 2017

  1. Merge branch 'master' into save-open-dia-test 

    # Conflicts:
#	editor-core/src/main/webapp/app/core/editorCore/controller/SceneController.ts
#	ui-testing/ui-testing.iml
    @artbez
    artbez committed Mar 21, 2017
    Configuration menu
    Copy the full SHA
    a5badfb View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into save-open-dia-test 

    # Conflicts:
#	editor-core/src/main/webapp/app/core/editorCore/controller/SceneController.ts
#	ui-testing/ui-testing.iml
    @artbez
    artbez committed Mar 21, 2017
    Configuration menu
    Copy the full SHA
    dd04798 View commit details
    Browse the repository at this point in the history

  3. Fix bug with gesture creating

    @artbez
    artbez committed Mar 21, 2017
    Configuration menu
    Copy the full SHA
    783c623 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'master' into diagram-gui 

    # Conflicts:
#	editor-core/src/main/webapp/app/core/editorCore/controller/SceneController.ts
#	ui-testing/ui-testing.iml
    @artbez
    artbez committed Mar 21, 2017
    Configuration menu
    Copy the full SHA
    329cbea View commit details
    Browse the repository at this point in the history

  5. Merge branch 'master' into diagram-gui 

    # Conflicts:
#	editor-core/src/main/webapp/app/core/editorCore/controller/SceneController.ts
#	ui-testing/ui-testing.iml
    @artbez
    artbez committed Mar 21, 2017
    Configuration menu
    Copy the full SHA
    bb65fb9 View commit details
    Browse the repository at this point in the history

  6. Code refactor

    @artbez
    artbez committed Mar 21, 2017
    Configuration menu
    Copy the full SHA
    989fb6f View commit details
    Browse the repository at this point in the history

Commits on Apr 1, 2017

  1. Add drawing line between blocks

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

  2. Add gestures support

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

Commits on Apr 2, 2017

  1. Fix bug with not catching mousemove event 

    Fix bug with context-menu
Add tests for all available gestures
    @artbez
    artbez committed Apr 2, 2017
    Configuration menu
    Copy the full SHA
    ef435cc View commit details
    Browse the repository at this point in the history

  2. Code refactor

    @artbez
    artbez committed Apr 2, 2017
    Configuration menu
    Copy the full SHA
    a81dde9 View commit details
    Browse the repository at this point in the history

Commits on Apr 11, 2017

  1. Add first version of config files

    @artbez
    artbez committed Apr 11, 2017
    Configuration menu
    Copy the full SHA
    7626b1c View commit details
    Browse the repository at this point in the history

  2. Add configMerger and integrate opener service with selector service

    @artbez
    artbez committed Apr 11, 2017
    Configuration menu
    Copy the full SHA
    30d395d View commit details
    Browse the repository at this point in the history

Commits on Apr 27, 2017

  1. Add selector service

    @artbez
    artbez committed Apr 27, 2017
    Configuration menu
    Copy the full SHA
    cc940c5 View commit details
    Browse the repository at this point in the history

  2. Code refactor

    @artbez
    artbez committed Apr 27, 2017
    Configuration menu
    Copy the full SHA
    2995bc2 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'diagram-gui' into save-open-dia-test 

    # Conflicts:
#	.travis.yml
#	editor-core/src/main/webapp/app/core/editorCore/controller/SceneController.ts
#	ui-testing/src/main/java/com/qreal/wmp/uitesting/Page.java
#	ui-testing/src/main/java/com/qreal/wmp/uitesting/PageFactory.java
#	ui-testing/src/main/java/com/qreal/wmp/uitesting/PageLoader.java
#	ui-testing/src/main/java/com/qreal/wmp/uitesting/dia/palette/Palette.java
#	ui-testing/src/main/java/com/qreal/wmp/uitesting/dia/palette/PaletteImpl.java
#	ui-testing/src/main/java/com/qreal/wmp/uitesting/dia/pallete/PalleteElement.java
#	ui-testing/src/main/java/com/qreal/wmp/uitesting/dia/property/PropertyEditor.java
#	ui-testing/src/main/java/com/qreal/wmp/uitesting/dia/scene/Coordinate.java
#	ui-testing/src/main/java/com/qreal/wmp/uitesting/dia/scene/Scene.java
#	ui-testing/src/main/java/com/qreal/wmp/uitesting/dia/scene/SceneImpl.java
#	ui-testing/src/main/java/com/qreal/wmp/uitesting/dia/scene/elements/Block.java
#	ui-testing/src/main/java/com/qreal/wmp/uitesting/dia/scene/elements/SceneElementImpl.java
#	ui-testing/src/main/java/com/qreal/wmp/uitesting/dia/scene/providers/BlockProvider.java
#	ui-testing/src/main/java/com/qreal/wmp/uitesting/pages/AuthPage.java
#	ui-testing/src/main/java/com/qreal/wmp/uitesting/pages/DashboardPage.java
#	ui-testing/src/main/java/com/qreal/wmp/uitesting/pages/EditorPage.java
#	ui-testing/ui-testing.iml
    @artbez
    artbez committed Apr 27, 2017
    Configuration menu
    Copy the full SHA
    8176207 View commit details
    Browse the repository at this point in the history

  4. Code refactor

    @artbez
    artbez committed Apr 27, 2017
    Configuration menu
    Copy the full SHA
    184eaac View commit details
    Browse the repository at this point in the history

  5. Merge branch 'save-open-dia-test' into mouse-gestures 

    # Conflicts:
#	.travis.yml
#	editor-core/src/main/webapp/app/core/editorCore/controller/SceneController.ts
#	ui-testing/src/main/java/com/qreal/wmp/uitesting/PageFactory.java
#	ui-testing/src/main/java/com/qreal/wmp/uitesting/PageLoader.java
#	ui-testing/src/main/java/com/qreal/wmp/uitesting/dia/scene/DefaultScene.java
#	ui-testing/src/main/java/com/qreal/wmp/uitesting/pages/editor/DefaultEditorPage.java
#	ui-testing/src/test/java/com/qreal/wmp/uitesting/innertests/SaveOpenDiagramTest.java
    @artbez
    artbez committed Apr 27, 2017
    Configuration menu
    Copy the full SHA
    a824ba4 View commit details
    Browse the repository at this point in the history

  6. Code refactor

    @artbez
    artbez committed Apr 27, 2017
    Configuration menu
    Copy the full SHA
    db85348 View commit details
    Browse the repository at this point in the history

  7. Merge branch 'mouse-gestures' into ui-configs 

    # Conflicts:
#	ui-testing/src/main/java/com/qreal/wmp/uitesting/PageFactory.java
#	ui-testing/src/main/java/com/qreal/wmp/uitesting/PageLoader.java
#	ui-testing/src/main/java/com/qreal/wmp/uitesting/dia/scene/DefaultScene.java
#	ui-testing/src/main/java/com/qreal/wmp/uitesting/pages/editor/EditorPageFacade.java
#	ui-testing/ui-testing.iml
    @artbez
    artbez committed Apr 27, 2017
    Configuration menu
    Copy the full SHA
    a5a7c3c View commit details
    Browse the repository at this point in the history

  8. Code refactor

    @artbez
    artbez committed Apr 27, 2017
    Configuration menu
    Copy the full SHA
    eece7a3 View commit details
    Browse the repository at this point in the history

  9. Fix bug with timing

    @artbez
    artbez committed Apr 27, 2017
    Configuration menu
    Copy the full SHA
    66f2599 View commit details
    Browse the repository at this point in the history

  10. Merge branch 'mouse-gestures' into ui-configs

    @artbez
    artbez committed Apr 27, 2017
    Configuration menu
    Copy the full SHA
    777a26e View commit details
    Browse the repository at this point in the history

Commits on Apr 29, 2017

  1. Add angular service to client

    @artbez
    artbez committed Apr 29, 2017
    Configuration menu
    Copy the full SHA
    0bc2008 View commit details
    Browse the repository at this point in the history

Commits on May 1, 2017

  1. Add Selector Service

    @artbez
    artbez committed May 1, 2017
    Configuration menu
    Copy the full SHA
    2f456d3 View commit details
    Browse the repository at this point in the history

Commits on May 2, 2017

  1. Let typescript files get selectors from server

    @artbez
    artbez committed May 2, 2017
    Configuration menu
    Copy the full SHA
    98ab11e View commit details
    Browse the repository at this point in the history

  2. Integrate selectors for PropertyEditor

    @artbez
    artbez committed May 2, 2017
    Configuration menu
    Copy the full SHA
    c0a18bc View commit details
    Browse the repository at this point in the history

  3. Create selectors for property in PropertyEditor

    @artbez
    artbez committed May 2, 2017
    Configuration menu
    Copy the full SHA
    8a953dd View commit details
    Browse the repository at this point in the history

Commits on May 3, 2017

  1. Integrate EditorPanelHeader.fileItem and EditorPanelHeader.saveDiagra… 

    …mConfirmWindow
    @artbez
    artbez committed May 3, 2017
    Configuration menu
    Copy the full SHA
    674e119 View commit details
    Browse the repository at this point in the history

  2. Integrate EditorPanelHeader.savingMenu

    @artbez
    artbez committed May 3, 2017
    Configuration menu
    Copy the full SHA
    7c1e3f9 View commit details
    Browse the repository at this point in the history

Commits on May 4, 2017

  1. Integrate EditorPanelHeader

    @artbez
    artbez committed May 4, 2017
    Configuration menu
    Copy the full SHA
    fcb6db1 View commit details
    Browse the repository at this point in the history

  2. Integrate all configs

    @artbez
    artbez committed May 4, 2017
    Configuration menu
    Copy the full SHA
    9de0f91 View commit details
    Browse the repository at this point in the history

  3. Change SelectorService interface

    @artbez
    artbez committed May 4, 2017
    Configuration menu
    Copy the full SHA
    e8a5631 View commit details
    Browse the repository at this point in the history

Commits on May 5, 2017

  1. Add property files

    @artbez
    artbez committed May 5, 2017
    Configuration menu
    Copy the full SHA
    5d671a2 View commit details
    Browse the repository at this point in the history

Commits on May 7, 2017

  1. Code refactor

    @artbez
    artbez committed May 7, 2017
    Configuration menu
    Copy the full SHA
    1549924 View commit details
    Browse the repository at this point in the history