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

[add] added feature to set the text color of holiday #27

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

[add] added feature to set the text color of holiday #27

wants to merge 13 commits into from

Commits on Mar 29, 2017

  1. [add] added feature to set the text color of holiday

    @opst-miyatay
    opst-miyatay committed Mar 29, 2017
    Configuration menu
    Copy the full SHA
    00bf9ea View commit details
    Browse the repository at this point in the history

Commits on Mar 30, 2017

  1. [add] added properties for fixing the circle of today

    @opst-miyatay
    opst-miyatay committed Mar 30, 2017
    Configuration menu
    Copy the full SHA
    6b7127a View commit details
    Browse the repository at this point in the history

Commits on Apr 3, 2017

  1. [add] added feature to display days of outside this month

    @opst-miyatay
    opst-miyatay committed Apr 3, 2017
    Configuration menu
    Copy the full SHA
    3f99f1f View commit details
    Browse the repository at this point in the history

  2. Merge pull request #6 from opst-miyatay/feature/add-holiday-setting 

    [add] added feature to set the text color of holiday
    @opst-miyatay
    opst-miyatay authored Apr 3, 2017
    Configuration menu
    Copy the full SHA
    5898ab5 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #7 from opst-miyatay/feature/add-fix-today-circle 

    [add] added properties for fixing the circle of today
    @opst-miyatay
    opst-miyatay authored Apr 3, 2017
    Configuration menu
    Copy the full SHA
    7fc134d View commit details
    Browse the repository at this point in the history

  4. Merge branch 'master' into feature/add-setting-for-display-outside-th… 

    …is-month

# Conflicts:
#	javasample/src/main/java/jp/co/recruit_mp/android/lightcalendarview/javasample/MainActivity.java
#	javasample/src/main/res/layout/activity_main.xml
#	library/src/main/kotlin/jp/co/recruit_mp/android/lightcalendarview/CalendarSettings.kt
#	library/src/main/kotlin/jp/co/recruit_mp/android/lightcalendarview/DayLayout.kt
#	library/src/main/kotlin/jp/co/recruit_mp/android/lightcalendarview/DayView.kt
#	library/src/main/kotlin/jp/co/recruit_mp/android/lightcalendarview/LightCalendarView.kt
#	library/src/main/res/values/attrs.xml
    @opst-miyatay
    opst-miyatay committed Apr 3, 2017
    Configuration menu
    Copy the full SHA
    d74e49a View commit details
    Browse the repository at this point in the history

  5. Merge pull request #8 from opst-miyatay/feature/add-setting-for-displ… 

    …ay-outside-this-month

[add] added feature to display days of outside this month
    @opst-miyatay
    opst-miyatay authored Apr 3, 2017
    Configuration menu
    Copy the full SHA
    eadeda9 View commit details
    Browse the repository at this point in the history

Commits on Apr 4, 2017

  1. grade、buildToolsのバージョンを変更

    @opst-miyatay
    opst-miyatay committed Apr 4, 2017
    Configuration menu
    Copy the full SHA
    abcc6cd View commit details
    Browse the repository at this point in the history

  2. [fix] bug fix. The textSize is not reflected holiday.

    @opst-miyatay
    opst-miyatay committed Apr 4, 2017
    Configuration menu
    Copy the full SHA
    a146ae6 View commit details
    Browse the repository at this point in the history

  3. [fix] bug fix. The textSize is not reflected outside this month.

    @opst-miyatay
    opst-miyatay committed Apr 4, 2017
    Configuration menu
    Copy the full SHA
    2674383 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #9 from opst-miyatay/feature/add-setting-for-displ… 

    …ay-outside-this-month

[fix] bug fix. The textSize is not reflected outside this month.
    @opst-miyatay
    opst-miyatay authored Apr 4, 2017
    Configuration menu
    Copy the full SHA
    83bbc56 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'master' into feature/add-holiday-setting

    @opst-miyatay
    opst-miyatay authored Apr 4, 2017
    Configuration menu
    Copy the full SHA
    502eebf View commit details
    Browse the repository at this point in the history

  6. Merge branch 'master' into feature/add-holiday-setting

    @opst-miyatay
    opst-miyatay authored Apr 4, 2017
    Configuration menu
    Copy the full SHA
    b82b88f View commit details
    Browse the repository at this point in the history