Commit graph

71 commits

Author SHA1 Message Date
Phillip Thelen
db6a7e2bdb Merge branch 'develop' of github.com:HabitRPG/habitrpg-android into develop
# Conflicts:
#	Habitica/src/com/habitrpg/android/habitica/ui/fragments/social/GroupInformationFragment.java
#	Habitica/src/com/habitrpg/android/habitica/ui/fragments/social/party/PartyFragment.java
2016-03-05 14:56:24 +01:00
Phillip Thelen
ae0ff33e41 Add more guild functionality 2016-03-05 14:54:19 +01:00
Phillip Thelen
7efb1b4f72 Merge pull request #429 from saranlert/quest-invitation
add quest invitation accept/reject
2016-03-05 14:47:46 +01:00
Phillip Thelen
467c314896 display list of guilds the user is a member of 2016-02-26 12:51:06 +01:00
Saran Lertpradit
222fb7e411 add quest interaction
-list of quest participants in party view
-buttons to accept/reject/etc.. quest
2016-02-19 01:18:24 +07:00
Phillip Thelen
8067b6bcd3 add translations 2016-02-17 22:16:11 +01:00
Phillip Thelen
a362af8ef7 Merge pull request #414 from ExperimentMonty/bugfix/skill-unlock-level
Change skill unlock level text to 11
2016-02-17 22:00:59 +01:00
Negue
99bff54292 Get IAP Price & Add Support Text 2016-02-15 19:31:17 +01:00
John Montgomery
f089626349 Change skill unlock level text to 11 2016-02-09 08:56:56 -05:00
Phillip Thelen
95c377ea54 Show setup after registration 2016-02-02 15:02:27 +01:00
Phillip Thelen
2c982d5fb0 Add Intro before login 2016-02-02 15:02:26 +01:00
Phillip Thelen
cda0a1d56c Display tutorial messages 2016-02-02 15:02:26 +01:00
Phillip Thelen
e59326e141 display FAQ Articles 2016-02-02 15:02:17 +01:00
Phillip Thelen
1a96430491 Add version to about screen 2016-01-26 16:31:58 +01:00
Phillip Thelen
999ddd053d Support due date for todos. Fixes 2016-01-20 14:20:09 +01:00
Phillip Thelen
21d6342968 Better formatting for customizations 2016-01-19 19:43:24 +01:00
Phillip Thelen
3a5710d93a allow to buy and set backgrounds 2016-01-19 16:31:09 +01:00
Phillip Thelen
5c527b8ad6 Allow customizations and sets to be purchased 2016-01-16 18:05:14 +01:00
Phillip Thelen
ca2f89087f Display current avatar customization 2016-01-12 17:08:02 +01:00
Negue
921b14183c extract constant strings 2016-01-11 20:29:05 +01:00
Dan Lew
eebc7fc91c Extracted string resource for "Quest" 2015-12-17 07:01:52 -06:00
Phillip Thelen
d29a1c923e remove keys 2015-12-14 14:36:49 +01:00
Negue
2633d3f7e3 [#86] remove unused strings / styles [#167] extract strings to resources 2015-12-12 21:02:44 +01:00
Phillip Thelen
dd925b8b41 display link to reset password on website. 2015-12-10 02:26:31 +01:00
Phillip Thelen
b23f175cb1 display information alert when not in party 2015-12-09 23:58:56 +01:00
Phillip Thelen
186afb05f4 disable skills menu item when it's not available. 2015-12-09 14:06:20 +01:00
Phillip Thelen
c64a6c6a10 Change task form handling. Fixes #141 2015-12-09 00:22:27 +01:00
Phillip Thelen
fea1dc3339 Add confirmation dialog when flagging. Fixes #139 2015-12-09 00:22:26 +01:00
Negue
935cf8cf9c closes #115 - improve about screen 2015-12-07 23:50:22 +01:00
Phillip Thelen
378d2acaee Change login field to "Email or Username". Fixes #118 2015-12-07 15:01:08 +01:00
Negue
405722e06a edit rewards - closes #89 #102 - refactor task form view / class a bit 2015-12-05 23:12:03 +01:00
Phillip Thelen
f3ecc21661 Tease upcoming features in sidebar. Fixes #105 2015-12-05 15:16:21 +01:00
Phillip Thelen
f783443d14 task form improvements 2015-12-03 21:41:03 +01:00
Phillip Thelen
ff5c1ece48 better display for rewards 2015-12-02 18:46:27 +01:00
Phillip Thelen
e1c96f69d5 better feedback when using skills 2015-12-02 16:56:13 +01:00
Phillip Thelen
46598945c3 add setting for daily reminder 2015-12-01 02:37:30 +01:00
Phillip Thelen
1283244b61 Allow checklist item editing 2015-11-30 23:01:41 +01:00
Phillip Thelen
0434496de7 Merge branch 'setttings-activity' into develop
# Conflicts:
#	Habitica/src/com/habitrpg/android/habitica/MainActivity.java
2015-11-28 19:51:03 +01:00
Phillip Thelen
effdc76390 add ability to use skills 2015-11-28 19:30:48 +01:00
Franze Jr
d1ceb6d6b9 [#13] First version of SettingsActivity 2015-11-26 18:56:22 -03:00
Phillip Thelen
2d2e8ad9ab Display skills 2015-11-25 18:47:56 +01:00
Phillip Thelen
116020171e Improve header layout 2015-11-25 14:41:06 +01:00
Phillip Thelen
2dddc93c39 correct events for fragments 2015-11-19 21:38:21 +01:00
Phillip Thelen
29db6a99cc better feedback on user login 2015-11-18 13:05:38 +01:00
Negue
72d1a33e08 Merge branch 'faint-screen' of https://github.com/HabitRPG/habitrpg-android into develop
Conflicts:
	Habitica/Habitica.iml
	Habitica/res/values/strings.xml
	Habitica/src/com/habitrpg/android/habitica/MainActivity.java
2015-11-15 18:57:19 +01:00
Phillip Thelen
75ad7523cc Display levelup popup 2015-11-15 17:22:05 +01:00
Phillip Thelen
3b0e565144 Display faint dialog and allow to revive 2015-11-15 16:33:06 +01:00
Phillip Thelen
3aa5ec4608 Add basic facebook login 2015-11-14 15:59:44 +01:00
Phillip Thelen
97554d5cfd Redesign login screen 2015-11-09 18:48:01 +01:00
Phillip Thelen
0cff8749d9 Merge pull request #41 from HabitRPG/offline-warning
Offline warning
2015-11-08 11:58:20 +01:00