 Anil Anar
|
e269e04172
|
fix a minor syntax error when opening reroll modal.
|
2015-10-22 09:24:04 +02:00 |
|
|
Blade Barringer
|
c3aa70ecc3
|
Moved guild update tests from legacy file to new file
|
2015-10-21 18:02:02 -05:00 |
|
|
Blade Barringer
|
f4256f7bf6
|
Adjust context description
|
2015-10-21 17:59:44 -05:00 |
|
|
Sabe Jones
|
9fb671f068
|
fix(social): Better share image
|
2015-10-21 16:25:03 -05:00 |
|
|
Sabe Jones
|
a2c0e02283
|
fix(social): Correct OG tag errors
|
2015-10-21 16:37:33 -04:00 |
|
|
Sabe Jones
|
d32f6f23cc
|
feat(sharing): Improved front page FB share
|
2015-10-21 15:59:17 -04:00 |
|
|
Sabe Jones
|
44818882f6
|
feat(sharing): Pretty Tweet button for level up
|
2015-10-21 15:23:31 -04:00 |
|
|
Matteo Pagliazzi
|
e75d3547c5
|
force emails to lowercase and use a lowercase version of username to check for duplicates
|
2015-10-21 13:14:18 +02:00 |
|
|
Matteo Pagliazzi
|
fc9d0775ab
|
add migration for lowercase version of emails and username
|
2015-10-21 11:19:14 +02:00 |
|
|
Matteo Pagliazzi
|
c7f8426bce
|
preparation for code for lowercase emails and lowercase version of username to check for duplicates
|
2015-10-21 11:01:06 +02:00 |
|
|
Alys
|
2745a172ea
|
Merge pull request #6076 from claushellsing/patch-2
Update README.md
|
2015-10-21 15:37:04 +10:00 |
|
|
Rainer Eli
|
32cb29b45f
|
Update README.md
|
2015-10-20 22:48:58 -06:00 |
|
|
Blade Barringer
|
b52f901f41
|
Convert legacy api helper to js
|
2015-10-20 21:53:52 -05:00 |
|
|
Blade Barringer
|
3036c6db9e
|
Merge branch 'develop' into new_api_test_infrastructure
|
2015-10-20 21:18:49 -05:00 |
|
|
Blade Barringer
|
a0e7eef956
|
Fix legacy tests
|
2015-10-20 20:17:10 -05:00 |
|
|
Sabe Jones
|
d4146d69e2
|
Merge pull request #6072 from HabitRPG/sabrecat/pets-201510
Pet Quest for October 2015
|
2015-10-20 18:12:19 -05:00 |
|
|
Sabe Jones
|
5fbd6814b0
|
fix(pets): Realign frog sprites
Also adds a note about the To-Do sorting fix to the Bailey announcement
|
2015-10-20 18:55:57 -04:00 |
|
|
Blade Barringer
|
23398b1a37
|
Closes #6071
|
2015-10-20 12:39:04 -05:00 |
|
|
Sabe Jones
|
1ad6ffd35d
|
Merge branch 'develop' into sabrecat/more-modals
|
2015-10-20 12:50:34 -04:00 |
|
|
Sabe Jones
|
d0a34fc0ad
|
feat(quests): 2015-10 Pet
Also adds Exhaust Strike-specific text to the remaining affected NPCs.
|
2015-10-20 12:32:45 -04:00 |
|
|
Saravanan Ganesh
|
df7fd2e036
|
fix(chat): #5864 API should return flagged messages in chat only to mods
|
2015-10-19 21:43:24 -07:00 |
|
|
Sabe Jones
|
0a6d9fa23a
|
WIP(pets): Frog quest
|
2015-10-19 23:12:24 -04:00 |
|
|
Blade Barringer
|
703caeadff
|
Merge pull request #6038 from vIiRuS/patch-5
store iOS tutorial steps
|
2015-10-19 17:49:13 -05:00 |
|
|
Blade Barringer
|
a0753d31b2
|
Merge pull request #6046 from vIiRuS/newIAPs
Handle new possible iOS in-app-purchases
|
2015-10-19 17:49:01 -05:00 |
|
|
Amin Arria
|
23114ac929
|
Fix trailing comma
|
2015-10-19 17:19:30 -04:30 |
|
|
Matteo Pagliazzi
|
ad6be153f4
|
Revert "use lowercase only emails - register phase"
This reverts commit 69fdff615a.
|
2015-10-19 19:42:25 +02:00 |
|
|
Matteo Pagliazzi
|
7a2d2fd3dc
|
Revert 215ca0371c
|
2015-10-19 19:42:13 +02:00 |
|
|
Amin Arria
|
3bd809f7c2
|
Merge branch 'develop' of github.com:HabitRPG/habitrpg into Wrong-max-level-messages
|
2015-10-19 12:14:38 -04:30 |
|
|
Amin Arria
|
038039dbee
|
Fixes #5550, change message according to rebirthLevel
|
2015-10-19 12:10:27 -04:30 |
|
|
Blade Barringer
|
2883dc6c85
|
Merge branch 'ksami-develop' into develop
|
2015-10-19 08:14:48 -05:00 |
|
|
Blade Barringer
|
9ad1dbd8ce
|
Adjust mystic hourglass string to take in interpolation
|
2015-10-19 08:10:37 -05:00 |
|
|
Blade Barringer
|
d9de32f2dc
|
Add todo to investigate magic numbers
|
2015-10-19 08:04:47 -05:00 |
|
|
Blade Barringer
|
1a2510e4da
|
Adjsut string to take in interpolation
|
2015-10-19 08:03:27 -05:00 |
|
|
Blade Barringer
|
931d688637
|
Use Content service
|
2015-10-19 08:03:14 -05:00 |
|
|
Blade Barringer
|
f03be07595
|
Add extra line breaks
|
2015-10-19 08:02:35 -05:00 |
|
|
Blade Barringer
|
4a3e60d0d7
|
Merge branch 'develop' into ksami-develop
|
2015-10-19 06:26:34 -05:00 |
|
|
Phillip Thelen
|
2fde3c771f
|
remove empty line
|
2015-10-19 12:50:30 +02:00 |
|
|
Phillip Thelen
|
3a42711427
|
nicer style for default gem value
|
2015-10-19 12:48:50 +02:00 |
|
|
Ricardo Mendes
|
6e68450309
|
Tweaks tests to account for autoEquip user preference.
|
2015-10-19 08:26:15 +00:00 |
|
|
Ricardo Mendes
|
5e3f46d786
|
Checks user auto-equip preference in buy function
|
2015-10-19 05:52:46 +00:00 |
|
|
Ricardo Mendes
|
73924df241
|
Adds auto-equip UI to equipment view
|
2015-10-19 05:20:11 +00:00 |
|
|
Ricardo Mendes
|
e79863e134
|
Adds auto-equip boolean to user preferences
|
2015-10-19 05:20:10 +00:00 |
|
|
Ricardo Mendes
|
860abce1d7
|
Adds auto-equip string to locales/en
|
2015-10-19 05:20:10 +00:00 |
|
|
Blade Barringer
|
fcec018616
|
Merge pull request #6009 from locks/patch-2
Typo in test description string
|
2015-10-18 21:35:51 -05:00 |
|
|
Blade Barringer
|
dbc9c5a48c
|
Merge pull request #6008 from locks/patch-1
Typo in comment string
|
2015-10-18 15:29:29 -05:00 |
|
|
Phillip Thelen
|
7a7d038602
|
Split up tutorial parts
|
2015-10-18 17:29:06 +02:00 |
|
|
Blade Barringer
|
1417d643e4
|
Comment out content test until we know for sure what we're doing with the content files
|
2015-10-18 10:14:54 -05:00 |
|
|
Blade Barringer
|
b2350f10f1
|
Create get groups test
|
2015-10-18 10:01:55 -05:00 |
|
|
Blade Barringer
|
cd224ac8d8
|
Add members attribute to tavern
|
2015-10-18 09:59:39 -05:00 |
|
|
Blade Barringer
|
63b17f0173
|
Create method to reset habitica db
|
2015-10-18 08:47:14 -05:00 |
|