Commit graph

205 commits

Author SHA1 Message Date
Phillip Thelen
4c2f678322 bump version number 2017-03-05 11:05:15 +01:00
Phillip Thelen
7b540c567f update translations 2017-03-05 11:04:44 +01:00
Phillip Thelen
8e5343f63f fix potential crash 2017-02-27 09:39:21 +01:00
Phillip Thelen
dc5beef190 basic group plan support 2017-02-26 12:07:16 +01:00
Phillip Thelen
7e9c70fae8 fix potential crashes 2017-02-06 15:53:10 +01:00
Phillip Thelen
27f3e5645b subscription layout changes 2017-02-03 13:21:42 +01:00
Phillip Thelen
b859bd9e8b fix tests 2017-02-02 14:32:05 +01:00
Phillip Thelen
d167743a89 bump version number 2017-02-02 12:55:04 +01:00
Phillip Thelen
7a81e11524 fix crash in gem page 2017-02-01 17:03:12 +01:00
Phillip Thelen
454a398a8d fix potential crash 2017-01-31 16:19:56 +01:00
Phillip Thelen
b575287f85 start working on subscriptions 2017-01-26 19:33:45 +01:00
Phillip Thelen
3b6e3e493e bump version number 2017-01-23 13:16:11 +01:00
Phillip Thelen
5905af486b fix potential crashes 2017-01-19 13:12:30 +01:00
Phillip Thelen
a1fa9af152 remove WAKE_LOCK permission 2017-01-19 12:03:02 +01:00
Phillip Thelen
e70ab07cba fix font sizing 2017-01-16 18:14:28 +01:00
Phillip Thelen
44552f6861 update translations 2017-01-16 17:39:16 +01:00
Phillip Thelen
0cfccc2d8e improve party member list 2017-01-16 17:39:16 +01:00
Phillip Thelen
512ad82ad7 update translations 2017-01-13 19:55:56 +01:00
Phillip Thelen
ab3a90ca6d fix minor design issues 2017-01-13 13:42:24 +01:00
Negue
8d499f5110 Merge branch 'develop' of https://github.com/HabitRPG/habitica-android into challenges_joined
Conflicts:
	Habitica/AndroidManifest.xml
	Habitica/res/drawable-hdpi/ic_header_exp.png
	Habitica/res/drawable-hdpi/ic_header_gem.png
	Habitica/res/drawable-hdpi/ic_header_gold.png
	Habitica/res/drawable-hdpi/ic_header_healer.png
	Habitica/res/drawable-hdpi/ic_header_heart.png
	Habitica/res/drawable-hdpi/ic_header_mage.png
	Habitica/res/drawable-hdpi/ic_header_magic.png
	Habitica/res/drawable-hdpi/ic_header_rogue.png
	Habitica/res/drawable-hdpi/ic_header_silver.png
	Habitica/res/drawable-hdpi/ic_header_warrior.png
	Habitica/res/drawable-mdpi/ic_header_exp.png
	Habitica/res/drawable-mdpi/ic_header_gem.png
	Habitica/res/drawable-mdpi/ic_header_gold.png
	Habitica/res/drawable-mdpi/ic_header_healer.png
	Habitica/res/drawable-mdpi/ic_header_heart.png
	Habitica/res/drawable-mdpi/ic_header_mage.png
	Habitica/res/drawable-mdpi/ic_header_magic.png
	Habitica/res/drawable-mdpi/ic_header_rogue.png
	Habitica/res/drawable-mdpi/ic_header_silver.png
	Habitica/res/drawable-mdpi/ic_header_warrior.png
	Habitica/res/drawable-xhdpi/ic_header_exp.png
	Habitica/res/drawable-xhdpi/ic_header_gem.png
	Habitica/res/drawable-xhdpi/ic_header_gold.png
	Habitica/res/drawable-xhdpi/ic_header_healer.png
	Habitica/res/drawable-xhdpi/ic_header_heart.png
	Habitica/res/drawable-xhdpi/ic_header_mage.png
	Habitica/res/drawable-xhdpi/ic_header_magic.png
	Habitica/res/drawable-xhdpi/ic_header_rogue.png
	Habitica/res/drawable-xhdpi/ic_header_silver.png
	Habitica/res/drawable-xhdpi/ic_header_warrior.png
	Habitica/res/drawable-xxhdpi/ic_header_exp.png
	Habitica/res/drawable-xxhdpi/ic_header_gem.png
	Habitica/res/drawable-xxhdpi/ic_header_gold.png
	Habitica/res/drawable-xxhdpi/ic_header_healer.png
	Habitica/res/drawable-xxhdpi/ic_header_heart.png
	Habitica/res/drawable-xxhdpi/ic_header_mage.png
	Habitica/res/drawable-xxhdpi/ic_header_magic.png
	Habitica/res/drawable-xxhdpi/ic_header_rogue.png
	Habitica/res/drawable-xxhdpi/ic_header_silver.png
	Habitica/res/drawable-xxhdpi/ic_header_warrior.png
	Habitica/res/values/colors.xml
	Habitica/res/values/strings.xml
	Habitica/src/main/java/com/habitrpg/android/habitica/components/AppComponent.java
	Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/BaseTaskViewHolder.java
	Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/api/ApiService.java
