ce82be637d
feat(groups): add group chat notifications
2014-02-12 21:21:30 -07:00
fef858d555
refactor(caching): cache emojis and remove gemoji from bower
2014-02-12 15:21:40 +01:00
fb496de42f
refactor(caching): only 1 css file, use grunt-contrib-cssmin to rewrite urls
2014-02-12 14:34:50 +01:00
aaa230790b
Merge branch 'develop' of https://github.com/HabitRPG/habitrpg into develop
2014-02-12 10:49:30 +01:00
094a4be001
fix(i18n): do not save user language for now
2014-02-12 10:49:10 +01:00
72b6c9bc91
feat(event-tracking): track registration count
2014-02-11 17:53:12 -07:00
9217b5174a
feat(event-tracking): pass ga to server user.ops
2014-02-11 17:49:19 -07:00
19139f562b
fix(misc): isStaticPage and debug buttons
2014-02-11 18:44:22 +01:00
cb079977e6
feat(marketing): start fleshing out the about page with images, content,
...
etc. Create separate videos page
2014-02-11 00:51:29 -07:00
42766125d5
fix(pets): add questPets to UserSchema.items.mounts too fixes #2814
2014-02-10 19:51:53 -07:00
0c99976bf5
fix(event-tracking): stripe sub, not pp
2014-02-10 18:54:29 -07:00
d89fb17b03
feat(event-tracking): track ecommerce events
2014-02-10 14:14:45 -07:00
f7b4a04a59
feat(event-tracking): add server-side GA tracking for ecommerce events
2014-02-10 11:35:33 -07:00
322b257b72
Separated stable into dropped pets, quest pets, and rare pets, and made countPets only count the former. Made countMounts only count dropped and quest-hatched mounts, not rare mounts.
2014-02-08 16:57:28 -08:00
c8639c178d
Merge branch 'develop' of https://github.com/HabitRPG/habitrpg into develop
2014-02-08 15:31:43 +01:00
313ec3d869
Merge branch 'develop' into bs3
...
Conflicts:
views/options/social/tavern.jade
2014-02-07 23:41:14 -07:00
8d03cfc6b5
Made incorrect username and password show the same error, for security purposes.
2014-02-07 21:08:13 -08:00
3473b73452
chore(Merge): branch 'develop' into bs3
...
Conflicts:
views/options/inventory/inventory.jade
2014-02-07 17:42:12 -07:00
00c8a7f757
chore(cluster): max 2-core
2014-02-07 14:18:04 -07:00
e404f35705
Revert "chore(cluster): temporarily disable cluster (revert here)"
...
This reverts commit e36d3264be
2014-02-07 14:17:48 -07:00
2807b3f87d
chore(logging): remove console.log
2014-02-07 21:08:46 +01:00
00af5f7d02
feat(bug-crushing): add the critical hammer of bug-crushing
2014-02-07 11:41:50 -07:00
e24d7476e8
refactor(errors): remove more res.json(500) in favor of next(err)
2014-02-07 09:20:40 -07:00
ce8351d622
chore(Merge): branch 'develop' into origin-paglias-bs3
...
Conflicts:
views/options/social/tavern.jade
2014-02-07 00:03:33 -07:00
e36d3264be
chore(cluster): temporarily disable cluster (revert here)
2014-02-06 20:12:52 -07:00
f7ded9d690
chore(logging): remove console.log(isStaticPage)
2014-02-06 13:28:19 -07:00
2837edd51f
chore(cluster): use domain-middleware properly, so domains are used to restart cluster workers
2014-02-06 10:58:47 -07:00
e4bd817443
refactor(bs3): sync with develop
2014-02-06 17:36:33 +01:00
90e9a1aeaa
i18n(refactor): load all files in a locale, not the ones defined in app.json, move env.t client code to own file, add env.isStaticPage (from isFrontPage)
2014-02-06 17:17:21 +01:00
b6edc28b14
refactor(bs3): merge develop
2014-02-06 16:19:51 +01:00
e268839bcb
chore(throttling): lower api limit a tad, just to test
2014-02-05 21:33:24 -07:00
0c21f54c67
fix(user): make sure next is passed to all routes, and is available in
...
err-back of batch updates
2014-02-05 21:28:46 -07:00
4c3c4b2ae7
perf(user): save user.save till very end of ops queue
2014-02-05 21:22:25 -07:00
bf5e9016a4
fix(errors): return next(err) when experiencing errors, instead of res.json(500,{err:err}). Let the top-level error handler handle this (needed for upcoming versionerror discarding)
2014-02-05 17:28:59 -07:00
3f4d266b00
refactor(bs3): sync with develop
2014-02-04 19:59:48 +01:00
9b3814575e
perf(hall): use $gt in contributors.level index instead of $ne:null for
...
better performance
2014-02-04 09:49:49 -07:00
2786b36206
fix(mongoose): typo
2014-02-03 18:14:17 -07:00
6a86da316b
chore(mongoose): set some options per #2725 to address high number of open connections, replset connection timeout, and close mongoose connection on process death
2014-02-03 17:57:38 -07:00
56133894d8
refactor(bs3): sync with develop
2014-02-03 18:45:25 +01:00
e3b5a3978a
chore(logging): change disconnect message level from error to info
2014-02-03 01:25:54 -06:00
ac5ef440fe
chore(merge): Merge remote-tracking branch 'colegleason/disconnect' into develop
...
Conflicts:
src/utils.js
2014-02-02 23:42:59 -07:00
83b3739f46
fix(winston): typo
2014-02-02 23:26:57 -07:00
e966cc956a
chore(logging): only log to console and file on dev (cc @lefnire)
2014-02-03 00:14:31 -06:00
dfa27b3fa2
Merge pull request #2685 from colegleason/logging
...
chore(logging): add Winston and replace console.log
2014-02-02 22:06:35 -08:00
85eb0aa38a
chore(cluster): disconnect worker on error, then kill after 30 sec
...
(cc @lefnire): This disconnects the process, sets up a kill timer, and
then sends error emails and responses back to the client. This should
stop new clients from connecting to the dead worker, allow connections
already established to finish, and cause the master to fork a new worker
to pick up the slack immediately.
2014-02-03 00:00:58 -06:00
f31723b0ab
refactor(bs3): sync with develop
2014-02-02 13:26:35 +01:00
b01d08ccfe
Merge pull request #2693 from colegleason/csv
...
Set filename when exporting challenge to CSV
2014-02-01 17:10:09 -08:00
78315d828b
feat(quests): add flags.levelDrops for dropping items at certain levels
2014-02-01 16:15:20 -08:00
36f21196f4
fix(challenges): challenge csv export now has proper filename
...
This sets the Content-disposition filename for the Challenge CSV export
to be {challenge_id}.csv.
Fixes #2689 .
2014-02-01 12:14:24 -06:00
0a047f5b2f
Merge branch 'develop' into paglias/bs3
2014-02-01 16:47:32 +01:00
Tyler Renelle