b4cb3e4c78
Merge pull request #2439 from diablomarcus/potatoe-fix
...
Fixes feeding modal display text
2014-01-17 18:38:40 -08:00
7179a30827
Fixed broken test for display name
2014-01-17 19:16:40 -06:00
d6f8cf4a73
chore(changelog): remove Breaking Changes section, update Extended
2014-01-17 12:52:15 -06:00
3d8ca12601
chore(changelog): update CHANGELOG, Grunt changelog task
...
Added some types to search for in the Grunt task when executing the
extended version.
2014-01-17 12:25:36 -06:00
2cf60c25e5
Merge pull request #2424 from colegleason/changelog
...
chore(changelog): add commit-msg hook to verify commit messages
2014-01-17 10:00:08 -08:00
16c38634b6
Modifies pet name to be 'Desert Wolf' rather than 'Wolf-Desert'
2014-01-16 21:42:08 -06:00
dfdccfb458
generifies article for food when feeding to pet
2014-01-16 21:34:10 -06:00
c1fa5a79ab
Fix #2438
...
Bosses damage you for party members' misses, not your own undone Dailies, while you're in the Inn.
2014-01-16 21:09:15 -06:00
7e791158d4
Fixes misuse of food.key in modal display and instead uses the text value
2014-01-16 20:42:15 -06:00
29b1320f4a
chore(archived tests) Moving unused tests, casper stuff, and
...
api.mocha.coffee into archive directory. we could depend on git history,
but I want to keep them publicly visible to developers for now since
they may contain valuable test worth porting to our new
setup.
2014-01-16 16:32:53 -07:00
e6dc715de6
Merge pull request #2396 from aughr/andrew/consolidate_tests
...
Convert API tests to normal JS
2014-01-16 15:19:21 -08:00
90176444e9
feat(bailey) notif about STWC updates + scroll-purchase deadlines (@colegleason)
2014-01-16 12:47:55 -07:00
41233c7b16
feat(challenges) markdown in challenge-descriptions
2014-01-16 12:28:28 -07:00
564241cd38
chore(changelog): add git-changelog config and sample CHANGELOG.md
...
This is the setup for the Grunt task that generates a changelog. Note
that it currently generates the changelog for the range
changelog-start..HEAD where changelog-start is a tag. It will always use
the most recent tag it can find. We may want to change this
behavior. Also, the original repo has some bugs, so I'm using my fork
until he accepts my PRs.
Migration notes: To run: `grunt git_changelog`
2014-01-16 02:10:00 -06:00
1b170158ce
chore(changelog): add commit-msg hook to verify commit messages
...
This adds a Git commit-msg hook which runs after a commit message is
written. It verifies that is matches a certain spec as defined by the
AngularJS document here:
https://docs.google.com/document/d/1QrDFcIiPjSLDn3EL15IJygNPiHORgU1_OOAqWjiDU5Y/edit#
This will allow for autmoated generation of Changelog.md in the future.
Migration notes: Please run `ln -sf ../../validate-commit-msg.js
.git/hooks/commit-msg` to install the commit hook.
2014-01-16 01:01:00 -06:00
f94ea084d7
Update README to account for API tests in JS.
2014-01-15 21:34:36 -08:00
c9e3b37ff8
Rewrite API tests in normal JS.
2014-01-15 21:34:36 -08:00
689dddee7f
Actually wait for Selenium to start.
2014-01-15 21:34:20 -08:00
dc368bb652
Remove references to $rootScope.Shared & .Content in non-view code.
...
Instead, have them request services that return them so tests don’t need to prepare special state.
2014-01-15 21:33:58 -08:00
77801e458e
Change static module name to habitrpgStatic.
...
The way the tests are written now, the habitrpg module definition in static.js
was clobbering the one in app.js. In other words, most of the tests weren't
testing what they thought they were testing.
2014-01-15 21:33:57 -08:00
518f200a8f
fix( #2375 ) merge in @SabreCat's stats.jade changes "More elegant
...
show/hide setup for attribute bonuses"
2014-01-15 22:15:26 -07:00
86220f3e0e
Merge pull request #2319 from HabitRPG/sabe/preferences
...
Finish up @wc8 suggested user preferences: tags and Advanced Options
2014-01-15 21:04:05 -08:00
003e214080
#2384 add alert on paypal taking a long time to clear
2014-01-15 19:45:07 -07:00
b52ea3f495
Merge pull request #2403 from HabitRPG/sabe/fix
...
Misc UI fixes
2014-01-15 16:24:03 -08:00
cdcf130b6f
Merge pull request #2360 from colegleason/qr-code
...
Made QR code valid JSON. Fixes #2354
2014-01-15 15:45:24 -08:00
1a2db28648
Merge pull request #2395 from HabitRPG/sabe/tweak2
...
Tweak to boss victory text
2014-01-15 15:42:45 -08:00
0ce10ef339
Merge pull request #2352 from colegleason/quest-scroll
...
Allow users to purchase quest scrolls even if they haven't finished the previous quest
2014-01-15 15:39:59 -08:00
e66fdd80ef
feat(perfect-day achievement)
2014-01-15 16:24:23 -07:00
263a752abf
add mocha tests to travis, remove makefile
2014-01-15 20:11:29 +01:00
9db6dd9233
Merge pull request #2412 from Aiseant/patch-1
...
Update tavern.jade
2014-01-15 09:43:03 -08:00
2e12ffefc6
revert previous change
2014-01-15 16:56:40 +01:00
178086ef30
fix some translation strings
2014-01-15 16:54:37 +01:00
e9715f36b8
Update tavern.jade
...
Add infos about resting while on Boss quest
2014-01-15 11:37:02 +01:00
951872d116
Merge pull request #2406 from HabitRPG/sabe/tweak3
...
Create drop notification Growl style
2014-01-14 21:12:44 -08:00
6e821fa681
Create drop notification Growl style
2014-01-14 22:02:22 -06:00
5521dd0bb1
UI fixes: Firefox display and checkbox issues, task attributes appearing with auto-allocate off
2014-01-14 21:07:46 -06:00
6536b855c9
instead of clearing completed on cron, simply hide them from the angular
...
apps (which only use batch-update API route) @colegleason
2014-01-14 18:03:16 -07:00
128d68f544
show warning that completed to-dos are cleared after 3 days
2014-01-14 17:29:05 -07:00
506d22e935
add migration for tasks.created
2014-01-14 17:28:50 -07:00
b96ce1d07f
add created (creation-date) to TaskSchema
2014-01-14 16:46:16 -07:00
6b5366b246
Merge pull request #2364 from Sinza-/develop
...
Replace hard-coded strings for env.t on views/shared/profiles folder.
2014-01-14 11:21:31 -08:00
6cc7d73683
Replace old stats.jade file
2014-01-14 17:06:16 -02:00
1b1c646e24
Replace old code
2014-01-14 16:22:14 -02:00
e7307681d3
Replace old code
2014-01-14 16:19:37 -02:00
20277e623e
Add @paglias suggested fixes
2014-01-14 16:16:40 -02:00
f40b8c6e64
Fix indentation
2014-01-14 16:01:53 -02:00
556118c1f0
Add @paglias suggested fixes
2014-01-14 15:57:55 -02:00
4e2005732c
translate some views
2014-01-14 18:50:06 +01:00
9916665331
Merge branch 'develop' of https://github.com/HabitRPG/habitrpg into develop
2014-01-14 18:33:12 +01:00
6ca81f5b31
fix some translations in jade views @Sinza-
2014-01-14 18:32:40 +01:00
Cole Gleason