Commit graph

94 commits

Author SHA1 Message Date
Phillip Thelen
fe24613568 debounce task creation
this should prevent the issue that some users had, where tasks were created multiple times
2017-04-03 13:29:22 +02:00
Phillip Thelen
844b909d74 Change task lists to use SwipeRefreshLayout 2017-04-03 13:18:39 +02:00
Phillip Thelen
d17411495d Implement bottom navigation bar 2017-04-02 23:59:22 +02:00
Negue
c4de096a00 Show More-Button / Leave in ChallengeDetails Activity / refactoring 2017-01-04 20:18:50 +01:00
Daniel Gomez Rico
8e82a86de9 Update search menu icon order to last
- It is a little weird that the icon at the left opens a drawer at the right.
2016-10-20 12:52:32 -05:00
jjbillings
e9b15f089f Change chat message menu icon colors 2016-08-29 19:26:27 -05:00
Phillip Thelen
51ce4ec529 allow users to send messages from inbox 2016-08-19 18:54:11 +02:00
Phillip Thelen
43a63794bc Merge pull request #591 from jjbillings/guild-search-bar
Guild Search Bar - Issue #513
2016-08-16 18:20:46 +02:00
jjbillings
5abcc1bb7d Move guild search bar to toolbar 2016-08-14 14:11:07 -05:00
Negue
98d13ca147 use APIHelper in ContentCache, get language from user.preferences, use common card-styles, 2016-08-12 22:17:02 +02: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
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
Negue
246926f23f fullprofile: show avatar / stats / attributes / equipment 2016-08-03 00:12:15 +02:00
Phillip Thelen
5491898b4a hide menu items to leave groups 2016-05-24 16:49:50 +02:00
Phillip Thelen
d64f150bdc allow party editing and leaving 2016-04-26 16:49:56 +02:00
Phillip Thelen
af7da65c0d fix feedback on joining/leaving guild. Fixes #511 2016-04-26 16:49:56 +02:00
Phillip Thelen
9ec7e7453a fix popups 2016-04-26 16:49:56 +02:00
Phillip Thelen
25ab28a5c2 Begin implementing party invitations 2016-04-26 16:49:56 +02:00
Phillip Thelen
ae0ff33e41 Add more guild functionality 2016-03-05 14:54:19 +01:00
Michal
c005c64f39 Move activities to /ui/activities package 2015-12-21 20:19:51 +01:00
Negue
2afbbd9b1c [#86] remove unused drawables / animations / layout / styles 2015-12-12 19:54:25 +01:00
Phillip Thelen
f63cd745ea fix login 2015-12-09 00:43:30 +01:00
Phillip Thelen
c64a6c6a10 Change task form handling. Fixes #141 2015-12-09 00:22:27 +01:00
Phillip Thelen
ff5c1ece48 better display for rewards 2015-12-02 18:46:27 +01:00
Phillip Thelen
02c2123088 Rotate refresh icon when refreshing. Fixes #65 2015-11-25 14:04:24 +01:00
Phillip Thelen
2dddc93c39 correct events for fragments 2015-11-19 21:38:21 +01:00
Phillip Thelen
aa79010ea0 begin reworking activities into fragments 2015-11-19 16:50:03 +01:00
negue
07ebfcb46d Merge pull request #52 from HabitRPG/refresh-button
Add refresh button rather than three dots icon
2015-11-14 00:49:44 +01:00
Franze Jr
4a58e05f5d Add refresh button rather than three dots icon 2015-11-13 19:27:15 -03:00
Phillip Thelen
97554d5cfd Redesign login screen 2015-11-09 18:48:01 +01:00
Phillip Thelen
a92afe58f0 fix compatability warnings 2015-08-31 12:56:00 +02:00
Negue
5665dd2fdb Merge branch 'develop' of https://github.com/HabitRPG/habitrpg-android into develop
Conflicts:
	Habitica/src/com/habitrpg/android/habitica/MainActivity.java
	Habitica/src/com/habitrpg/android/habitica/ui/adapter/HabitItemRecyclerViewAdapter.java
2015-08-30 20:04:12 +02:00
Negue
4f44bd44b5 List Tavern Messages, Send / Delete them, Toggle Sleep 2015-08-30 19:56:46 +02:00
Phillip Thelen
89ba8cb351 Add refresh option to main activity 2015-08-26 20:02:01 +02:00
Phillip Thelen
c8d2483dbc Fix form rendering 2015-08-26 20:01:52 +02:00
Phillip Thelen
73f8c596d3 Start building new form for tasks 2015-08-03 15:55:17 +02:00
Negue
ee48c6adfa initialize fabric / send events from viewAdapter / change AddTaskDialog to use taskId / change menu background color 2015-07-11 20:49:09 +02:00
Phillip Thelen
a7e78dbd68 Remove old code 2015-06-29 17:53:22 +02:00
Phillip Thelen
ef177cef0f Start using material design viewpager 2015-06-29 16:04:03 +02:00
Negue
80e48529bd toggle sleep / load user in the new activity 2015-06-28 19:02:28 +02:00
Negue
aacceab336 Add AboutLibraries & Paperboy 2015-06-27 20:18:25 +02:00
Negue
33240311e8 add new MainActivityNew with viewpager, recyclerview and drawer 2015-06-20 20:46:04 +02:00
Negue
33239d8d24 Rename to Habitica - Part 1 (Folder/ SubModule) 2015-05-27 18:02:13 +02:00