Commit Graph

12 Commits

Author SHA1 Message Date
Victor Yu
268cb0bc18 Can make either the normal checkmark widget or stackview checkmark widget 2017-10-15 20:44:21 -04:00
Victor Yu
5a78de5a25 Implemented ability to choose multiple habits for stackview 2017-10-15 13:36:54 -04:00
Victor Yu
82972d6e47 Implemented stackwidget style for checkmark widgets 2017-10-15 13:36:54 -04:00
Alinson Xavier
b2a8c9c45f Remove PebbleReceiver 2017-07-26 11:39:02 -04:00
Alinson Xavier
c05f50998f Add branch and commit hash to version name 2017-07-24 00:14:46 -04:00
Alinson Xavier
2db4c06fe8 Merge branch 'master' into dev
# Conflicts:
#	app/src/androidTest/java/org/isoron/uhabits/espresso/MainTest.java
#	app/src/androidTest/java/org/isoron/uhabits/models/sqlite/SQLiteCheckmarkListTest.java
#	app/src/main/java/org/isoron/uhabits/activities/habits/list/views/HabitCardView.java
#	app/src/main/java/org/isoron/uhabits/models/sqlite/SQLiteCheckmarkList.java
#	app/src/main/java/org/isoron/uhabits/models/sqlite/SQLiteScoreList.java
#	app/src/main/java/org/isoron/uhabits/models/sqlite/SQLiteStreakList.java
#	app/src/main/java/org/isoron/uhabits/models/sqlite/records/CheckmarkRecord.java
#	uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/HistoryChart.java
#	uhabits-android/src/main/res/values-id/strings.xml
#	uhabits-android/src/test/java/org/isoron/uhabits/receivers/ReminderControllerTest.java
2017-07-18 22:54:52 -04:00
Alinson Xavier
96ab887545 Merge tag 'v1.7.5' into dev
1.7.5
2017-06-10 18:59:28 -04:00
Alinson Xavier
382b52e5b2 Merge tag 'v1.7.4' into dev
1.7.4

# Conflicts:
#	app/src/main/java/org/isoron/uhabits/models/sqlite/SQLiteCheckmarkList.java
#	app/src/main/java/org/isoron/uhabits/models/sqlite/SQLiteScoreList.java
#	uhabits-core/src/main/java/org/isoron/uhabits/core/models/ScoreList.java
2017-06-05 09:20:47 -04:00
Alinson Xavier
88c1e73720 Merge tag 'v1.7.3' into dev
1.7.3
2017-05-30 11:11:42 -04:00
Alinson Xavier
745d07024c Remove unused permissions 2017-05-29 08:37:49 -04:00
Alinson Xavier
c9b62669de Merge branch 'dev' into modules 2017-05-28 09:44:55 -04:00
Alinson Xavier
c20ca3921f Rename android module to uhabits-android 2017-05-25 08:00:00 -04:00