Negue
|
582107c2c7
|
use the user_id as primary key for foreign tables / add user_id to task / tag
|
2015-11-16 22:40:03 +01:00 |
|
Phillip Thelen
|
b39a223c05
|
Basic sidebar header
|
2015-11-16 22:22:04 +01:00 |
|
Phillip Thelen
|
a98977849d
|
fix potential crash for levelup dialog
|
2015-11-16 20:02:55 +01:00 |
|
Negue
|
d42c178ece
|
update changelog
|
2015-11-15 20:32:41 +01:00 |
|
Negue
|
7a50974e25
|
fixes [#11] hide completed tasks / refactor filter in HabitItemRecyclerViewAdapter
|
2015-11-15 20:16:13 +01:00 |
|
Negue
|
dc6ca83da7
|
rename BuyRewardCommand - add potion to rewards - reposition the reward texts
|
2015-11-15 19:48:06 +01:00 |
|
Negue
|
718052da6b
|
redesign chat item - fixes #34 / show the toggle sleep button before chat messages loaded
|
2015-11-15 19:30:30 +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 |
|
Negue
|
32309f887f
|
add .idea to ignore
|
2015-11-15 18:44:06 +01:00 |
|
Negue
|
58691c268b
|
remove the old iml
|
2015-11-15 18:37:44 +01:00 |
|
Negue
|
497fda42f1
|
delete iml files
|
2015-11-15 18:30:47 +01:00 |
|
Negue
|
3c7542d168
|
ignore iml files
|
2015-11-15 18:26:47 +01:00 |
|
negue
|
1bd3c16e59
|
Merge pull request #55 from HabitRPG/levelup-screen
Display levelup popup
|
2015-11-15 18:16:48 +01:00 |
|
Phillip Thelen
|
6468d20bc1
|
Store suppressed modals in database
|
2015-11-15 17:46:45 +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
|
e181c51fdc
|
Merge branch 'rewards-design' into develop
# Conflicts:
# Habitica/Habitica.iml
# Habitica/build.gradle
|
2015-11-15 15:20:39 +01:00 |
|
Phillip Thelen
|
e2204dff0f
|
Fix healer image in header
|
2015-11-15 14:45:15 +01:00 |
|
Phillip Thelen
|
4e99dc5db4
|
different display style for drop snackbars
|
2015-11-15 14:45:07 +01:00 |
|
Phillip Thelen
|
243cfcc4dc
|
Display snackbar on drop
|
2015-11-14 19:35:14 +01:00 |
|
Phillip Thelen
|
a61f53caf5
|
correctly display dailies as due
|
2015-11-14 19:02:20 +01:00 |
|
Phillip Thelen
|
3aa5ec4608
|
Add basic facebook login
|
2015-11-14 15:59:44 +01:00 |
|
Franze Jr
|
6090995d28
|
[#36] Small refactorign proposed by @negue
|
2015-11-14 10:06:22 -03: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
|
29a8d965a9
|
[#36] Decrease padding between gold image and price
|
2015-11-13 20:29:57 -03:00 |
|
Franze Jr
|
eae09bb222
|
[#36] Add margin bottom in goldprice layout and decrease space between gold image and price
|
2015-11-13 20:02:00 -03:00 |
|
Franze Jr
|
4a58e05f5d
|
Add refresh button rather than three dots icon
|
2015-11-13 19:27:15 -03:00 |
|
Franze Jr
|
c84e6f2fa2
|
[#36] Price gold centered and samll refactorings
|
2015-11-13 18:47:24 -03:00 |
|
Franze Jr
|
005a2ac66c
|
[#36] Add validation for no custom image
|
2015-11-11 18:25:37 -03:00 |
|
Franze Jr
|
689d6476de
|
[#36] Add Padding between gold and price
|
2015-11-10 20:16:02 -03:00 |
|
Franze Jr
|
c29e72b481
|
[#36] Add images in dialog
|
2015-11-10 20:06:05 -03:00 |
|
Franze Jr
|
36e6c42890
|
[#36] First version - Using MaterialDialogs
|
2015-11-10 18:01:34 -03:00 |
|
Negue
|
a18715350f
|
Version 0.0.8
|
2015-11-09 20:48:06 +01:00 |
|
Negue
|
c0ebaa9972
|
Merge branch 'TaskListDesign' into develop
|
2015-11-09 20:35:14 +01:00 |
|
Negue
|
ba1a408c6a
|
Merge branch 'develop' into TaskListDesign
Conflicts:
Habitica/Habitica.iml
Habitica/res/values/dimens.xml
|
2015-11-09 20:34:22 +01:00 |
|
Negue
|
10ac099585
|
prepare changelog for 0.0.8
|
2015-11-09 20:08:45 +01:00 |
|
Phillip Thelen
|
4dc0fcbb13
|
correct class colors
|
2015-11-09 18:59:42 +01:00 |
|
Phillip Thelen
|
97554d5cfd
|
Redesign login screen
|
2015-11-09 18:48:01 +01:00 |
|
Phillip Thelen
|
18a808adc9
|
Merge pull request #45 from HabitRPG/party-design
Party design
|
2015-11-09 14:10:23 +01:00 |
|
Phillip Thelen
|
5662979a27
|
Merge pull request #47 from HabitRPG/tasks-disappear-on-rotate
Fixes #12 - tasks disappear when rotating device
|
2015-11-09 10:30:29 +01:00 |
|
Franze Jr
|
eb578ec581
|
[#12] - Save fragment instance for TaskRecyclerViewFragment
|
2015-11-08 17:58:57 -03:00 |
|
Franze Jr
|
5af3f04d4d
|
Remove unnecesary interface modifiers and redundant local variables
|
2015-11-08 16:04:31 -03:00 |
|
Franze Jr
|
60d90993e3
|
Remove unused imports, format code
|
2015-11-08 15:45:05 -03:00 |
|
Phillip Thelen
|
0cff8749d9
|
Merge pull request #41 from HabitRPG/offline-warning
Offline warning
|
2015-11-08 11:58:20 +01:00 |
|
Franze Jr
|
86edf6b4e4
|
[#35] - Create databinding and logic for party members
|
2015-11-07 20:29:34 -03:00 |
|
Negue
|
7cdc085524
|
Version 0.0.7
|
2015-11-08 00:01:14 +01:00 |
|
Negue
|
e19e0fba5d
|
Saving hair to database - fixes #17
|
2015-11-07 23:42:37 +01:00 |
|
Negue
|
8380158cea
|
some minor fixes
|
2015-11-07 23:40:48 +01:00 |
|
Negue
|
0e8a15b9a8
|
fix loading the gems / crash on load
|
2015-11-07 23:40:17 +01:00 |
|
Negue
|
2e0dc44756
|
Log Rest-Requests only in DEBUG Builds
|
2015-11-07 21:54:41 +01:00 |
|