5758 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Phillip Thelen	950aa1264c	prevent empty maxExp and maxMP to be set.	2015-12-02 17:03:25 +01:00
Phillip Thelen	e1c96f69d5	better feedback when using skills	2015-12-02 16:56:13 +01:00
Phillip Thelen	50f03b14b3	Set habit buttons to true as default	2015-12-02 16:54:23 +01:00
Phillip Thelen	1a414e6b2e	Fix crash when checking daily. Fixes #87	2015-12-02 16:45:33 +01:00
Phillip Thelen	21ac2866ee	Fix crash when saving tasks. Fixes #88	2015-12-02 16:45:33 +01:00
Phillip Thelen	17f01dac8e	prevent potential crash when reinstatiating tasks	2015-12-02 16:45:33 +01:00
Negue	f627d340ef	Version 0.0.12	2015-12-02 01:58:09 +01:00
Negue	4f2c8cde7b	Merge branch 'develop' of https://github.com/HabitRPG/habitrpg-android into develop	2015-12-02 01:12:31 +01:00
Negue	69a80d2170	[#50] Deleting local-tasks on sync if those were deleted online	2015-12-02 01:10:51 +01:00
Franze Jr	81e5ed41a9	Check validation for task - it was crashing the daily creation	2015-12-01 18:17:35 -03:00
Phillip Thelen	f11826b174	only lock right drawer. Fixes #77	2015-12-01 20:12:57 +01:00
Phillip Thelen	b7ad6c086e	update user on launch. Fixes #83	2015-12-01 19:54:13 +01:00
Phillip Thelen	03a1bdcafa	fix crash when saving task without checklist	2015-12-01 19:51:38 +01:00
Phillip Thelen	3be14accd7	Whitespace for tasks. Fixes #82	2015-12-01 19:41:07 +01:00
Phillip Thelen	f786bfb61e	fix crash on fresh app launch	2015-12-01 14:33:39 +01:00
Phillip Thelen	54273f4f85	Fix crash when creating tasks	2015-12-01 14:33:31 +01:00
Phillip Thelen	46598945c3	add setting for daily reminder	2015-12-01 02:37:30 +01:00
Negue	b4d5201bcf	Version 0.0.11	2015-12-01 01:37:26 +01:00
negue	d0d7cf8e8d	Merge pull request #53 from HabitRPG/ability-change-checklist ... Fixes #40 - Add ability to change checklist	2015-12-01 01:23:12 +01:00
Negue	41ef6e59d1	Merge branch 'develop' into ability-change-checklist ... Conflicts: Habitica/src/com/habitrpg/android/habitica/HabiticaApplication.java Habitica/src/com/habitrpg/android/habitica/MainActivity.java Habitica/src/com/habitrpg/android/habitica/TaskFormActivity.java Habitica/src/com/habitrpg/android/habitica/ui/AvatarWithBarsViewModel.java Habitica/src/com/habitrpg/android/habitica/ui/adapter/HabitItemRecyclerViewAdapter.java	2015-12-01 01:22:09 +01:00
Negue	3828382a1f	Merge branch 'develop' of https://github.com/HabitRPG/habitrpg-android into develop	2015-12-01 01:06:36 +01:00
Negue	b6201ae5a3	21+ Gems , Purchase Cache	2015-12-01 01:04:47 +01:00
Franzé Jr	fb2745b516	Create changelog for 0.0.11 version	2015-11-30 20:28:56 -03:00
Franzé Jr	0e865adcdf	Update changelog.json	2015-11-30 20:24:58 -03:00
negue	08f63ba46e	Merge pull request #80 from HabitRPG/clear-database ... Clear database. Fixes #79	2015-12-01 00:15:52 +01:00
Franze Jr	08e9531160	Clear database. Fixes #79	2015-11-30 20:00:29 -03:00
Phillip Thelen	c4096d0758	set and update timezoneOffset. Fixes #15	2015-11-30 23:36:41 +01:00
Phillip Thelen	c460226777	dismiss keyboard when cancelling edit	2015-11-30 23:15:08 +01:00
Phillip Thelen	60d68ef089	Better task form saving	2015-11-30 23:10:45 +01:00
Phillip Thelen	1283244b61	Allow checklist item editing	2015-11-30 23:01:41 +01:00
negue	4b08ee92a4	Merge pull request #71 from HabitRPG/negue-iap ... Purchase Gems	2015-11-30 22:45:11 +01:00
Phillip Thelen	5ad018fcf9	Fix checking off checklist items	2015-11-30 21:01:44 +01:00
Phillip Thelen	8df257d926	Fix checklistitem saving	2015-11-30 21:01:43 +01:00
Franze Jr	a0f40c0755	[#40] Drag and drop working. Auto-height not working. It still need to save the order of checklists	2015-11-30 21:01:43 +01:00
Franze Jr	74573b3994	Fix conflicts	2015-11-30 20:59:45 +01:00
Franze Jr	689c5b3234	Optimize imports - all the project	2015-11-30 20:57:50 +01:00
Phillip Thelen	fc779800b5	correct daily checklist rendering	2015-11-30 20:57:50 +01:00
Phillip Thelen	2e337f6677	better feedback when updating tasks.	2015-11-30 20:57:50 +01:00
Phillip Thelen	e04f108277	default to all days checked when creating task. ... Fixes #62	2015-11-30 20:57:50 +01:00
Phillip Thelen	fbe6a9ba6d	Fix freezing after loading user.	2015-11-30 20:57:50 +01:00
Negue	2946e0bdb1	Merge branch 'develop' into iap ... Conflicts: Habitica/src/com/habitrpg/android/habitica/HabiticaApplication.java	2015-11-30 20:38:22 +01:00
Phillip Thelen	58abaab281	Merge pull request #72 from HabitRPG/optimize-imports ... Optimize imports - all the project	2015-11-30 19:10:16 +01:00
Franze Jr	1c53973f33	Optimize imports - all the project	2015-11-29 22:22:35 -03:00
Negue	0913c62f1e	Merge branch 'develop' into iap ... Conflicts: Habitica/src/com/habitrpg/android/habitica/LoginActivity.java Habitica/src/com/habitrpg/android/habitica/MainActivity.java	2015-11-29 21:35:41 +01:00
Negue	65df55f57e	[#19] Purchase Gems now working :)	2015-11-29 21:10:32 +01:00
Phillip Thelen	259e725602	correct daily checklist rendering	2015-11-29 17:34:04 +01:00
Phillip Thelen	1fb1139eaa	better feedback when updating tasks.	2015-11-29 17:13:15 +01:00
Phillip Thelen	2ba2ce3350	default to all days checked when creating task. ... Fixes #62	2015-11-29 17:12:35 +01:00
Franze Jr	659c7f3ba0	[#40] Small changes	2015-11-29 12:26:59 -03:00
Phillip Thelen	4ace930c32	Fix freezing after loading user.	2015-11-29 16:08:35 +01:00