Tyler Renelle
5b6c4427b5
fix(groups): send error if +1 errored
2014-01-30 21:11:11 -07:00
Tyler Renelle
aff885c05c
feat(habitBirthday): add habitrpg birthday event. includes cakes for all
...
pets, absurd party robes, npc swap, badge, etc. @lemoness
2014-01-30 19:20:07 -07:00
Tyler Renelle
8a42e0c392
chore(logging): no production logging (how did this commit get removed?)
2014-01-30 17:21:17 -07:00
Tyler Renelle
52df534196
chore(cluster): don't kill process until email sent
2014-01-30 17:18:48 -07:00
Tyler Renelle
4f02ccb3b0
chore(cluster): kill & respawn pids on cluster fail, using domain-middleware
2014-01-30 17:01:13 -07:00
Tyler Renelle
7c3d85dbbe
chore(cluster): try cluster again
2014-01-30 17:00:56 -07:00
Matteo Pagliazzi
c7c6181bbc
Merge branch 'develop' of https://github.com/HabitRPG/habitrpg into develop
2014-01-30 22:26:28 +01:00
Matteo Pagliazzi
76db2d49c2
18n(merge): merge @Sinza- pr, @lefnire now it is ready
2014-01-30 22:25:42 +01:00
Tyler Renelle
6f2f3dd71e
chore(newrelic): some newrelic code location experiments
2014-01-30 13:43:30 -07:00
Marcelo Sizer
44d9ea2a15
i18n(interpolation): Add string interpolation
2014-01-30 18:25:25 -02:00
Tyler Renelle
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
Tyler Renelle
85e2ce5c4a
chore(logging): don't log in production
2014-01-30 11:04:43 -07:00
Tyler Renelle
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
Tyler Renelle
5b06392879
chore(newrelic): add newrelic
2014-01-30 11:04:39 -07:00
Tyler Renelle
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
Matteo Pagliazzi
5f0cf6575c
fix(settings): remove unnecessary code
2014-01-30 18:44:53 +01:00
Matteo Pagliazzi
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
Tyler Renelle
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
Cole Gleason
a6d66f68ba
Merge remote-tracking branch 'upstream/sabe/attributes' into develop
2014-01-30 11:10:09 -06:00
Sabe Jones
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
Tyler Renelle
241d04140f
fix(spells): temp workaround for spell & task being undefined. #2649 #2640
2014-01-29 21:37:59 -07:00
Marcelo Sizer
aeb705b652
style(tavern): add space between 2 and gems
2014-01-29 17:38:32 -02:00
Matteo Pagliazzi
f03d7d7dde
fix(performance): cache spritesmith image, fix #2633
2014-01-29 15:44:05 +01:00
Matteo Pagliazzi
f2bb1fd26e
fix(readme): remove text about translations wip
2014-01-29 15:33:43 +01:00
Cole Gleason
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
Marcelo Sizer
cd4cb0a552
i18n(subscriber): replace subscriber hard-coded strings for env.t
2014-01-28 22:30:05 -02:00
Tyler Renelle
547d3a49e6
chore(modules): upgrade angular-ui-select2, attempted fix for #2571
2014-01-28 16:12:39 -08:00
Tyler Renelle
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
Cole Gleason
5d6cdcfa82
chore(changelog): change max commit message length back to 999 (sorry, @lefnire!
2014-01-28 16:37:19 -06:00
Cole Gleason
cfb776858b
Merge branch 'changelog' into develop
2014-01-28 16:32:48 -06:00
Cole Gleason
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
Tyler Renelle
ffe415e6f3
chore(bailey): add announcement re: STWC processing time
2014-01-28 12:44:19 -08:00
Tyler Renelle
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
Matteo Pagliazzi
9226b83d84
Merge pull request #2591 from Alys/patch-2
...
Market "Sell..." button: add spaces, remove bracket
2014-01-28 10:48:54 -08:00
Tyler Renelle
5028707c7b
feat(marketing): add video tuts on "learn more" page until we have some copy
2014-01-28 10:44:33 -08:00
Tyler Renelle
a582a0546d
feat(marketing): some frontpage updates, a screenshot, & "contact us"
...
button mods
2014-01-28 10:36:05 -08:00
Matteo Pagliazzi
abdbaa6fe3
Merge pull request #2583 from Sinza-/split-main-json
...
Split main.json
2014-01-28 10:25:31 -08:00
Matteo Pagliazzi
3785dad215
Merge pull request #2605 from Sinza-/split-fix
...
Remove duplicated 'none' and minor adjusts
2014-01-28 10:24:37 -08:00
Matteo Pagliazzi
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
Matteo Pagliazzi
14b01836c5
fix(merge)
2014-01-28 19:10:07 +01:00
Matteo Pagliazzi
6ac7f9e5c7
merge @speg pr
2014-01-28 19:08:35 +01:00
Tyler Renelle
66f95cdd4c
feat(premium): updates to group plans info page
2014-01-28 09:22:46 -08:00
Sabe Jones
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
Tyler Renelle
f7f4a0c166
feat(administrators): start adding features page for admin accounts
2014-01-27 18:24:24 -08:00
Tyler Renelle
0ddaae4d75
feat(homepage): start cleaning up homepage, add navbar for play button & upcoming links
2014-01-27 17:40:43 -08:00
Marcelo Sizer
f8bc2d7618
Remove duplicated 'none' and minor adjusts
2014-01-27 23:27:11 -02:00
Tyler Renelle
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
Tyler Renelle
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
Marcelo Sizer
aa6ee57ca7
Replace hard-coded strings for env.t on drops.jade file
2014-01-27 15:45:46 -02:00
Marcelo Sizer
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
