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

5753 commits

This branch
This branch
All branches
Author SHA1 Message Date
Keith Holliday
e0632ee6e2 Updated test to mod 7 for the days of the week 2016-08-12 11:27:24 -05:00
Keith Holliday
796a9a7613 Refactored QR code and fixed layout issues 2016-08-12 11:15:48 -05:00
Keith Holliday
45d9dc2d35 Added download qr. Added invite by qr. 2016-08-12 11:15:48 -05:00
Keith Holliday
d789a50de4 Added download button 2016-08-12 11:15:48 -05:00
Keith Holliday
30b736d9a1 Added QR Code to party page if you are not in a party 2016-08-12 11:15:48 -05:00
Keith Holliday
d65212f4d2 Added qrcode library. Added qr code imageview to account details 2016-08-12 11:15:48 -05:00
Phillip Thelen
d89609d562 spacing and icon tweaks 2016-08-11 18:06:55 +02:00
Jack Billings
d21a822724 Merge pull request #4 from HabitRPG/develop 
Update from original repo
 2016-08-09 16:25:48 -05:00
Negue
8f65456677 parse Markdown for member's blurb message, move event subscribe to MainActivity, open profile from the chat too 2016-08-09 23:09:01 +02:00
Negue
2a9e6baa81 fix dexOptions in build.gradle 2016-08-09 23:07:49 +02:00
Negue
9f3d67419b rename sub-layouts to profile_* , extract resources, toggle attributes, hide costume card if the user doesn't activated it 2016-08-09 22:29:05 +02:00
Phillip Thelen
609a037307 Merge pull request #593 from TheHollidayInn/push-notification-pm-to-app-fix 
Opened app when user clicks PM notification
 2016-08-09 11:17:46 +02:00
Keith Holliday
6948047ae2 Opened app when user clicks PM notification 2016-08-08 20:02:50 -05:00
Negue
a46a54644a Merge branch 'develop' of https://github.com/HabitRPG/habitrpg-android into full-profile 2016-08-08 18:09:49 +02:00
Negue
2af95690b8 Pet / Mount Counts 2016-08-08 18:09:26 +02:00
Phillip Thelen
c346327587 update translations 2016-08-08 13:00:02 +02:00
Phillip Thelen
3e9600c212 don’t add push devices if array is empty 2016-08-08 12:58:52 +02:00
Phillip Thelen
d7a458a683 use deprecated but working gradle runner 2016-08-08 12:15:34 +02:00
Phillip Thelen
491590ee0a fix database migration 2016-08-08 12:04:18 +02:00
Phillip Thelen
e374a47316 Merge pull request #592 from TheHollidayInn/fix-concurrent-thread-issue 
Closed DB connection after each test
 2016-08-08 12:03:43 +02:00
Keith Holliday
347ae6e5af Closed DB connection after each test 2016-08-07 22:24:28 -05:00
Jack Billings
b85a30de0a Add guild search bar 2016-08-07 19:30:40 -05:00
Jack Billings
61f4fd1154 Merge pull request #3 from HabitRPG/develop 
Update from original repo
 2016-08-07 19:57:06 -04:00
Negue
127464537d Merge branch 'develop' of https://github.com/HabitRPG/habitrpg-android into full-profile 
Conflicts:
	Habitica/src/main/java/com/habitrpg/android/habitica/components/AppComponent.java
 2016-08-06 20:47:01 +02:00
Negue
1629c8cde6 Send messages to members from profile view 2016-08-06 16:32:15 +02:00
Negue
66ffcece3d Equipment / Costume Gear with Image, Attributes as grid 2016-08-04 23:11:39 +02:00
Phillip Thelen
d18b2653f6 update translations 2016-08-04 20:11:46 +02:00
Phillip Thelen
5db9a629d8 fix api tests 2016-08-04 19:27:29 +02:00
Phillip Thelen
b1fa0e40dd set application id in gradle file 2016-08-04 19:27:11 +02:00
Phillip Thelen
bcdf638bf0 fix opening login screen while in debug mode 2016-08-04 19:26:35 +02:00
Phillip Thelen
914b585d71 Merge pull request #572 from TheHollidayInn/social-notifications 
Social notifications
 2016-08-04 19:25:36 +02:00
