sudoxreboot/habitica-android
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica-android.git synced 2026-08-01 19:50:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
1411 commits 3 branches 1 tag 142 MiB
Commit graph

1411 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
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
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
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
AlbRoehm
76818c4f3d Remove hardcoded strings from floating_menu_tasks (#670) 2016-12-14 18:09:08 +01:00
Keith Holliday
a2b6090efe Updated imageview to use new drawee view 2016-12-13 14:18:48 -06:00
Keith Holliday
51ee44917a Fixed build file 2016-12-13 12:35:01 -06:00
Keith Holliday
8d1ba18b3f Added tests for popup notification manager 2016-12-13 12:35:01 -06:00
Keith Holliday
7badf0190f Moved notification popup code to manager. Added initial tests 2016-12-13 12:35:00 -06:00
Keith Holliday
044dce9833 Updated api tests 2016-12-13 12:35:00 -06:00
Keith Holliday
fe1acad844 Fixed new response calls 2016-12-13 12:35:00 -06:00
Keith Holliday
f77b20f743 Added reward model and updated login incentive notification to use reward 2016-12-13 12:35:00 -06:00
Keith Holliday
b1ca7ec934 Added read notification 2016-12-13 12:35:00 -06:00
Keith Holliday
fef633e7b5 Added notificaiton data model. Added login incentive notification dialogs 2016-12-13 12:35:00 -06:00
Keith Holliday
d8dc4715ce Fixed login issues. Added notification model 2016-12-13 12:35:00 -06:00
Keith Holliday
f147bc0e6d Updated interceptor to use HabitResponse 2016-12-13 12:35:00 -06:00
negue
34a439c6b9 update google-services.json for release namespace 2016-12-12 20:08:44 +01:00
Phillip Thelen
d0ac3e4486 fix chairs with short names 2016-12-12 14:33:45 +01:00
Phillip Thelen
3a8098c3ec update translations 2016-12-12 14:33:01 +01:00
Phillip Thelen
64d54fb55b readd checkout dependency 2016-12-10 11:42:41 +01:00
Phillip Thelen
cb21f37284 update seeds sdk 2016-12-10 11:16:49 +01:00
Phillip Thelen
179bd18750 improve seeds integration 2016-12-08 12:34:47 +01:00
Phillip Thelen
e390f19bc2 Merge pull request #662 from HabitRPG/todo_widget 
Todo widget
 2016-12-08 12:16:05 +01:00
Phillip Thelen
9c91435ced temporarily remove remindersmanager test 2016-12-08 12:14:48 +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
Negue
1d3c2ea0ca change text resource id 2016-12-07 21:23:08 +01:00
Phillip Thelen
b51163d28a temporarily disable failing taskalarmmanager tests. 2016-12-07 18:13:18 +01:00
Phillip Thelen
566126b8ff don’t schedule alarm with empty intent 2016-12-07 16:04:31 +01:00
Phillip Thelen
89be68c2b6 change seeds sdk build tools version 2016-12-07 15:29:02 +01:00
Phillip Thelen
b37261257c make travis accept licenses 2016-12-07 15:12:46 +01:00
Phillip Thelen
5bda3e3c01 remove old gradle option 2016-12-07 15:05:28 +01:00
Phillip Thelen
d52f4ffb47 update travis config 2016-12-07 14:59:14 +01:00
Phillip Thelen
c0cf755fe7 update support libraries 2016-12-07 14:40:33 +01:00
Phillip Thelen
bcfd01e73f move seeds button 2016-12-07 14:40:03 +01:00
Phillip Thelen
89420b81da implement seeds sdk 2016-12-07 14:40:03 +01:00
Phillip Thelen
85691b4732 Merge pull request #657 from d954mas/no_multidex 
reduced the number of methods
 2016-12-07 14:34:36 +01:00