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: navasmdc/MaterialDesignLibrary
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: navasmdc/MaterialDesignLibrary
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: develop
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 17 commits
  • 42 files changed
  • 2 contributors

Commits on Nov 7, 2016

  1. Fix #15 issue

    @navasmdc
    navasmdc committed Nov 7, 2016
    Configuration menu
    Copy the full SHA
    d09e6ea View commit details
    Browse the repository at this point in the history

  2. fixed issues: #23 #30 #45

    @xcelder
    xcelder committed Nov 7, 2016
    Configuration menu
    Copy the full SHA
    5583f69 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'develop' into Navas

    @navasmdc
    navasmdc committed Nov 7, 2016
    Configuration menu
    Copy the full SHA
    8f8df39 View commit details
    Browse the repository at this point in the history

  4. fixed issues: #81 #102 #107 #114 #118 #124 #125 #127 #128 #162

    @xcelder
    xcelder committed Nov 7, 2016
    Configuration menu
    Copy the full SHA
    c8141b4 View commit details
    Browse the repository at this point in the history

  5. fixed issues: #134

    @xcelder
    xcelder committed Nov 7, 2016
    Configuration menu
    Copy the full SHA
    c9ec844 View commit details
    Browse the repository at this point in the history

  6. change attrs with prefix to avoid conflicts

    @xcelder
    xcelder committed Nov 7, 2016
    Configuration menu
    Copy the full SHA
    5d21fe1 View commit details
    Browse the repository at this point in the history

  7. Pre Merge

    @navasmdc
    navasmdc committed Nov 7, 2016
    Configuration menu
    Copy the full SHA
    c91847d View commit details
    Browse the repository at this point in the history

  8. change attrs with prefix to avoid conflicts

    @xcelder
    xcelder committed Nov 7, 2016
    Configuration menu
    Copy the full SHA
    9acfe9b View commit details
    Browse the repository at this point in the history

  9. Merge branch 'develop' into Navas 

    # Conflicts:
#	MaterialDesignLibrary/MaterialDesign/src/main/java/com/gc/materialdesign/views/Button.java
#	MaterialDesignLibrary/MaterialDesign/src/main/java/com/gc/materialdesign/views/ButtonFlat.java
#	MaterialDesignLibrary/MaterialDesign/src/main/java/com/gc/materialdesign/views/ButtonFloat.java
#	MaterialDesignLibrary/MaterialDesign/src/main/java/com/gc/materialdesign/views/ButtonRectangle.java
#	MaterialDesignLibrary/MaterialDesign/src/main/java/com/gc/materialdesign/views/CustomView.java
    @navasmdc
    navasmdc committed Nov 7, 2016
    Configuration menu
    Copy the full SHA
    b2b45a0 View commit details
    Browse the repository at this point in the history

Commits on Nov 8, 2016

  1. changed attr in xml and added progress dialog to demo

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

  2. Merge branch 'develop' into Navas 

    # Conflicts:
#	MaterialDesignLibrary/MaterialDesign/src/main/java/com/gc/materialdesign/views/ButtonFloat.java
#	MaterialDesignLibrary/MaterialDesign/src/main/java/com/gc/materialdesign/views/ButtonRectangle.java
    @navasmdc
    navasmdc committed Nov 8, 2016
    Configuration menu
    Copy the full SHA
    63c572e View commit details
    Browse the repository at this point in the history

Commits on Nov 16, 2016

  1. fixed issues: 151, 154

    @xcelder
    xcelder committed Nov 16, 2016
    Configuration menu
    Copy the full SHA
    40f21ae View commit details
    Browse the repository at this point in the history

  2. fixed issues: 157, 158

    @xcelder
    xcelder committed Nov 16, 2016
    Configuration menu
    Copy the full SHA
    4ed33e4 View commit details
    Browse the repository at this point in the history

  3. fixed issues: 164

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

  4. Pre Merge

    @navasmdc
    navasmdc committed Nov 16, 2016
    Configuration menu
    Copy the full SHA
    85ae71f View commit details
    Browse the repository at this point in the history

  5. Merge branch 'develop' into Navas 

    # Conflicts:
#	MaterialDesignLibrary/MaterialDesign/src/main/java/com/gc/materialdesign/views/ButtonFlat.java
#	MaterialDesignLibrary/MaterialDesignDemo/src/main/java/com/gc/materialdesigndemo/ui/ButtonsActivity.java
#	MaterialDesignLibrary/MaterialDesignDemo/src/main/java/com/gc/materialdesigndemo/ui/WidgetActivity.java
#	MaterialDesignLibrary/MaterialDesignDemo/src/main/res/layout/activity_widgets.xml
    @navasmdc
    navasmdc committed Nov 16, 2016
    Configuration menu
    Copy the full SHA
    1107a09 View commit details
    Browse the repository at this point in the history

Commits on Nov 17, 2016

  1. Enable set attributes by styles

    @navasmdc
    navasmdc committed Nov 17, 2016
    Configuration menu
    Copy the full SHA
    a95ef30 View commit details
    Browse the repository at this point in the history
Loading