Phillip Thelen
c79455e1d3 fix remindersmanager test 2016-08-04 12:35:10 +02:00
Phillip Thelen
8fb48bedfc Merge pull request #589 from TheHollidayInn/task-alarm-tests-fix 
Added fixes for task alarm manager tests
 2016-08-04 12:34:29 +02:00
Phillip Thelen
41ef950068 Allow chat messages to be copied to clipboard 
commit 61d2757fe581ea1ae084e0e576f7e0e1b2e226fb
Author: Phillip Thelen <viirus@pherth.net>
Date:   Thu Aug 4 12:22:58 2016 +0200

    add copy to clipboard string

commit b73d727a2251326f7860ae7b48225eb289c66f0c
Author: jjbillings <jjbillings@noctrl.edu>
Date:   Wed Aug 3 08:56:06 2016 -0400

    Add message into strings.xml
    # Conflicts:
    #	Habitica/res/values/strings.xml

commit 8546ee24e8b6a9593ae729e0084879d414a1a288
Merge: ecf1f33 93f264f
Author: Jack Billings <jjbillings@noctrl.edu>
Date:   Tue Aug 2 18:28:19 2016 -0400

    Merge remote-tracking branch 'origin/develop' into copy-chat-message

    # Conflicts:
    #	Habitica/res/values/strings.xml
    #Conflicts resolved...

commit 93f264f0b4
Merge: 81ded07 2ddc426
Author: Jack Billings <jjbillings@noctrl.edu>
Date:   Tue Aug 2 18:23:35 2016 -0400

    Merge pull request #2 from HabitRPG/develop

    Merge from main repo

commit ecf1f33ed0b3cf9457723353d5f1f8fa9dabeecb
Author: Jack Billings <jjbillings@noctrl.edu>
Date:   Fri Jul 29 09:27:09 2016 -0400

    Merge remote-tracking branch 'origin/develop' into copy-chat-message

    # Conflicts:
    #	Habitica/res/values/strings.xml

commit e64b3bda35aff3393c33a6e0628ea3843d517e22
Merge: f6e118d 81ded07
Author: Jack Billings <jjbillings@noctrl.edu>
Date:   Fri Jul 29 09:26:35 2016 -0400

    Merge remote-tracking branch 'origin/develop' into copy-chat-message

    # Conflicts:
    #	Habitica/res/values/strings.xml

commit 81ded07730
Merge: 0f70acc f5f5f00
Author: Jack Billings <jjbillings@noctrl.edu>
Date:   Fri Jul 29 09:08:35 2016 -0400

    Merge pull request #1 from HabitRPG/develop

    Update from original repo

commit f6e118d162a6b91a0716e7d1bceeaebe0aec96cb
Author: Jack Billings <jjbillings@noctrl.edu>
Date:   Fri Jul 29 09:02:12 2016 -0400

    Change Toast to SnackBar

commit 8835fe418df2fb5f2e08a06fdda94f2eae9d77f3
Merge: c72a1f5 80da760
Author: Jack Billings <jjbillings@noctrl.edu>
Date:   Fri Jul 29 08:59:52 2016 -0400

    Change Toast to SnackBar

commit c72a1f533d120cba9be838870460e2ee7a03ee9f
Author: Jack Billings <jjbillings@noctrl.edu>
Date:   Wed Jul 27 20:30:43 2016 -0400

    Add feature to copy chat messages to clipboard

commit 80da7601c48d63c92f909f4a3b4c6559bd907470
Merge: 2bf900d f0d997b
Author: Phillip Thelen <viirus@pherth.net>
Date:   Tue Jun 7 19:11:08 2016 +0200

    Merge branch 'travis' of github.com:HabitRPG/habitrpg-android into travis

    # Conflicts:
    #	.travis.yml

