1576 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Phillip Thelen	9ce581fbff	Merge branch 'challenge_filter' into develop	2017-03-23 14:13:50 +01:00
Phillip Thelen	0a7c60e83f	Merge branch 'develop' into challenge_filter ... # Conflicts: # Habitica/res/values/strings.xml	2017-03-23 14:13:13 +01:00
Phillip Thelen	7d491fbdba	New intro	2017-03-23 14:12:28 +01:00
Phillip Thelen	9c78d519f5	update to android studio 2.3	2017-03-23 14:12:28 +01:00
Phillip Thelen	2d5680ed80	Merge pull request #727 from HabitRPG/leave_challenge ... leave / remove tasks on deleting a challenge	2017-03-23 14:10:21 +01:00
Phillip Thelen	0872c2bcd4	Merge pull request #724 from dinesh3434/leave-party ... Leave party Confirmation	2017-03-23 14:09:15 +01:00
Negue	afc0a92e37	leave / remove tasks on deleting a challenge	2017-03-09 21:15:57 +01:00
Dinesh	e8a9104ae3	revert pull.md	2017-03-08 13:32:57 +05:30
Dinesh	857318604a	Merge branch 'leave-party' of https://github.com/dinesh3434/habitica-android into leave-party	2017-03-08 13:18:40 +05:30
Dinesh	8c5e31038c	leave-party-string	2017-03-08 12:56:59 +05:30
Dinesh	8cf6cbd1b9	leave-party (added strings)	2017-03-08 12:24:42 +05:30
Phillip Thelen	d6681bd1f5	bump version code	2017-03-06 20:43:45 +01:00
Phillip Thelen	7dc8bf9b9f	How to boolean logic?	2017-03-06 20:43:35 +01:00
Phillip Thelen	82e51292f5	bump build number	2017-03-06 12:12:52 +01:00
Phillip Thelen	0ba7272cea	fix another crash in subscription view	2017-03-06 12:12:31 +01:00
Dinesh	01948f0d6d	lave-party	2017-03-05 19:30:30 +05:30
Dinesh	1e75eebf88	Leave Party Dialog Working	2017-03-05 19:11:52 +05:30
Dinesh Thanigaivelu	3c8664def8	Leave Party Dialog working	2017-03-05 19:04:22 +05:30
Dinesh Thanigaivelu	437288ab1c	Dialog popup working	2017-03-05 18:34:25 +05:30
Phillip Thelen	4c2f678322	bump version number	2017-03-05 11:05:15 +01:00
Phillip Thelen	c7903652d4	fix potential crash in subscription view	2017-03-05 11:05:00 +01:00
Phillip Thelen	7b540c567f	update translations	2017-03-05 11:04:44 +01:00
Phillip Thelen	688f2035a6	fix potential crash	2017-03-01 16:21:01 +01:00
Negue	497c535bac	Merge branch 'develop' of https://github.com/HabitRPG/habitica-android into challenge_filter	2017-03-01 13:46:49 +01:00
Negue	16e32a7ec3	"my challenges" - filter	2017-03-01 13:45:43 +01:00
Phillip Thelen	165d141060	update translations	2017-02-27 10:49:13 +01:00
Phillip Thelen	8e5343f63f	fix potential crash	2017-02-27 09:39:21 +01:00
Phillip Thelen	d0a0b845e4	update translations	2017-02-26 12:07:23 +01:00
Phillip Thelen	dc5beef190	basic group plan support	2017-02-26 12:07:16 +01:00
Phillip Thelen	18770e0083	fix task list not updating correctly	2017-02-24 19:06:26 +01:00
Phillip Thelen	03b79f5645	Merge pull request #714 from HabitRPG/checkstyle ... add checkstyle and pmd	2017-02-24 11:43:53 +01:00
Phillip Thelen	c6a691ef18	remove broken seeds tests	2017-02-23 11:47:48 +01:00
Phillip Thelen	5a65b3b96b	correct checking for valid subscription	2017-02-23 11:06:47 +01:00
Phillip Thelen	7e9c70fae8	fix potential crashes	2017-02-06 15:53:10 +01:00
Phillip Thelen	27f3e5645b	subscription layout changes	2017-02-03 13:21:42 +01:00
Phillip Thelen	ce897ea916	fix bash syntax	2017-02-02 15:19:21 +01:00
Phillip Thelen	36d2eaafac	fix travis build leaving directory	2017-02-02 14:53:21 +01:00
Phillip Thelen	2a6b24ba28	fix travis syntax	2017-02-02 14:44:10 +01:00
Phillip Thelen	b859bd9e8b	fix tests	2017-02-02 14:32:05 +01:00
Phillip Thelen	bcc0396dfb	don’t run server for every build matrix type	2017-02-02 13:33:27 +01:00
Phillip Thelen	402dbd5ba7	change travis config	2017-02-02 13:21:57 +01:00
Phillip Thelen	d167743a89	bump version number	2017-02-02 12:55:04 +01:00
Phillip Thelen	27e19eb1e5	optimize imports and fix code formatting	2017-02-02 12:26:20 +01:00
Phillip Thelen	0dc56f0fed	add checkstyle and pmd	2017-02-02 12:24:31 +01:00
Phillip Thelen	1c85fbfa43	small design tweaks	2017-02-01 20:03:36 +01:00
Phillip Thelen	7a81e11524	fix crash in gem page	2017-02-01 17:03:12 +01:00
Phillip Thelen	67a0deee61	fix a bunch of linter errors	2017-02-01 16:58:53 +01:00
Phillip Thelen	d9167db771	update travis config	2017-02-01 15:05:33 +01:00
Phillip Thelen	18ae2edbea	minor changes	2017-02-01 14:51:08 +01:00
Phillip Thelen	c99ff56288	add findbugs gradle plugin	2017-02-01 14:15:24 +01:00