2017-01-11 22:37:00 +01:00
Phillip Thelen
96e3616e7c fix social sharing 2017-01-05 12:07:40 +01:00
Negue
d5361424d1 fix reset of Fragment Position / remove ChallengeOverviewActivity 2017-01-04 21:38:44 +01:00
Phillip Thelen
e1abf34bd0 bump version number 2017-01-04 12:19:48 +01:00
Negue
a5cee4fbbe ChallengeOverviewActivity / working back navigation \o/ / redesign DetailActivity 2016-12-23 19:36:44 +01:00
Phillip Thelen
3a8098c3ec update translations 2016-12-12 14:33:01 +01:00
Phillip Thelen
179bd18750 improve seeds integration 2016-12-08 12:34:47 +01:00
Negue
7b21285657 Merge branch 'develop' of https://github.com/HabitRPG/habitrpg-android into todo_widget
Conflicts:
	Habitica/src/main/java/com/habitrpg/android/habitica/components/AppComponent.java
	Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MainActivity.java
	Habitica/src/main/java/com/habitrpg/android/habitica/widget/DailiesWidgetProvider.java
2016-12-08 00:18:52 +01:00
Phillip Thelen
89420b81da implement seeds sdk 2016-12-07 14:40:03 +01:00
Negue
445d1781d7 challenge detail activity 2016-12-01 21:48:24 +01:00
Negue
5a59f4451d revert from settings activity - split widgets into separate classes / providers 2016-11-18 22:16:45 +01:00
Negue
d69895279f activity to choose task type before adding the widget 2016-11-17 22:55:30 +01:00
d954mas
43bce4649d update/remove libs 2016-11-17 15:59:03 +03:00
Phillip Thelen
bdf31cfac9 add potential fix for startup issues 2016-11-08 00:11:28 +01:00
Phillip Thelen
15c1a850d6 update translations 2016-11-01 09:45:20 +01:00
Phillip Thelen
ec37bf04fc fix potential crash when creating task 2016-10-31 15:26:13 +01:00
Phillip Thelen
5d6f15cac9 add setting for custom day start. Fixes #641 2016-10-27 17:01:16 +02:00
Phillip Thelen
e78489fc3b remove unused log 2016-10-26 20:12:43 +02:00
Phillip Thelen
2666fc4ece improve reminder rescheduling 2016-10-26 20:12:43 +02:00
Phillip Thelen
e7d32c3c6c fix issues with transformational items 2016-10-14 13:35:01 +02:00
Phillip Thelen
93dcaf9f99 gem purchase screen improvements 2016-10-13 14:31:26 +02:00
Negue
8b1865166c Merge branch 'develop' of https://github.com/HabitRPG/habitrpg-android into apply_tranformations
Conflicts:
	Habitica/res/values/strings.xml
	gradle/wrapper/gradle-wrapper.properties
2016-10-12 21:15:05 +02:00
Phillip Thelen
32fc3642b4 create gem purchase activity 2016-10-11 19:38:44 +02:00
Negue
c5452523a2 Merge branch 'develop' of https://github.com/HabitRPG/habitrpg-android into apply_tranformations
Conflicts:
	Habitica/res/values/strings.xml
2016-10-03 22:49:03 +02:00
Negue
15ea308a42 Apply avatar transformations (if items available) / update gradle 2016-10-03 22:47:02 +02:00
Phillip Thelen
6959da071d bump build number 2016-10-03 16:02:35 +02:00
Phillip Thelen
12043dad1a allow dailies widget to be smaller 2016-10-02 17:26:28 +02:00
Phillip Thelen
b7b9cdb4dd update translations 2016-10-01 19:43:42 +02:00
Phillip Thelen
3313edac15 bump version 2016-09-30 19:57:51 +02:00
Phillip Thelen
4b7c402657 improve widget update behaviour 2016-09-30 17:31:05 +02:00
Phillip Thelen
884b65c8b9 update translations 2016-09-30 15:48:30 +02:00