commit 2bf900df64aa241db5feeb4820b643cd0e1fa1e8
Author: Phillip Thelen <viirus@pherth.net>
Date:   Tue Jun 7 19:05:37 2016 +0200

    .

commit f0d997b56f37d511e66e18734716934efef3af13
Author: Phillip Thelen <viirus@pherth.net>
Date:   Tue Jun 7 19:05:37 2016 +0200

    .

commit 62e96caf288ae6f7260d4eb73164f082db0c7016
Author: Phillip Thelen <viirus@pherth.net>
Date:   Tue Jun 7 17:16:06 2016 +0200

    .

commit b0f640ced3c2a0e654a2b34ca2fe8307be0b7208
Author: Phillip Thelen <viirus@pherth.net>
Date:   Tue Jun 7 17:12:09 2016 +0200

    .

commit 97d3892b0e9b259e94f1920ffe6226da05fa218c
Author: Phillip Thelen <viirus@pherth.net>
Date:   Tue Jun 7 16:16:04 2016 +0200

    .

commit 6b89f5ee013c2711fe1872e7ff657439ab61a02d
Author: Phillip Thelen <viirus@pherth.net>
Date:   Tue Jun 7 16:00:39 2016 +0200

    set node version

commit 79e2b3af80741266c8ba9dda90d6a3ad40c56d0a
Author: Phillip Thelen <viirus@pherth.net>
Date:   Tue Jun 7 15:44:13 2016 +0200

    test

commit 11a68ba8e91e219ad1db9f7cc6bac3a203cdd60f
Author: Phillip Thelen <viirus@pherth.net>
Date:   Tue Jun 7 15:16:23 2016 +0200

    test different config

commit 9c96911dc31d1ba123481eb3d291aee274973474
Author: Phillip Thelen <viirus@pherth.net>
Date:   Tue Jun 7 14:52:33 2016 +0200

    fix config

commit 9f41579bd9289985fb98f1a46d0292f897b6b420
Author: Phillip Thelen <viirus@pherth.net>
Date:   Tue Jun 7 14:48:15 2016 +0200

    fix yaml
 2016-08-04 12:23:41 +02:00
Phillip Thelen
3e58f9de5d correctly set user agent 2016-08-04 12:15:00 +02:00
Phillip Thelen
aad16502fd fix buying gem quests 2016-08-04 12:14:50 +02:00
jjbillings
3896d73e43 Add guild search bar 2016-08-03 21:04:17 -04:00
Keith Holliday
729034ee24 Added fixes for task alarm manager tests 2016-08-03 12:19:17 -05:00
Phillip Thelen
f2a716edc5 update translations 2016-08-03 15:42:23 +02:00
Phillip Thelen
52624c7e7c Improvements to shops 2016-08-03 15:42:15 +02:00
Jack Billings
93f264f0b4 Merge pull request #2 from HabitRPG/develop 
Merge from main repo
 2016-08-02 18:23:35 -04:00
Negue
246926f23f fullprofile: show avatar / stats / attributes / equipment 2016-08-03 00:12:15 +02:00
Keith Holliday
6aa8da81a0 Removed strings left accidently by merge 2016-08-02 13:40:51 -05:00
Keith Holliday
4b27900d1d Fixed merge issue 2016-08-02 13:31:19 -05:00
Keith Holliday
4df8d3c615 Updated example to use habitica debug package 2016-08-02 13:31:19 -05:00
Keith Holliday
7302742862 Added google service json to travis 2016-08-02 13:31:19 -05:00
Keith Holliday
b77e825960 Removed extra logging code 2016-08-02 13:31:19 -05:00
Keith Holliday
634651690f Refactored HabiticaLocalNotifications to be an abstract class 2016-08-02 13:31:19 -05:00
Keith Holliday
5c8b1a676c Fixed merge error 2016-08-02 13:31:19 -05:00
Keith Holliday
27ad0a1ed6 Moved strings to contants file. Ensured constants will not be translated. 2016-08-02 13:31:19 -05:00