5759 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Phillip Thelen	aab9ee273e	Merge pull request #830 from LulaV14/feature/begin-quest-confirmation ... Add confirmation step to "begin" button for quests. Fixes #804	2017-11-01 14:38:48 +01:00
Phillip Thelen	640ca69007	Merge pull request #838 from aleien/fix-messages-like ... Don't show like button in messages	2017-11-01 14:31:38 +01:00
Phillip Thelen	cdf9500fa0	Merge pull request #837 from aleien/fix-tasks-backstack ... Fixed showing empty screen on back press	2017-11-01 14:28:37 +01:00
aleien	1e3cbfdad3	Not showing like button in messages	2017-11-01 00:24:05 +03:00
aleien	2a3edfeb3f	Fixed showing empty screen on back press	2017-10-31 23:55:34 +03:00
Phillip Thelen	fdbda662f9	begin converting repositories to kotlin	2017-10-31 19:51:23 +01:00
Phillip Thelen	b938dd0ff0	Make equipment available in shop. Fixes #825	2017-10-31 18:31:06 +01:00
Phillip Thelen	0f807b3ccd	fix news not loading. Fixes #833	2017-10-31 12:01:41 +01:00
Phillip Thelen	f24936338c	fix challenges sometimes not loading	2017-10-31 11:33:55 +01:00
Phillip Thelen	176cc7d0ee	Remove old challenges from local db. Fixes #834	2017-10-31 11:33:37 +01:00
Phillip Thelen	256518a9c7	improve sound handling	2017-10-30 19:21:35 +01:00
Phillip Thelen	d48a66be00	Fix loading sound files. Fixes #819	2017-10-30 19:11:54 +01:00
Phillip Thelen	c45b0d2516	Fix crash when editing push notifications. Fixes #829	2017-10-30 14:48:13 +01:00
Phillip Thelen	53337a777e	fix task creation	2017-10-30 14:31:24 +01:00
Phillip Thelen	f4e20ee1f3	fix showing class selection dialog	2017-10-30 14:31:17 +01:00
Phillip Thelen	2aaa8ccdaa	implement bulk attribute point allocation. Fixes #821	2017-10-30 13:27:19 +01:00
Phillip Thelen	54256023c2	remove staging key	2017-10-30 09:32:29 +01:00
Phillip Thelen	17d9b46fd3	begin implementing bulk allocation	2017-10-30 09:25:33 +01:00
Lula Villalobos	0202635b5d	deleted translations from quest_begin_message for the change on format string	2017-10-27 16:08:14 -07:00
Lula Villalobos	1d17f72806	added new confirmation message for begin quest alert dialog	2017-10-27 14:34:06 -07:00
Phillip Thelen	0017208e9a	convert Task	2017-10-27 18:14:41 +02:00
Phillip Thelen	1a17bfd63b	convert preferences	2017-10-27 14:17:59 +02:00
Phillip Thelen	356181c062	set right icon in fix character values. Fixes #823	2017-10-27 12:49:50 +02:00
Phillip Thelen	38b905cf86	make icon adaptive	2017-10-27 12:21:58 +02:00
Phillip Thelen	41b12226ac	Fix compilation error	2017-10-26 20:33:01 +02:00
Phillip Thelen	d93aad9574	remove databinding	2017-10-26 18:44:03 +02:00
Phillip Thelen	023956705f	update project	2017-10-26 15:52:12 +02:00
Phillip Thelen	e8dadcb159	Merge pull request #780 from maiatoday/update_studio ... Update studio	2017-10-26 13:49:31 +02:00
Phillip Thelen	77a129f2cc	Merge branch 'develop' into update_studio	2017-10-26 13:45:13 +02:00
Phillip Thelen	3bd8201440	Merge pull request #808 from caipivara/fix/missing-ids-on-some-layouts ... Fix missing + on id definition for some layouts	2017-10-23 13:35:16 +02:00
Phillip Thelen	d9bc77f92f	Merge branch 'develop' into fix/missing-ids-on-some-layouts	2017-10-23 13:35:10 +02:00
Phillip Thelen	4c8e92bdff	Merge pull request #812 from caipivara/feature/rename-android-style ... Rename code style with habitica	2017-10-23 13:32:14 +02:00
Phillip Thelen	d00df14639	fix loading error	2017-10-20 16:55:23 +02:00
Phillip Thelen	7fbb77fc2d	fix task reordering	2017-10-19 17:15:37 +02:00
Phillip Thelen	1e29628309	minor changes	2017-10-18 13:38:18 +02:00
Phillip Thelen	08d0733162	fix rounding for NumberAbbreviator	2017-10-18 13:31:46 +02:00
Phillip Thelen	e12800a773	fix saving character values	2017-10-18 13:19:16 +02:00
Phillip Thelen	7c09effb63	stats screen design tweaks	2017-10-18 13:19:10 +02:00
Phillip Thelen	d4068c632e	hide party invitation view correctly	2017-10-17 21:29:22 +02:00
Phillip Thelen	7aa48bf006	bump version number	2017-10-17 21:28:21 +02:00
Phillip Thelen	79fa4431c2	hide party invitation view correctly	2017-10-17 21:28:16 +02:00
Phillip Thelen	50e4484002	assign attribute points	2017-10-17 21:23:06 +02:00
Phillip Thelen	afb173c61f	display stats	2017-10-17 19:18:34 +02:00
Phillip Thelen	120da990b0	improve fix character values design	2017-10-16 13:58:18 +02:00
Phillip Thelen	6d9d6585df	redesign fix character values screen	2017-10-16 11:40:24 +02:00
Daniel Gomez Rico	62b73bbccf	Rename code style with habitica ... Having it as AndroidStyle may overlap with a style from a user´	2017-10-12 19:28:29 -05:00
Phillip Thelen	af80d60ee1	implement changing login name and email	2017-10-12 17:39:48 +02:00
Phillip Thelen	c148dddf12	bump version number	2017-10-12 17:39:48 +02:00
Phillip Thelen	abdd903851	fix accepting party invitations	2017-10-12 17:39:48 +02:00
Phillip Thelen	2c770afd6c	fix armoire notifications	2017-10-12 17:39:48 +02:00