1cd5e994cc
Merge pull request #2491 from HabitRPG/sabe/tweak
...
fix(nodemon): ignore CHANGELOG.md on watch
2014-01-20 15:27:28 -08:00
6d0168364c
Revert "chore(errors): send req.body before JSON.parsing @colegleason"
...
This reverts commit 39f0961b75
2014-01-20 11:44:10 -06:00
52decb7ede
fix(translations): @lefnire now everything is ok
2014-01-20 17:51:43 +01:00
fba739535b
fix(translations): correct some variables
2014-01-20 17:25:14 +01:00
d000c70679
fix(translations): revert some views
2014-01-20 17:08:27 +01:00
f85117a422
Merge pull request #2486 from luveluen/develop
...
jade->json
2014-01-20 07:56:54 -08:00
ffff867ba3
Update stable.jade
2014-01-20 16:20:06 +01:00
462f11e48c
Update inventory.jade
2014-01-20 16:08:37 +01:00
c37512baa6
Update index.jade
2014-01-20 14:41:51 +01:00
d6c55952da
fix(nodemon): ignore CHANGELOG.md on watch
...
Because this started annoying the carp out of me once I linked @colegleason's commit-msg hook.
2014-01-19 21:59:35 -06:00
ad4ca6655a
feat(cheating) prevent +habit spamming with a 10s timer
2014-01-19 19:32:17 -08:00
9cdf6b5e34
chore(todos): add tests for 3-day todo archiving #2478
2014-01-19 17:39:50 -08:00
4cc39f16a1
fix(todos): add migration for dateCreated & dateCompleted #2478
2014-01-19 17:16:38 -08:00
b1afc177aa
fix(todos): add dateCompleted to todos so they're archived 3 days after
...
completion, not 3 days after creation. Fixes #2478
2014-01-19 17:12:33 -08:00
f4859daef1
Merge pull request #2488 from Rathlan/issue-2472-MakeHelpAvailable
...
Added FAQ and Tutorials links, linking the Vimeo Tutorial and Wiki FAQ
2014-01-19 15:03:49 -08:00
b0fc17bae5
chore(cluster): @colegleason I'm disabling cluster for now, people are
...
reporting more issues on develop (VersioError & 503) than before. Can
revert his commit in the near future, want to investigate a bit though
2014-01-19 14:52:57 -08:00
68041f206c
Update settings.jade
2014-01-19 22:02:55 +01:00
87d528ce50
Update profile.jade
...
fullname -> fullName
2014-01-19 21:46:57 +01:00
bfebb61520
Update profile.jade
2014-01-19 21:40:41 +01:00
66582b2d05
Added FAQ and Tutorials links, linking the Vimeo Tutorial and Wiki FAQ
2014-01-19 22:24:54 +02:00
46e29e8999
Update settings.jade
2014-01-19 21:16:52 +01:00
4e5323ea2f
Update settings.jade
2014-01-19 21:10:18 +01:00
b48c584f43
Update settings.jade
2014-01-19 21:05:41 +01:00
1f0d91e9c6
Update profile.jade
2014-01-19 21:04:03 +01:00
b9bafc304e
Update settings.jade
2014-01-19 21:03:01 +01:00
00cb57deb6
Update settings.jade
2014-01-19 21:00:11 +01:00
d87a3caae7
Update profile.jade
2014-01-19 20:50:31 +01:00
f748d89fdc
Update profile.jade
2014-01-19 20:11:03 +01:00
e8647c7cbc
Update profile.jade
2014-01-19 20:05:48 +01:00
745fdeb34f
Update profile.jade
2014-01-19 19:59:35 +01:00
21de0b7e74
Update settings.jade
2014-01-19 19:58:04 +01:00
805299a34c
Update profile.jade
2014-01-19 19:55:52 +01:00
b8e18594e9
Update index.jade
2014-01-19 19:50:26 +01:00
6dd0e48887
Update settings.jade
2014-01-19 18:56:39 +01:00
6f19cdaf6c
Update profile.jade
2014-01-19 18:27:48 +01:00
47085de1e1
Update index.jade
2014-01-19 17:29:53 +01:00
39f0961b75
chore(errors): send req.body before JSON.parsing @colegleason
2014-01-18 18:17:33 -07:00
efdd85fe2e
Using newUser helper in tests
2014-01-18 20:42:28 -03:00
bca13b5557
First root controller test
2014-01-18 20:42:28 -03:00
a1df41ad81
fix(spells): <ESC> to cancel spell-casting
2014-01-18 14:15:45 -07:00
7a479098dc
fix(tests): don't use cluster in tests, else we get "connection refused"
2014-01-18 10:55:56 -07:00
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
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
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
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
16c38634b6
Modifies pet name to be 'Desert Wolf' rather than 'Wolf-Desert'
2014-01-16 21:42:08 -06:00
Tyler Renelle