sudoxreboot/habitica-android
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica-android.git synced 2026-07-31 11:10:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
5759 commits 3 branches 1 tag 142 MiB
Commit graph

5759 commits

This branch
This branch
All branches
Author SHA1 Message Date
Anita Woodruff
d22ec6eb65 Only set layout weight animation for weight changes - fixes #686 2017-01-07 19:45:58 +00:00
Anita Woodruff
cb5b4cd126 Make setLayoutWeight clear old animations on value bar - fixes #686 2017-01-07 19:45:25 +00:00
Daniel Gomez Rico
875ee30ea5 Merge branch 'develop' into feature/clean-login-style 2017-01-06 20:55:41 -05:00
Negue
a281d7fbf8 show tasks inside dialog / improve loading challenges 2017-01-06 23:45:21 +01:00
Anita Woodruff
ba35130b41 Upgrade robolectric to 3.2 2017-01-06 10:08:26 +00:00
Anita Woodruff
0cdc83049e TaskAlarmManagerTest: fixup expected day calculation 2017-01-06 10:07:50 +00:00
Phillip Thelen
3f00de6c4d update task design 2017-01-05 18:19:06 +01:00
Phillip Thelen
96e3616e7c fix social sharing 2017-01-05 12:07:40 +01:00
Anita Woodruff
6c398f856a Reenable TaskAlarmManager tests 2017-01-04 22:51:36 +00:00
Anita Woodruff
650ff36a46 Upgrade robolectric to 3.2-rc 2017-01-04 22:51:36 +00:00
Anita Woodruff
60d8b007cd Tidying: remove unused imports in some tests 2017-01-04 22:51:36 +00:00
Negue
b86edf308b Show only used task types of a challenge (in details activity) 2017-01-04 22:32:25 +01:00
Negue
d5361424d1 fix reset of Fragment Position / remove ChallengeOverviewActivity 2017-01-04 21:38:44 +01:00
Negue
c4de096a00 Show More-Button / Leave in ChallengeDetails Activity / refactoring 2017-01-04 20:18:50 +01:00
Phillip Thelen
85689aa925 update travis 2017-01-04 13:02:23 +01:00
Phillip Thelen
dc11454e40 fix compiling 2017-01-04 12:48:19 +01:00
Phillip Thelen
e1abf34bd0 bump version number 2017-01-04 12:19:48 +01:00
Phillip Thelen
66d3b974e0 Merge pull request #673 from AlbRoehm/Feature-#556_admin_delete_posts 
Feature-#556_admin_delete_posts
 2017-01-04 12:14:13 +01:00
Phillip Thelen
ddeb96d263 Merge pull request #682 from josephnw/group-leader-name 
Group leader name
 2017-01-04 12:06:03 +01:00
Negue
44d2486e8d Show Participating-Label right after join (w/o reload) + Emoji / Markdown in Challenge Name / Description + change Challenge-Dialog to "joined" mode without closing 2017-01-02 22:38:36 +01:00
Negue
98554a7a8b Challenges - back button history on tablayout 2017-01-02 21:17:21 +01:00
josephnw
15588f4e36 Merge branch 'group-leader-name' of https://github.com/josephnw/habitica-android into group-leader-name 
# Conflicts:
#	Habitica/res/values/strings.xml
 2016-12-30 19:40:25 +07:00
josephnw
cb0084a3e5 Display group leader name 2016-12-30 19:34:14 +07:00
josephnw
da83bdd073 Display group leader name 2016-12-30 17:25:57 +07:00
AlbrechtRoehm
d7e1b7a5fa changed braces 2016-12-27 16:58:25 +01:00
Phillip Thelen
0448c1e48a Merge pull request #675 from AlbRoehm/Refresh_on_language_change 
Refresh_on_language_change
 2016-12-27 16:39:44 +01:00
Phillip Thelen
ea146c4d2a Merge pull request #625 from HabitRPG/profile-achievements 
WIP: Profile achievements
 2016-12-27 16:17:36 +01:00
Phillip Thelen
c7b2153f36 Merge pull request #679 from AlbRoehm/change_AudioManager_Stream 
Changed helpers/SoundFile - AudioManager.STREAM_NOTIFICATION to mute …
 2016-12-27 16:14:10 +01:00
Negue
a5cee4fbbe ChallengeOverviewActivity / working back navigation \o/ / redesign DetailActivity 2016-12-23 19:36:44 +01:00
Negue
e7fd3b2b92 add MaxHeightLinearLayout to resize dialog 2016-12-23 19:03:46 +01:00
Negue
9eace50d54 remove high res icons 2016-12-23 17:32:59 +01:00
Negue
05e0e49bca ChallengeDetail Dialog : go to challenge / join / leave / show leader profile 2016-12-21 21:15:34 +01:00
AlbrechtRoehm
cd8026c1e3 Changed helpers/SoundFile - AudioManager.STREAM_NOTIFICATION to mute sounds when phone is muted 2016-12-21 19:33:39 +01:00
Phillip Thelen
7ca9578109 Merge pull request #667 from TheHollidayInn/login-incentives 
Login incentives
 2016-12-19 18:36:19 +01:00
Daniel Gomez Rico
db3b34f87c Add stacktrace and disable predex for ci 2016-12-19 18:34:50 +01:00
Negue
c55872fa78 redesign public challenge item - use styles for fontFamily - new header icons 2016-12-19 18:01:54 +01:00
d954mas
b59dfd25f2 add proguard rules for playservices and checkout 2016-12-19 18:35:52 +03:00
d954mas
6c354803e8 Merge branch 'develop' into proguard 
# Conflicts:
#	Habitica/build.gradle
 2016-12-19 16:03:18 +03:00
Negue
dde293de19 redesign "my challenges" list / custom Title override by fragment / save taskLists and groupId/name of a challenge to the database 2016-12-18 18:46:03 +01:00
AlbrechtRoehm
4a233b2da1 Refresh_on_language_change 
After changing the language settings the question and answer are now displayed in the correct language. fix #674
 2016-12-16 01:34:06 +01:00
AlbrechtRoehm
9197e1d554 Feature-#556_admin_delete_posts 
Added a check whether the user is a admin and display the delete option if so. Also added a confirmation dialog for message delete
 2016-12-16 00:19:20 +01:00
Daniel Gomez Rico
3b02bb9742 Fix mConfirmPassword forgoten in resetLayout 
it was a mistake on first commit of this pull request
 2016-12-15 15:37:59 -05:00
Daniel Gomez Rico
901e3d0449 Add logo to login page 2016-12-15 15:37:59 -05:00
Daniel Gomez Rico
a0f1b299b9 Fix next field focus 2016-12-15 15:37:59 -05:00
Daniel Gomez Rico
44c1d3bc30 Update button sizes 2016-12-15 15:37:59 -05:00
Daniel Gomez Rico
68ac51a5ff Clean login layout button style 
- It was hard to edit
- The size of the buttons where a little weird
- The logo at the top with weird padding hide fields in small screen sizes
 2016-12-15 15:37:59 -05:00
Negue
66af98c17f clean up 2016-12-15 19:50:18 +01:00
Negue
639e308cb4 show unearned icon and load all icons in 2x size 2016-12-15 19:33:32 +01:00
Negue
82ec155b75 Merge branch 'develop' of https://github.com/HabitRPG/habitrpg-android into profile-achievements 
Conflicts:
	Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/FullProfileActivity.java
 2016-12-15 19:32:54 +01:00
Keith Holliday
0ad76d5544 Fixed broken tests 2016-12-14 15:58:07 -06:00