sudoxreboot/habitica-android
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica-android.git synced 2026-07-29 18:27:18 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
5759 commits 3 branches 1 tag 142 MiB
Commit graph

5759 commits

This branch
This branch
All branches
Author SHA1 Message Date
Phillip Thelen
e5f7df449e Merge pull request #422 from dbarnett/update_mp 
Update to show new MP value on task completion
 2016-02-17 22:07:39 +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
e67a5d9a82 Merge pull request #374 from HabitRPG/seenMessages 
Mark ChatMessages as Seen
 2016-02-15 19:58:55 +01:00
Negue
f9140bd216 Merge branch 'develop' into seenMessages 
Conflicts:
	Habitica/src/com/habitrpg/android/habitica/ui/fragments/social/ChatListFragment.java
	Habitica/src/com/habitrpg/android/habitica/ui/fragments/social/party/PartyFragment.java
 2016-02-15 19:54:19 +01:00
Negue
99bff54292 Get IAP Price & Add Support Text 2016-02-15 19:31:17 +01:00
David Barnett
85b0fb2460 Update to show new MP value on task completion 2016-02-13 18:51:34 -08:00
WhatsEmo
836dbde5c5 Syncing for due dates fixed 
- Sync with due dates now saved properly to DB
- Problem:
- Users always assign a due date.
- Will add something to allow user to choose to add a due date
 2016-02-11 12:14:46 -08:00
WhatsEmo
ee265021be Implement More Information on Bug Reports 
-Added getUserID() function to MainActivity.java
-Passed UserID through Intents
-Modified sendEmail(String subject) in AboutFragment.java to add a
template email for Bug Reports
 2016-02-11 00:21:50 -08:00
WhatsEmo
b6ede481ec Added note about TasksFragment 
Line 522 (below the comment) Adds in the number of tasks that is
associated with that Tag, but the number sometimes is greater than the
number of Tasks displayed to the user
 2016-02-10 11:37:26 -08:00
WhatsEmo
34170adc6d Tags Implementation. 
-Allow Users to add Tags to new and Old Tasks.
-Modified activity_task_form.xml to allow dynamic check boxes
-Fixed issue where MainActivity would pass in empty Tags to other
activities/fragments
 2016-02-10 11:09:09 -08:00
Brandon Cheng
460dae79e1 Merge pull request #1 from HabitRPG/develop 
Test
 2016-02-10 00:50:12 -08:00
John Montgomery
f089626349 Change skill unlock level text to 11 2016-02-09 08:56:56 -05:00
Phillip Thelen
231629ce6d Merge pull request #412 from schrockblock/feature/eschrock/on-stop-crash 
Crash on recreate MainActivity, and blank tabs
 2016-02-09 13:30:10 +01:00
Phillip Thelen
a8cc82e0ea Merge pull request #407 from Vorgone/partyfragment 
Add null check to tablayout in PartyFragment.java
 2016-02-09 12:40:11 +01:00
Phillip Thelen
b01b0bff2a Merge pull request #401 from saranlert/class-optout-mp 
Hide MP bar for opt-out class
 2016-02-09 12:38:03 +01:00
Phillip Thelen
1f34c8c8a7 Merge pull request #394 from dbarnett/edittext 
Add android:inputType="textCapSentences" to auto-capitalize first letter of most EditText widgets
 2016-02-09 12:36:29 +01:00
Phillip Thelen
1096c9ef2c Merge pull request #406 from Vorgone/fixbuild 
Fix for broken travis build
 2016-02-09 12:35:21 +01:00
Elliot
6de4943f8e fix blank state after restart 2016-02-07 14:16:04 -06:00
Elliot
c00be08606 fix null pointer with savedInstanceState 2016-02-07 14:11:10 -06:00
Alex Hart
e8c80d3989 Add null check to tablayout in PartyFragment.java 
This resolves issue #405.
 2016-02-05 14:58:05 -06:00
Alex Hart
39ee50591a Fix for broken travis build 
The resource amplitude_app_id is missing and is causing build failures.
 2016-02-05 14:00:51 -06:00
Phillip Thelen
6099c2c080 minor fixes 2016-02-03 13:56:43 +01:00
Phillip Thelen
7832e4e81b Add amplitude support 2016-02-02 21:19:07 +01:00
Phillip Thelen
d74ad6040e Fix avatar margin 2016-02-02 20:30:25 +01:00
Phillip Thelen
b922cf23f4 fix tutorial display for tasks 2016-02-02 18:47:10 +01:00
Saran Lertpradit
c7dded48ed MP shouldn't be visible if user opt-out class system 2016-02-02 23:37:46 +07:00
Phillip Thelen
d1584d8727 improve initial fragment loading 2016-02-02 16:10:22 +01:00
Phillip Thelen
da3bdd50a3 prevent header overlapping 2016-02-02 15:25:48 +01: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
905568821f improve tutorial display 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
b03bc629be Merge pull request #389 from patheticpat/party-memberlist 
Don't animate health bar in party member list
 2016-01-31 15:42:58 +01:00
Phillip Thelen
3b624f2b0f Merge pull request #391 from patheticpat/patch-1 
Fix the Google Play badge in README.md
 2016-01-31 15:42:42 +01:00
Phillip Thelen
b2b0b5a7bd Merge pull request #399 from abscondment/stopped-activities 
Fix some fragment crashes.
 2016-01-31 15:41:42 +01:00
Brendan Ribera
c25de06d08 Fix some crashes in stopped BaseFragments. 
Saves userId in a Bundle on stopping; restores it (and the associated
user) upon re-starting.
 2016-01-31 01:30:22 -08:00
Brendan Ribera
cb800fe7e8 Fix crash in stopped ChatListFragments. 
Saves instance state and restores objects after the fragment has been
stopped and is being started again.

Specifically, userId (& user),
groupId, and isTavern are now saved to a bundle and restorde. APIHelper
is also re-created if null.
 2016-01-31 00:48:37 -08:00
David Barnett
83caf8921d Add inputType=textCapSentences to most EditText widgets 2016-01-30 22:59:04 -08:00
Saran Lertpradit
3b0c2e0b86 Merge remote-tracking branch 'HabitRPG/develop' into develop 2016-01-28 23:23:12 +07:00
Phillip Thelen
34321b60b7 Fix crash with checklist items 2016-01-27 13:29:51 +01:00
Phillip Thelen
ec3ea26d8e fix rounding in bars 2016-01-26 21:55:03 +01:00
Phillip Thelen
4f8ab2f8f8 Fix crashes 2016-01-26 21:54:57 +01:00
Phillip Thelen
548b47435d improve sync when app is reopened 2016-01-26 16:32:06 +01:00
Phillip Thelen
1a96430491 Add version to about screen 2016-01-26 16:31:58 +01:00
Phillip Thelen
d6b6e897c1 Force content loading on fragment launch 2016-01-26 15:40:57 +01:00
Phillip Thelen
513334575c Improve Date parsing 2016-01-26 13:03:27 +01:00
Michael Kaiser
af5927c0e8 Fix the Google Play badge in README.md 2016-01-26 10:21:33 +01:00
Michael Kaiser
007be89c5e Don't animate health bar in party member list 2016-01-25 18:09:02 +01:00
Data5tream
40700ff737 Messages are now loaded before parsing and replaced later 2016-01-22 22:45:40 +01:00