Phillip Thelen
11589f2cc5
add await to api tests
2017-04-10 14:04:37 +02:00
Phillip Thelen
870600ec82
fix task reordering
2017-04-10 12:34:55 +02:00
Phillip Thelen
2418af37eb
fix string formatting
2017-04-10 12:34:37 +02:00
Phillip Thelen
77d18d209d
update dependencies
2017-04-10 12:33:43 +02:00
Phillip Thelen
b1d58fb1af
new speechbubble style for tutorial views
2017-04-07 20:00:49 +02:00
Phillip Thelen
d9360d9e0d
less travis output
2017-04-07 19:03:05 +02:00
Phillip Thelen
0ded3830b9
fix setup sprites
2017-04-07 19:02:58 +02:00
Phillip Thelen
2aad1b1d01
clear checkboxes from filter
2017-04-07 16:22:34 +02:00
Phillip Thelen
7adaa6cad7
update translations
2017-04-07 15:56:29 +02:00
Phillip Thelen
368608693a
improve creator view
2017-04-07 15:56:23 +02:00
Phillip Thelen
95359dfbc5
fix various crashes
2017-04-07 11:47:06 +02:00
Phillip Thelen
71d92c8fb4
fix tests
2017-04-07 11:32:28 +02:00
Phillip Thelen
752325a3a0
fix task scoring
2017-04-07 10:09:51 +02:00
Phillip Thelen
b6c760bc6b
add badge to filter menu item
2017-04-06 22:02:19 +02:00
Negue
da87dd587c
fix compile
2017-04-06 21:19:25 +02:00
Negue
3f5347486c
Merge branch 'develop' of https://github.com/HabitRPG/habitica-android into create_challenges
...
Conflicts:
Habitica/res/values/strings.xml
Habitica/src/main/java/com/habitrpg/android/habitica/HabiticaBaseApplication.java
Habitica/src/main/java/com/habitrpg/android/habitica/components/AppComponent.java
Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/challenges/ChallengeTasksRecyclerViewFragment.java
2017-04-06 21:10:05 +02:00
Negue
94a4ef6b1d
more layout + open new/edit TaskFormActivity without saving to DB + extract ChallengeTasksRecyclerViewAdapter
2017-04-06 20:58:51 +02:00
Phillip Thelen
6c8f394d94
correctly update task lists when filtering
2017-04-06 18:57:36 +02:00
Phillip Thelen
b113917c01
Add clear button to task filters
2017-04-06 18:36:45 +02:00
Phillip Thelen
c204054104
fix google and fb login
2017-04-06 16:58:00 +02:00
Phillip Thelen
ebcf7c7ea8
fix issues with transparent navbar
2017-04-06 14:01:09 +02:00
Phillip Thelen
9e5031334e
Merge branch 'develop' of github.com:HabitRPG/habitrpg-android into develop
2017-04-06 13:04:14 +02:00
Phillip Thelen
52020009c6
update gradle plugin
2017-04-06 13:04:02 +02:00
Phillip Thelen
4a92a2c214
fix notifications for task completion
2017-04-05 22:00:07 +02:00
Phillip Thelen
c0c3e047b2
Fix bottom bar layout issues
2017-04-05 21:59:58 +02:00
Phillip Thelen
88739ce114
Merge pull request #737 from Atomk/patch-4
...
Update strings.xml
2017-04-05 14:15:36 +02:00
Marco Fras
f8a3fe28a5
Update strings.xml
...
Fixed a typo. Is this the correct way to do it? Someonw reported an issue on this on Transifex, did you see it or there's the need for someone to manually check the issues?
2017-04-04 23:33:45 +02:00
Phillip Thelen
8ef8301b64
fix header padding
2017-04-04 22:05:54 +02:00
Phillip Thelen
c3ade8b827
support translucent navbar in mainactivity
2017-04-04 21:38:01 +02:00
Phillip Thelen
158acea5a1
make status and navbar transparent for intro and login
2017-04-04 17:45:24 +02:00
Phillip Thelen
166a9fb496
Implement tag editing
2017-04-04 12:48:22 +02:00
Phillip Thelen
4f4dc9e917
Start building tag editing
2017-04-04 00:00:31 +02:00
Phillip Thelen
67d612e28e
fix various crashes
2017-04-03 20:25:20 +02:00
Phillip Thelen
e79bd18c3a
Implement more task filtering options
2017-04-03 19:36:44 +02:00
Phillip Thelen
1b5dec0c16
reenable wake lock permission because removing it crashes some devices
2017-04-03 15:42:35 +02:00
Phillip Thelen
21b25e5658
update bottom bar design
2017-04-03 15:42:20 +02:00
Phillip Thelen
fe24613568
debounce task creation
...
this should prevent the issue that some users had, where tasks were created multiple times
2017-04-03 13:29:22 +02:00
Phillip Thelen
844b909d74
Change task lists to use SwipeRefreshLayout
2017-04-03 13:18:39 +02:00
Phillip Thelen
d3d3f47c78
Fix merge issues
2017-04-03 11:30:34 +02:00
Phillip Thelen
47a3326d37
fix crash when opening play store from subscription page
2017-04-03 09:51:41 +02:00
Phillip Thelen
c098120fb9
Merge branch 'develop' of github.com:HabitRPG/habitrpg-android into develop
2017-04-03 11:47:09 +02:00
Phillip Thelen
34305b5417
Merge branch 'task-repository' into develop
2017-04-03 11:44:13 +02:00
Phillip Thelen
854b946d71
Merge branch 'develop' into task-repository
...
# Conflicts:
# Habitica/src/main/java/com/habitrpg/android/habitica/HabiticaBaseApplication.java
# Habitica/src/main/java/com/habitrpg/android/habitica/components/AppComponent.java
# Habitica/src/main/java/com/habitrpg/android/habitica/modules/RepositoryModule.java
# Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/ChallengeDetailActivity.java
# Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/LoginActivity.java
# Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/SetupActivity.java
# Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/BaseMainFragment.java
# Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/setup/AvatarSetupFragment.java
# Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/challenges/ChallegeDetailDialogHolder.java
# Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/party/PartyFragment.java
2017-04-03 11:43:59 +02:00
Phillip Thelen
2e9842898a
Merge pull request #735 from TheHollidayInn/class-bonus-fix
...
Fixed class bonus calculation
2017-04-03 11:31:13 +02:00
Phillip Thelen
d17411495d
Implement bottom navigation bar
2017-04-02 23:59:22 +02:00
Keith Holliday
cb23a8a27c
Added migration
2017-03-31 16:08:23 -06:00
Keith Holliday
b4c361b8a5
Added tests
2017-03-31 15:07:19 -06:00
Keith Holliday
6f2eff63b6
Added class check for bonues
2017-03-31 10:15:27 -06:00
Phillip Thelen
b1bc1a06a1
New task setup view
2017-03-31 16:44:57 +02:00
Phillip Thelen
fd99ab3d1d
improve character setup design
2017-03-31 11:16:36 +02:00
