Commit graph

5759 commits

Author SHA1 Message Date
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
Negue
a1f9aab852 join / leave a challenge, open profile of the challenge leader, multiple fixes 2016-12-13 21:04:15 +01: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
f4aa65b6b4 add missing challenge columns (database) 2016-12-12 22:12:29 +01:00
Negue
39cbebf4ee fix challenge deserialize - null checks 2016-12-12 20:44:09 +01: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
Maxime Busy
f6f47f3a30 Update strings.xml 2016-12-08 10:57:19 +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
d954mas
63e2e9b354 fixed fresko and amplitude 2016-12-07 21:05:18 +03: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
Pandhariix
a31d066c7b final changes on the texts 2016-12-06 23:29:53 +01:00
Negue
1c73f4f610 custom challenge-deserializer - leaderName as column 2016-12-06 21:32:30 +01:00
Negue
5d0c1df11f requested changes - load local challenges from database - load available challenges from api&database 2016-12-06 19:48:07 +01:00
d954mas
bad500aa43 fixed crashlyticsProxy initialization 2016-12-06 21:38:41 +03:00
d954mas
87750ccee1 remove unused classes 2016-12-06 21:03:13 +03:00
Phillip Thelen
1ea6227bb0 Merge pull request #661 from AlbRoehm/update_german_translation
Added strings to for correct display in the preferences_fragment; cha…
2016-12-06 17:15:36 +01:00
Pandhariix
0c4d534d4d Correct confirmation message for changing class, and add a warning relative to the gear 2016-12-06 00:54:53 +01:00
AlbrechtRoehm
6c10c13ad0 Remove translations from commit 2016-12-05 19:26:54 +01:00
AlbrechtRoehm
63f745bcd2 Revert "Added strings to for correct display in the preferences_fragment; changed strings.xml in de and eng; Changed some upper case letters in the strings.tutorial.xml"
This reverts commit 57867549a2.
2016-12-05 19:21:45 +01:00
Phillip Thelen
cd27b0639c Merge pull request #655 from anitawoodruff/filter-drawer-fix
Filter drawer fix
2016-12-05 19:14:18 +01:00
Pandhariix
6702379725 Erase the test code and finalize changes 2016-12-04 18:13:47 +01:00
Negue
445d1781d7 challenge detail activity 2016-12-01 21:48:24 +01:00
Pandhariix
b8a1c8653c Add strings and popups linked to the class changements 2016-12-01 00:49:02 +01:00