416feca42e
chore(newrelic): use license key in accordance with https://docs.newrelic.com/docs/nodejs/nodejs-agent-on-heroku
2014-01-30 11:52:58 -07:00
85e2ce5c4a
chore(logging): don't log in production
2014-01-30 11:04:43 -07:00
2d4d103ca6
chore(bower): strange temporary fix. Can't remember where I picked this
...
up, but I was having issues deploying to prod with bower referencing a
private repo (using github oauth key, see private#premium)
2014-01-30 11:04:43 -07:00
5b06392879
chore(newrelic): add newrelic
2014-01-30 11:04:39 -07:00
3660f1a85c
feat(premium): backport server code for premium subs (it's just ccard
...
handling & uer model stuff)
2014-01-30 10:51:32 -07:00
5f0cf6575c
fix(settings): remove unnecessary code
2014-01-30 18:44:53 +01:00
e9fb7d0343
Merge pull request #2627 from Sinza-/subscriber
...
i18n(subscriber): replace subscriber hard-coded strings for env.t
2014-01-30 09:37:42 -08:00
53917bc9f0
chore(cluster): remove all cluster code, just in case
...
`require('cluster')` is flagging issues, even if not in use. Revert this
in the near future when we can peg VersionError. @colegleason
2014-01-30 10:19:04 -07:00
a6d66f68ba
Merge remote-tracking branch 'upstream/sabe/attributes' into develop
2014-01-30 11:10:09 -06:00
f6e12fa25e
fix(allocateNow): Send empty object to user.ops per @colegleason suggestion
...
Tested with both implemented allocation modes, looks good!
2014-01-30 07:55:27 -06:00
241d04140f
fix(spells): temp workaround for spell & task being undefined. #2649 #2640
2014-01-29 21:37:59 -07:00
aeb705b652
style(tavern): add space between 2 and gems
2014-01-29 17:38:32 -02:00
f03d7d7dde
fix(performance): cache spritesmith image, fix #2633
2014-01-29 15:44:05 +01:00
f2bb1fd26e
fix(readme): remove text about translations wip
2014-01-29 15:33:43 +01:00
2b17b041ca
Merge pull request #2533 from Sinza-/buy-quest
...
Add information to quests on the Market before you buy them
2014-01-28 18:49:29 -08:00
cd4cb0a552
i18n(subscriber): replace subscriber hard-coded strings for env.t
2014-01-28 22:30:05 -02:00
547d3a49e6
chore(modules): upgrade angular-ui-select2, attempted fix for #2571
2014-01-28 16:12:39 -08:00
f3bd7bcfc6
chore(modules): downgrade coffee-script to 1.6.x, 1.7.0 was breaking on us
2014-01-28 16:12:39 -08:00
5d6cdcfa82
chore(changelog): change max commit message length back to 999 (sorry, @lefnire!
2014-01-28 16:37:19 -06:00
cfb776858b
Merge branch 'changelog' into develop
2014-01-28 16:32:48 -06:00
c781f46d53
chore(changelog): add interface and i18n types, update tests
...
This adds extra types that Angular doesn't use. "interface" is for
frontend related changes etc. "i18n" means internationalization and
refers to translations, etc.
Fixes #2622 .
2014-01-28 16:30:59 -06:00
ffe415e6f3
chore(bailey): add announcement re: STWC processing time
2014-01-28 12:44:19 -08:00
a4524cdb9a
chore(bailey): add bailey for group plans + perfect day achiev. Keep
...
basic-plan announcement up for a bit longer
2014-01-28 12:27:30 -08:00
9226b83d84
Merge pull request #2591 from Alys/patch-2
...
Market "Sell..." button: add spaces, remove bracket
2014-01-28 10:48:54 -08:00
5028707c7b
feat(marketing): add video tuts on "learn more" page until we have some copy
2014-01-28 10:44:33 -08:00
a582a0546d
feat(marketing): some frontpage updates, a screenshot, & "contact us"
...
button mods
2014-01-28 10:36:05 -08:00
abdbaa6fe3
Merge pull request #2583 from Sinza-/split-main-json
...
Split main.json
2014-01-28 10:25:31 -08:00
3785dad215
Merge pull request #2605 from Sinza-/split-fix
...
Remove duplicated 'none' and minor adjusts
2014-01-28 10:24:37 -08:00
f15d825dc5
Merge pull request #2600 from Sinza-/envt-drops
...
Replace hard-coded strings for env.t on drops.jade file
2014-01-28 10:24:13 -08:00
14b01836c5
fix(merge)
2014-01-28 19:10:07 +01:00
6ac7f9e5c7
merge @speg pr
2014-01-28 19:08:35 +01:00
66f95cdd4c
feat(premium): updates to group plans info page
2014-01-28 09:22:46 -08:00
76a7ab5bcc
feat(attributes): Add backfill button in flat and classbased allocation modes
...
Partial implementation of a "distribute points now" button for backfilling accrued Attribute points. Works with flat and classbased allocation so far; taskbased will require much fancier handling.
2014-01-28 08:57:29 -06:00
f7f4a0c166
feat(administrators): start adding features page for admin accounts
2014-01-27 18:24:24 -08:00
0ddaae4d75
feat(homepage): start cleaning up homepage, add navbar for play button & upcoming links
2014-01-27 17:40:43 -08:00
f8bc2d7618
Remove duplicated 'none' and minor adjusts
2014-01-27 23:27:11 -02:00
2e18f0eb82
feat(premium): backport client-side premium code to public repo, it's
...
client-side anyway (@colegleason @paglias)
2014-01-27 16:34:22 -08:00
cc934b577e
chore(license): remove conflicting text ( fixes #2596 ), and simply reference the GPLv3 file by URL. Assets & content designed by BQ are CC-BY-SA, for HabitRPG are CC-BY-NC-SA
2014-01-27 15:42:42 -08:00
aa6ee57ca7
Replace hard-coded strings for env.t on drops.jade file
2014-01-27 15:45:46 -02:00
06200accad
fix(translation): Fix #2585 .
...
Since it was working before the env.t replacement I put this as translation (and also because I didn't know what else to put =p).
2014-01-27 14:21:50 -02:00
a0dad56a9b
Market "Sell..." button: add spaces, remove bracket
...
Fix some text appearance issues:
- Use item.text instead of item.key so that users see "Tiger Cub" rather than "TigerCub".
- Remove unwanted ) from end of gold value so that users see "3 Gold" instead of "3) Gold". Bracket had been left over from the end of the old env.t(...) function call - see https://github.com/HabitRPG/habitrpg/commit/4f07ab39b0868764c665bbf914474745e11ecc32
- Add spaces between words so that users see "Sell Fox for 3 Gold" instead of "SellFoxfor3Gold". There are other shorter/neater ways to insert those spaces, but making them really obvious with nbsp is probably the best way to ensure they don't get accidentally removed again.
2014-01-27 19:27:06 +10:00
51bff23885
fix(stable): show hatchable combo when petOwned>0 (fyi @deilann)
2014-01-26 17:46:09 -08:00
1d8539837c
Merge pull request #2576 from Sinza-/mult-sell-buttons
...
Fix multiple sell buttons appearing simultanously when clicking on food + egg or potion
2014-01-26 17:26:42 -08:00
5caaff1cea
fix(beastmaster): fixes #2557 , adds opacity to previously-owned pets
...
after they're mounted. You can earn them back again
2014-01-26 17:24:48 -08:00
47bcaf83e7
feat(homepage): use .marketing for centering, add playbutton as static
...
in footer. This is pretty
ugly (http://gyazo.com/215e20729569689ab48cf56c71c1fe28 ), let's iterate
/ prettify. @deilann
2014-01-26 14:22:01 -08:00
286a69fd46
chore(bailey): udpated bailey for premium
2014-01-26 13:59:41 -08:00
62af638e8a
Merge pull request #2570 from deilann/patch-1
...
removed stray paren in profile.jade
2014-01-26 12:41:06 -08:00
4ca67bdee8
Merge pull request #2574 from deilann/copy-3
...
new landing copy
2014-01-26 12:37:49 -08:00
c09d89f872
Fix version conflict
2014-01-26 17:39:36 -02:00
8d41c44ad7
Fix version conflict
2014-01-26 17:37:54 -02:00
Tyler Renelle