krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-15 21:57:22 +01:00
Code Issues Packages Projects Releases Wiki Activity
11,628 Commits 62 Branches 1,225 Tags
4d415ee9c1e295cb6493c63d6ac6e3d404e13e4b
Commit Graph

11628 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Blade Barringer
4d415ee9c1 chore(i18n): update locales 2015-11-17 21:54:30 -06:00
Blade Barringer
fba35ea491 chore(i18n): update locales 2015-11-17 21:48:55 -06:00
Blade Barringer
6bd0ed76cc Fixes #6524. Correct spelling of community 2015-11-17 21:41:06 -06:00
Blade Barringer
71473a93ad chore(i18n): update locales 2015-11-17 21:38:32 -06:00
Blade Barringer
c452cf9f99 Adjust styling of noscript block 2015-11-17 21:35:07 -06:00
Blade Barringer
1299afcb01 Merge branch 'develop' into gauthamchandra-feature/warning-for-disabled-js 2015-11-17 21:28:22 -06:00
Blade Barringer
5b7c02334a Adjust sm modal to not attach objects on rootScope 2015-11-17 21:23:20 -06:00
Gautham Chandra
37e08e8d5d Converted noscript text into translatable strings 2015-11-17 22:22:55 -05:00
Blade Barringer
b280267cde Expand object to make it more readable. 2015-11-17 21:10:29 -06:00
Sabe Jones
f5f33bd1b9 fix(modals): SM modal fixes 
Fixes #6253, allows quest pets to appear in hatching and raising modals, and makes code for deciding whether or not to show a generic levelup modal a bit more readable per comments on #6042.
 2015-11-17 16:56:11 -05:00
Blade Barringer
8b7f50bfcf Adjust memory leak message to be meaningful. 
Got this message in the heroku logs:
2015-11-17T04:28:18.549451+00:00 app[web.1]:  '[Memory Leak] Memory=' + parseFloat(memory).toFixed(3) + ' Time=' + moment()

Converted the line into a variable and threw that instead.
 2015-11-16 22:34:06 -06:00
Sabe Jones
29c4e21b67 Merge pull request #6250 from HabitRPG/sabrecat/costume-awards 
Costume Contest awards 2015
 2015-11-16 17:08:26 -06:00
Sabe Jones
c352a30d4e chore(news): Bailey 2015-11-16 
Also sprite recompile to incorporate sticker promo image.
 2015-11-16 17:26:44 -05:00
Sabe Jones
2d1ad12cbd fix(strings): Make plural more greppable 2015-11-16 17:08:38 -05:00
Sabe Jones
16878af76f fix(string): Contest to Contestant 2015-11-16 16:17:48 -05:00
Sabe Jones
e73c7be47a fix(achievement): Make Costume Contest repeatable 2015-11-16 16:07:16 -05:00
Sabe Jones
bf0f3634d1 chore(contest): Award Costume achievements 2015-11-16 15:24:08 -05:00
Blade Barringer
2b8cf178b0 Merge pull request #6244 from crookedneighbor/modularize-content 
Modularize content
 2015-11-16 12:40:46 -06:00
Blade Barringer
8f9224c2ae Adjust error handling for test task. 2015-11-16 12:23:09 -06:00
Blade Barringer
7a865b5c2a Correct test output agregator 2015-11-16 12:04:09 -06:00
Gautham Chandra
41e6abfc83 Fixed capitalization 2015-11-15 16:58:19 -05:00
Gautham Chandra
8df005d29e Added noscript content for the landing page 2015-11-15 16:42:48 -05:00
Gautham Chandra
b5e10bf1e9 Added a helpful message for when JS is disabled 2015-11-15 14:12:12 -05:00
Blade Barringer
d1c1940bde Merge pull request #6243 from crookedneighbor/lint 
Lint  Common Files
 2015-11-15 12:36:36 -06:00
Blade Barringer
ea87910c2f Correct test path 2015-11-15 12:34:40 -06:00
Blade Barringer
2a7dfe09a0 Move user can own quest categories constant to constants module. 2015-11-15 12:27:16 -06:00
Blade Barringer
40cee42e03 Remove unneeded return statement 2015-11-15 11:04:17 -06:00
Blade Barringer
6ec864ea4e Remove unused src files in content directory 2015-11-15 11:03:30 -06:00
Blade Barringer
1a31c26330 Add item list to common constants module 2015-11-15 11:03:17 -06:00
Blade Barringer
f7c88478bc Explicitly bump ampitude version 2015-11-15 10:48:46 -06:00
Blade Barringer
ea14326025 Adjust faq test 2015-11-15 10:18:10 -06:00
Blade Barringer
411946e487 Modularize mystery sets 2015-11-15 10:08:40 -06:00
Blade Barringer
600f3e4554 Extract classes, events and gearTypes into constants file. 2015-11-15 09:47:06 -06:00
Blade Barringer
b13b2d0f62 Remove coffee content index file 2015-11-15 09:28:26 -06:00
Blade Barringer
a127bb8711 Switch to babel-core form babel. 
Babel includes the CLI, which we don't need.
 2015-11-15 08:59:57 -06:00
Blade Barringer
9ee56a5622 Remove rule 2015-11-15 08:52:29 -06:00
Blade Barringer
01946b64e6 Remove coffeescript from dependencies. 2015-11-15 08:29:54 -06:00
Blade Barringer
2e16bade2b Add lint task to test command. 2015-11-15 08:28:16 -06:00
Blade Barringer
037337d54f Remove extraneous anonymous function. 2015-11-15 08:24:42 -06:00
Blade Barringer
5be9b88cc6 Add babel compiler to mocha.opts 2015-11-15 08:24:19 -06:00
Blade Barringer
da881153b9 Convert coffee tests to js 2015-11-15 08:19:41 -06:00
Blade Barringer
e5d99ce271 Convert common files to es2015. 2015-11-15 08:16:55 -06:00
Blade Barringer
ddeb0e7b23 Add babel register in the server file 2015-11-15 08:16:11 -06:00
Blade Barringer
6f11054994 Add trailing comma 2015-11-15 08:10:54 -06:00
Blade Barringer
6c5afb9369 Downgrade to babelify v6. (v7 uses babel v6) 2015-11-15 08:10:07 -06:00
Blade Barringer
351172d178 Correct common test command to compile with babel. 2015-11-14 21:52:59 -06:00
Blade Barringer
4a38c36cce Register babel in gruntfile 2015-11-14 21:51:02 -06:00
Blade Barringer
c829eb21ed Removed unused mocha.opts 2015-11-14 21:50:47 -06:00
Blade Barringer
bc90893284 Correct test to declare variable 2015-11-14 21:45:20 -06:00
Blade Barringer
ff929b669d Convert common tests to js 2015-11-14 21:44:10 -06:00