Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: msulaev/atlasExampleJSF
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: firstRevert
Choose a base ref
...
head repository: msulaev/atlasExampleJSF
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 13 commits
  • 16 files changed
  • 4 contributors

Commits on Jul 11, 2019

  1. Merge pull request #17 from msulaev/firstRevert 

    Rsdsad`:wq`aevert "element document moved to DocumentElements, elemen…
    @apenkov
    apenkov authored Jul 11, 2019
    Configuration menu
    Copy the full SHA
    d482697 View commit details
    Browse the repository at this point in the history

  2. delete some blank line

    apenkov committed Jul 11, 2019
    Configuration menu
    Copy the full SHA
    8f4b844 View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'origin/master' into addSimpleToolTest 

    # Conflicts:
#	src/main/java/com/pdffiller/element/DocumentElements.java
#	src/main/java/com/pdffiller/element/ElementParameterOnToolbar.java
    apenkov committed Jul 11, 2019
    Configuration menu
    Copy the full SHA
    18c087e View commit details
    Browse the repository at this point in the history

  4. add test changeSimpleToolColor

    apenkov committed Jul 11, 2019
    Configuration menu
    Copy the full SHA
    394a8cb View commit details
    Browse the repository at this point in the history

  5. fix comment added new test class SimpleToolTest and change switch cas… 

    …e to if else
    apenkov committed Jul 11, 2019
    Configuration menu
    Copy the full SHA
    048e302 View commit details
    Browse the repository at this point in the history

Commits on Jul 12, 2019

  1. create enum color

    apenkovSpbfiller committed Jul 12, 2019
    Configuration menu
    Copy the full SHA
    b5073cc View commit details
    Browse the repository at this point in the history

Commits on Jul 15, 2019

  1. move Color to utils and make Color class

    apenkovSpbfiller committed Jul 15, 2019
    Configuration menu
    Copy the full SHA
    c87744c View commit details
    Browse the repository at this point in the history

  2. Merge pull request #18 from msulaev/addSimpleToolTest 

    added test changeSimpleToolColor
    @msulaev
    msulaev authored Jul 15, 2019
    Configuration menu
    Copy the full SHA
    6093b45 View commit details
    Browse the repository at this point in the history

  3. Create README.md

    @msulaev
    msulaev authored Jul 15, 2019
    Configuration menu
    Copy the full SHA
    bd24319 View commit details
    Browse the repository at this point in the history

  4. add for Editor step

    @mrsulaev
    mrsulaev committed Jul 15, 2019
    Configuration menu
    Copy the full SHA
    10b9ca3 View commit details
    Browse the repository at this point in the history

  5. add inherite for ConstructorStep

    @mrsulaev
    mrsulaev committed Jul 15, 2019
    Configuration menu
    Copy the full SHA
    89c0483 View commit details
    Browse the repository at this point in the history

  6. add inherite for top100formstep

    @mrsulaev
    mrsulaev committed Jul 15, 2019
    Configuration menu
    Copy the full SHA
    95b0bf5 View commit details
    Browse the repository at this point in the history

  7. Merge pull request #19 from msulaev/refactoring/add_inherite_for_steps 

    add for Editor step
    @apenkov
    apenkov authored Jul 15, 2019
    Configuration menu
    Copy the full SHA
    5d836ce View commit details
    Browse the repository at this point in the history
Loading