5758 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Phillip Thelen	e9e7e26011	deduplicate avatar generation code	2017-09-15 15:34:37 +02:00
Phillip Thelen	8c46922d90	improve rewards handling	2017-09-15 15:34:37 +02:00
Phillip Thelen	2dd1550518	Improve inbox loading	2017-09-15 15:34:36 +02:00
Phillip Thelen	c9e376466d	fix various crashes	2017-09-15 15:34:36 +02:00
Phillip Thelen	7261d88103	Optimize realm transactions	2017-09-15 15:34:36 +02:00
Phillip Thelen	e712b9a6a2	Merge pull request #802 from Atomk/patch-5 ... Better message for user loading	2017-09-15 15:23:51 +02:00
Phillip Thelen	95fa5ccc41	rename habitica colors	2017-09-11 13:31:20 +02:00
Phillip Thelen	a1b9b9db3e	support old reward column	2017-09-07 20:38:17 +02:00
Phillip Thelen	69f5254f9e	fix updating pushdevice id	2017-09-07 14:52:14 +02:00
Marco Fras	9d2557e80b	Better message for user loading	2017-09-06 19:51:58 +02:00
Phillip Thelen	6a529b31d0	fix various crashes	2017-09-06 00:04:11 +02:00
Phillip Thelen	64827c3f89	update emoji lib with compressed emojis	2017-09-05 19:51:21 +02:00
Phillip Thelen	1adc5be57e	fix linter errors	2017-09-05 19:51:21 +02:00
Phillip Thelen	40cf584987	replace drawables with paintcode code	2017-09-05 19:51:20 +02:00
Phillip Thelen	ebaa49f60c	show owned item count in shops	2017-09-05 19:51:20 +02:00
Phillip Thelen	ac5f82c490	Merge pull request #800 from MrTequila/develop ... Update Attributes strings	2017-09-05 16:50:02 +02:00
Phillip Thelen	70bb577645	Merge pull request #656 from d954mas/proguard ... add proguard rules	2017-09-05 16:47:01 +02:00
Phillip Thelen	77a591c723	Merge branch 'develop' into proguard	2017-09-05 16:46:14 +02:00
Phillip Thelen	cc08fa3b14	add resetting and deleting an account	2017-08-25 01:11:44 +02:00
Phillip Thelen	3048e5ca5b	improve reward display	2017-08-23 11:55:55 +02:00
Phillip Thelen	fb632e7ba9	begin implementing new rewards design	2017-08-22 21:13:29 +02:00
Phillip Thelen	022b885cdc	Merge remote-tracking branch 'origin/develop' into shops ... # Conflicts: # Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MainActivity.java # Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/GroupInformationFragment.java	2017-08-22 11:40:26 +02:00
Michał Jagiellicz	50f4b6349e	Update Attributes strings ... Update Attributes strings for: 'physical' - 'Strength' 'mental' - 'Intelligence' 'social' - 'Constitution' 'other' - 'Perception'	2017-08-14 22:52:51 +02:00
Phillip Thelen	a4ea581a71	fix potential ANR when scheduling task notifications	2017-08-07 12:30:16 +02:00
Phillip Thelen	e99ff76f67	fix task form error	2017-08-07 11:32:32 +02:00
Phillip Thelen	1c3eca74ef	fix authentication error on first startup	2017-08-03 16:04:26 +02:00
Phillip Thelen	680d1b44c1	bump version number	2017-08-03 13:46:04 +02:00
Phillip Thelen	377ff8dbc3	fix various minor crashes	2017-08-03 13:45:32 +02:00
Phillip Thelen	e2fba6c6e4	update translations	2017-08-02 14:30:56 +02:00
Phillip Thelen	1f9e61ce3a	fix various minor issues	2017-08-01 18:07:50 +02:00
Phillip Thelen	c551ed85e7	Add dialog for gear	2017-07-25 19:30:10 +02:00
Phillip Thelen	e455677da9	Reimplement purchasing	2017-07-25 19:05:33 +02:00
Phillip Thelen	aae43575e6	add purchase dialog for quests	2017-07-25 18:27:00 +02:00
Phillip Thelen	d7ea9e9c6b	fix memory leaks	2017-07-25 12:48:25 +02:00
Phillip Thelen	c7bf2bf034	update snackbar	2017-07-25 12:23:10 +02:00
Phillip Thelen	01d63102a7	update custom rewards design	2017-07-25 12:23:01 +02:00
Phillip Thelen	f8a5a20f25	new snackbar icons	2017-07-24 14:44:52 +02:00
Phillip Thelen	c45488ba23	improve snackbar design	2017-07-21 20:41:29 +02:00
Phillip Thelen	31baca2d26	start building new purchase dialog	2017-07-21 20:41:23 +02:00
Phillip Thelen	cd3a8b5d43	Add new shop banners	2017-07-21 17:53:51 +02:00
Phillip Thelen	8c0e52dbcb	Improve currency display	2017-07-21 14:45:56 +02:00
Phillip Thelen	9dfb15bde7	begin shop redesign	2017-07-21 14:42:03 +02:00
Phillip Thelen	8ae3cc3133	update realm	2017-07-21 14:42:03 +02:00
Phillip Thelen	7da825219a	improve content reloading	2017-07-21 14:41:39 +02:00
Phillip Thelen	9f40314b86	improve data loading on startup	2017-07-21 14:28:11 +02:00
Phillip Thelen	bddb7a7a11	fix minor issues	2017-07-21 14:14:06 +02:00
Phillip Thelen	012a2d8f56	fix yesterdaily dialog issue	2017-07-20 20:23:33 +02:00
Phillip Thelen	3f4b3e0eba	fix tests	2017-07-18 13:34:59 +02:00
Phillip Thelen	29b8c78814	bump version number	2017-07-18 13:18:28 +02:00
Phillip Thelen	f02b2a9d7c	fix minor crashes	2017-07-18 13:14:22 +02:00