sudoxreboot/habitica
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica.git synced 2026-08-04 09:39:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
4216 commits 3 branches 0 tags 1.6 GiB
Commit graph

4216 commits

This branch
This branch
All branches
Author SHA1 Message Date
Luveluen
805299a34c Update profile.jade 2014-01-19 19:55:52 +01:00
Luveluen
b8e18594e9 Update index.jade 2014-01-19 19:50:26 +01:00
Luveluen
6dd0e48887 Update settings.jade 2014-01-19 18:56:39 +01:00
Luveluen
6f19cdaf6c Update profile.jade 2014-01-19 18:27:48 +01:00
Luveluen
47085de1e1 Update index.jade 2014-01-19 17:29:53 +01:00
Tyler Renelle
39f0961b75 chore(errors): send req.body before JSON.parsing @colegleason 2014-01-18 18:17:33 -07:00
Dušan Juretić
efdd85fe2e Using newUser helper in tests 2014-01-18 20:42:28 -03:00
Dušan Juretić
bca13b5557 First root controller test 2014-01-18 20:42:28 -03:00
Dušan Juretić
ba2fbceb46 Add Travis build status to readme 2014-01-18 19:44:50 -03:00
Tyler Renelle
a1df41ad81 fix(spells): <ESC> to cancel spell-casting 2014-01-18 14:15:45 -07:00
Tyler Renelle
7a479098dc fix(tests): don't use cluster in tests, else we get "connection refused" 2014-01-18 10:55:56 -07:00
Cole Gleason
0579c43248 fix(profile): fix bug where empty profile displayed on username click 
Due to #2396, Shared was undefined in one controller. There may be other
cases we should look out for.

Fixes #2465
 2014-01-18 01:38:09 -06:00
Tyler Renelle
ee6b18aea7 Merge pull request #2447 from colegleason/cluster 
perf(cluster): user NodeJS cluster module to use all CPU cores
 2014-01-17 22:44:43 -08:00
Cole Gleason
b4cb3e4c78 Merge pull request #2439 from diablomarcus/potatoe-fix 
Fixes feeding modal display text
 2014-01-17 18:38:40 -08:00
diablo
7179a30827 Fixed broken test for display name 2014-01-17 19:16:40 -06:00
Cole Gleason
d6f8cf4a73 chore(changelog): remove Breaking Changes section, update Extended 2014-01-17 12:52:15 -06:00
Cole Gleason
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
Cole Gleason
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
Cole Gleason
2e62cc675b perf(cluster): user NodeJS cluster module to use all CPU cores 
This makes the server.js file fork workers for the number of CPUs on the
system. Each worker will then bind to the MongoDB and Express
ports. They are really all using the same connection through the master
process, but this lets the logic happen in seperate threads. I do worry
that we may see more VersionErrors if one user makes more concurrent
API requests. That really isn't the fault of cluster though, as that
issue still would have been present in the previous single-core version.
 2014-01-17 01:55:10 -06:00
diablo
16c38634b6 Modifies pet name to be 'Desert Wolf' rather than 'Wolf-Desert' 2014-01-16 21:42:08 -06:00
diablo
dfdccfb458 generifies article for food when feeding to pet 2014-01-16 21:34:10 -06:00
Sabe Jones
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
diablo
7e791158d4 Fixes misuse of food.key in modal display and instead uses the text value 2014-01-16 20:42:15 -06:00
Tyler Renelle
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
Tyler Renelle
e6dc715de6 Merge pull request #2396 from aughr/andrew/consolidate_tests 
Convert API tests to normal JS
 2014-01-16 15:19:21 -08:00
Tyler Renelle
90176444e9 feat(bailey) notif about STWC updates + scroll-purchase deadlines (@colegleason) 2014-01-16 12:47:55 -07:00
Tyler Renelle
41233c7b16 feat(challenges) markdown in challenge-descriptions 2014-01-16 12:28:28 -07:00
Cole Gleason
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
Cole Gleason
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
Andrew Bloomgarden
f94ea084d7 Update README to account for API tests in JS. 2014-01-15 21:34:36 -08:00
Andrew Bloomgarden
c9e3b37ff8 Rewrite API tests in normal JS. 2014-01-15 21:34:36 -08:00
Andrew Bloomgarden
689dddee7f Actually wait for Selenium to start. 2014-01-15 21:34:20 -08:00
Andrew Bloomgarden
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
Andrew Bloomgarden
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
Tyler Renelle
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
Tyler Renelle
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
Tyler Renelle
003e214080 #2384 add alert on paypal taking a long time to clear 2014-01-15 19:45:07 -07:00
Tyler Renelle
b52ea3f495 Merge pull request #2403 from HabitRPG/sabe/fix 
Misc UI fixes
 2014-01-15 16:24:03 -08:00
Tyler Renelle
cdcf130b6f Merge pull request #2360 from colegleason/qr-code 
Made QR code valid JSON. Fixes #2354
 2014-01-15 15:45:24 -08:00
Tyler Renelle
1a2db28648 Merge pull request #2395 from HabitRPG/sabe/tweak2 
Tweak to boss victory text
 2014-01-15 15:42:45 -08:00
Tyler Renelle
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
Tyler Renelle
e66fdd80ef feat(perfect-day achievement) 2014-01-15 16:24:23 -07:00
Matteo Pagliazzi
263a752abf add mocha tests to travis, remove makefile 2014-01-15 20:11:29 +01:00
Tyler Renelle
9db6dd9233 Merge pull request #2412 from Aiseant/patch-1 
Update tavern.jade
 2014-01-15 09:43:03 -08:00
Matteo Pagliazzi
2e12ffefc6 revert previous change 2014-01-15 16:56:40 +01:00
Matteo Pagliazzi
178086ef30 fix some translation strings 2014-01-15 16:54:37 +01:00
Aiseant
e9715f36b8 Update tavern.jade 
Add infos about resting while on Boss quest
 2014-01-15 11:37:02 +01:00
Tyler Renelle
951872d116 Merge pull request #2406 from HabitRPG/sabe/tweak3 
Create drop notification Growl style
 2014-01-14 21:12:44 -08:00
Sabe Jones
6e821fa681 Create drop notification Growl style 2014-01-14 22:02:22 -06:00
Sabe Jones
5521dd0bb1 UI fixes: Firefox display and checkbox issues, task attributes appearing with auto-allocate off 2014-01-14 21:07:46 -06:00