91390138bb
Make reward price required
2015-06-06 23:17:10 -05:00
41d0f505f3
Simplify datepicker
2015-06-06 22:34:02 -05:00
c9639cdd30
Merge pull request #5355 from gisikw/gulpify-test-suite
...
Gulpify test suite
2015-06-06 22:08:54 -05:00
211424c4a3
Merge pull request #1 from crookedneighbor/blade-5355-gulpify-test-suite
...
For #5355 - gulpify test suite
2015-06-06 20:54:17 -04:00
047902ac62
Use input type date for datepicker
2015-06-06 17:55:36 -05:00
bf48671c7a
Add validation to everyX
2015-06-06 17:55:21 -05:00
ed421ebcc5
Set npm test to call gulp test
2015-06-06 12:15:17 -05:00
a1cce24010
Make test groups depend on specific test:prepare tasks
2015-06-06 12:14:28 -05:00
ff39773aa4
Drop Mongo DB using mongoose, rather than CLI. Show output for e2e specs
2015-06-06 11:25:26 -04:00
ff017be664
Remove Grunt from karma test chain
2015-06-06 10:48:38 -04:00
f613a5e5a7
Refactored Gulp tasks to exist within a tasks folder
2015-06-06 10:16:26 -04:00
6a397a8be5
First pass at Gulpifying the test suite.
2015-06-06 08:27:15 -04:00
dccbcb46d0
Fixed member error and fixed inconsistency in party query tests
2015-06-05 20:27:00 -05:00
58a816d584
Server-side mixpanel should only load in a production env
2015-06-05 20:54:47 -04:00
1743899dd4
adjust login code for ultimateGearSets migration script
2015-06-06 09:15:54 +10:00
ae1d10ed30
Merge branch 'blade-Finish_weeklies_pr' into refactor-tasks-jade
2015-06-05 17:37:46 -05:00
164a26616e
Merge branch 'develop' into blade-Finish_weeklies_pr
2015-06-05 17:35:16 -05:00
488919d5ce
fixes to ultimateGearSets migration script - NOT FULLY TESTED YET
2015-06-06 08:03:33 +10:00
a35fa6850c
changed ultimateGearSets migration script to require only one run for all classes - NOT TESTED YET
2015-06-06 07:34:47 +10:00
cfa6efce85
Merge pull request #5351 from HabitRPG/armoire
...
Enchanted Armoire
2015-06-05 11:58:59 -07:00
e8c131cde8
Add rudimentary test for migration script
2015-06-05 13:12:38 -05:00
f4a4dbdfd8
fix(tests): Armoire probabilities
...
Updates the random number generation for Armoire tests to match the new 60/40 distribution.
2015-06-05 10:34:25 -05:00
804cced3ff
chore(various): News and sprites
...
Also tweaks the drop probability of equipment from 70% to 60%.
2015-06-05 10:22:22 -05:00
8f744b043a
Add gear owned to spec helper
2015-06-05 08:59:45 -05:00
16f0ece2f8
Removed ! from 'env.t' that don't have html characters
2015-06-05 09:44:19 -04:00
d415e9b014
Slightly modified habitHelp3
2015-06-05 09:35:01 -04:00
d26e4780fd
Added links to multiple task help phrases
2015-06-05 09:26:33 -04:00
dc9bb35244
Add ng-form
2015-06-05 07:40:48 -05:00
403075262d
Remove bindonce symbol from ng-repeat
2015-06-05 07:26:03 -05:00
099e0abeed
Restore restore streaks functionality
2015-06-05 07:20:59 -05:00
701fa2455f
Refactor task views
2015-06-04 21:37:01 -05:00
b132b3c4fa
Make advanced options a button
2015-06-04 17:48:59 -05:00
60ecdb2dca
Removed colons from JSON and 'formatting-help' class to 'slight-vertical-padding'
2015-06-04 17:48:31 -04:00
95bb5be22a
Merge branch 'develop' into armoire
...
Conflicts:
common/dist/sprites/habitrpg-shared.css
common/dist/sprites/spritesmith0.css
common/dist/sprites/spritesmith0.png
common/dist/sprites/spritesmith1.css
common/dist/sprites/spritesmith1.png
common/dist/sprites/spritesmith2.css
common/dist/sprites/spritesmith2.png
common/dist/sprites/spritesmith3.css
common/dist/sprites/spritesmith3.png
common/dist/sprites/spritesmith4.css
common/dist/sprites/spritesmith4.png
common/dist/sprites/spritesmith5.css
common/dist/sprites/spritesmith5.png
common/dist/sprites/spritesmith6.css
common/dist/sprites/spritesmith6.png
2015-06-04 15:49:06 -05:00
20859b83ef
feat(Armoire): Improved counter
...
The popover counter of remaining Equipment in the Armoire now counts down immediately instead of requiring a browser refresh. A modal announces when the last item has been found. Also includes several fixes to the Ultimate Gear migration.
2015-06-04 15:45:55 -05:00
90015134da
Fixed 'group.leader.profile.name' issue and changed all instances of 'group.leader' to 'group.leader._id'
2015-06-04 15:18:09 -04:00
db38663f94
Merge branch 'develop' into blade-Finish_weeklies_pr
2015-06-04 12:45:23 -05:00
c39ad2a2ae
Merge pull request #5344 from SabreCat/develop
...
June BGs
2015-06-04 09:55:29 -07:00
6074774e14
feat(backgrounds): June BGs
2015-06-04 11:30:25 -05:00
c8f4e6209a
Merge pull request #5343 from HabitRPG/sabrecat/mounts
...
Readjusted lion
2015-06-04 09:24:21 -07:00
4f6f0220ad
fix(mounts): Readjusted lion
2015-06-04 11:02:58 -05:00
865f7651a9
Merge branch 'TheHollidayInn-invite-friends-in-header' into develop
2015-06-04 08:54:04 -05:00
7a1c5835d0
Final adjustments to PR #5114
...
* Added test for header ctrl
* Made openModal function more readable
* Only show setting to disable invite friends if party is exactly 1 member big
* Use party.memberCount instead of party.members.length because it's more expressive
2015-06-04 08:48:05 -05:00
076f7f0db9
Create translatable strings for dailies
2015-06-03 21:48:38 -05:00
705e0dce71
Calculate days since task start with start of day
2015-06-04 08:25:06 -05:00
2234c7219e
Moved invite friends button to under the subscribe button
2015-06-03 20:33:39 -05:00
09d32390f9
feat(Armoire): Item counter
...
Implements a counter for how many pieces of equipment remain to be found in the Armoire, including tests for same.
2015-06-03 16:48:11 -05:00
97ae243c40
fix(Armoire): Fixes
...
Armoire items are now breakable on character death, and can be purchased back directly from Rewards after death or Rebirth. Corrected string token on Costume area. Images show up correctly on Armoire drop notifications.
2015-06-03 12:50:57 -05:00
af3ee8cfcd
feat(Armoire): Updates from feedback
...
Adds images to Armoire drop notifications, refreshes the Rewards column when the Armoire is enabled, adds Armoire items to Costume customization, and introduces a migration for granting the new style Ultimate Gear achievement to those who have already earned it.
2015-06-03 11:58:30 -05:00
7adde1d1dd
Merge branch 'develop' into blade-Finish_weeklies_pr
2015-06-03 07:41:09 -05:00
Blade Barringer