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 |
|
Franze Jr
|
689c5b3234
|
Optimize imports - all the project
|
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 |
|
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 |
|
Franze Jr
|
9e95d2bc67
|
[#40]Add ExcludeChecklist annotation
|
2015-11-29 10:36:13 -03:00 |
|
Phillip Thelen
|
36bdd2a904
|
Move some processing to background task
|
2015-11-28 20:57:48 +01:00 |
|
Phillip Thelen
|
2d2e8ad9ab
|
Display skills
|
2015-11-25 18:47:56 +01:00 |
|
Phillip Thelen
|
d0ae3a5b4a
|
Merge branch 'optimize-imports-format-code' of github.com:HabitRPG/habitrpg-android into develop
Conflicts:
Habitica/src/com/habitrpg/android/habitica/APIHelper.java
Habitica/src/com/habitrpg/android/habitica/LoginActivity.java
Habitica/src/com/habitrpg/android/habitica/MainActivity.java
|
2015-11-18 13:21:12 +01:00 |
|
Phillip Thelen
|
29db6a99cc
|
better feedback on user login
|
2015-11-18 13:05:38 +01:00 |
|
Phillip Thelen
|
3b0e565144
|
Display faint dialog and allow to revive
|
2015-11-15 16:33:06 +01:00 |
|
Phillip Thelen
|
3aa5ec4608
|
Add basic facebook login
|
2015-11-14 15:59:44 +01:00 |
|
Franze Jr
|
60d90993e3
|
Remove unused imports, format code
|
2015-11-08 15:45:05 -03:00 |
|
Phillip Thelen
|
0cff8749d9
|
Merge pull request #41 from HabitRPG/offline-warning
Offline warning
|
2015-11-08 11:58:20 +01:00 |
|
Negue
|
2e0dc44756
|
Log Rest-Requests only in DEBUG Builds
|
2015-11-07 21:54:41 +01:00 |
|
Franze Jr
|
00ae4fe4e0
|
[#33] - Add new icon for warning
|
2015-11-06 18:04:48 -03:00 |
|
Franze Jr
|
25c9d69d02
|
[#33] - Add validations and small refactoring for handleError method
|
2015-11-03 22:19:11 -03:00 |
|
Franze Jr
|
4df6a448dd
|
[#33] - Remove unused variables from handleError method
|
2015-11-03 20:38:44 -03:00 |
|
Franze Jr
|
0d1072d6b4
|
[#33] - Update method for Retrofit
|
2015-11-03 20:38:38 -03:00 |
|
Negue
|
40e606d377
|
- add dateCreated to task
- refactored some code
- fixed #4 #5
|
2015-09-28 22:37:43 +02:00 |
|
Phillip Thelen
|
92ef8c6e44
|
Refactor models for checklists and tags
|
2015-08-17 17:37:43 +02:00 |
|
Phillip Thelen
|
ab84bf83d9
|
Combine task classes into one
|
2015-08-10 15:56:52 +02:00 |
|
Phillip Thelen
|
bbe80a30c4
|
First working task creating/update form
|
2015-08-03 15:55:17 +02:00 |
|
Negue
|
ae08141d95
|
- Load content / ItemData & save to DB
- Load buy-able gear & list it
- buy potion / gear / rewards
|
2015-07-15 15:36:12 +02:00 |
|
Negue
|
ee48c6adfa
|
initialize fabric / send events from viewAdapter / change AddTaskDialog to use taskId / change menu background color
|
2015-07-11 20:49:09 +02:00 |
|
Phillip Thelen
|
606038a085
|
Save data in persistent storage
|
2015-07-06 17:47:12 +02:00 |
|
Negue
|
80e48529bd
|
toggle sleep / load user in the new activity
|
2015-06-28 19:02:28 +02:00 |
|
Phillip Thelen
|
5910c3f532
|
Don't crash when no internet connection is available
|
2015-06-27 17:29:47 +02:00 |
|
Negue
|
6595bc3073
|
Add Converters for Boolean (from int)
|
2015-06-20 20:46:53 +02:00 |
|
Negue
|
43086228d2
|
Rename to Habitica - Part 2 (Namespaces) / Update Fabric
|
2015-05-27 18:48:19 +02:00 |
|