Matteo Pagliazzi
e4bd817443
refactor(bs3): sync with develop
2014-02-06 17:36:33 +01:00
Matteo Pagliazzi
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
Matteo Pagliazzi
01c4c4498a
Merge pull request #2762 from Sinza-/develop
...
Replace hard-coded strings for window.env.t on js files
2014-02-06 16:36:31 +01:00
Matteo Pagliazzi
b6edc28b14
refactor(bs3): merge develop
2014-02-06 16:19:51 +01:00
Tyler Renelle
e268839bcb
chore(throttling): lower api limit a tad, just to test
2014-02-05 21:33:24 -07:00
Tyler Renelle
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
Tyler Renelle
4c3c4b2ae7
perf(user): save user.save till very end of ops queue
2014-02-05 21:22:25 -07:00
Tyler Renelle
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
Marcelo Sizer
386d108c3c
Replace hard-coded strings for window.env.t on js files
2014-02-05 20:43:49 -02:00
deilann
908a5a2408
updating tavern link to new issue ticket
...
Explains how Github works. Should reduce number of dupe tickets.
2014-02-05 13:07:56 -08:00
Matteo Pagliazzi
4ce2dfd60d
refactor(bs3): remove unused bootstrap-datepicker from bower
2014-02-05 20:23:10 +01:00
Matteo Pagliazzi
3d1ee31856
refactor(bs3): remove unused bootstrap-datepicker from bower
2014-02-05 20:19:09 +01:00
Matteo Pagliazzi
5b9bbb9729
refactor(bs3): settings
2014-02-05 19:54:50 +01:00
Matteo Pagliazzi
0cc31465ed
refactor(bs3): challenges
2014-02-05 19:39:26 +01:00
Matteo Pagliazzi
5d4d82ad51
refactor(bs3): port options (profile, inventory, social (groups and hall)) and misc
2014-02-05 19:05:42 +01:00
Matteo Pagliazzi
ce5edbee58
refactor(bs3): consistent style for modals
2014-02-05 16:51:35 +01:00
Matteo Pagliazzi
055fa82428
Merge branch 'develop' into paglias/bs3
2014-02-05 15:44:58 +01:00
Sabe Jones
3fda08c366
fix(nodemon): Add another ignore for weirdsauce Windoze dev environments
2014-02-04 22:39:08 -06:00
Matteo Pagliazzi
ccc1230828
refactor(bs3): misc
2014-02-04 22:21:12 +01:00
Matteo Pagliazzi
d711d61a1f
refactor(bs3): re-enable two columns views for tablets
2014-02-04 21:54:19 +01:00
Matteo Pagliazzi
c663221229
refactor(bs3): misc fixes, use bootstrap own grid for tasks lists
2014-02-04 21:27:05 +01:00
Matteo Pagliazzi
379da41982
refactor(bs3): port notifications
2014-02-04 20:53:09 +01:00
Matteo Pagliazzi
b89081dd41
refactor(bs3): misc fixes
2014-02-04 20:18:27 +01:00
Matteo Pagliazzi
685b7a3cd2
Merge branch 'develop' into paglias/bs3
2014-02-04 20:16:00 +01:00
Tyler Renelle
07a47d353d
Merge pull request #2666 from marcgenesis/develop
...
Fixed inventory alignment. Issue #2158
2014-02-04 11:00:52 -08:00
Matteo Pagliazzi
3f4d266b00
refactor(bs3): sync with develop
2014-02-04 19:59:48 +01:00
Tyler Renelle
9b3814575e
perf(hall): use $gt in contributors.level index instead of $ne:null for
...
better performance
2014-02-04 09:49:49 -07:00
Tyler Renelle
2786b36206
fix(mongoose): typo
2014-02-03 18:14:17 -07:00
Tyler Renelle
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
Tyler Renelle
4c094ebf47
Merge pull request #2729 from deilann/fixclass
...
pull correct information for member modal class
2014-02-03 12:45:56 -08:00
deilann
1a652eefd6
pull correct information for member modal class
2014-02-03 12:42:09 -08:00
Tyler Renelle
2e2fcfcf46
fix(swagger): fix jade script warning in swagger
2014-02-03 11:53:52 -07:00
Tyler Renelle
4d32092e8f
refactor(addthis): remove superfluous addthis inclusion
2014-02-03 11:53:32 -07:00
Tyler Renelle
67ee011aa3
fix(footer): ensure window.env is accessible from static pages, so we
...
can get deferred scripts on frontpage (esp google analytics)
2014-02-03 11:43:03 -07:00
Tyler Renelle
43d05a54a3
refactor(footer): ensure debug buttons only show in development
2014-02-03 11:42:23 -07:00
Tyler Renelle
535fd4fe82
refactor(footer): remove amazon affiliate code
2014-02-03 11:41:47 -07:00
Matteo Pagliazzi
cdc13d2ffb
refactor(bs3): misc
2014-02-03 19:24:37 +01:00
Tyler Renelle
f95dac7d1d
chore(analytics): upgrade GA to universal analytics (cc @deilann)
2014-02-03 11:06:10 -07:00
Matteo Pagliazzi
56133894d8
refactor(bs3): sync with develop
2014-02-03 18:45:25 +01:00
Cole Gleason
e3b5a3978a
chore(logging): change disconnect message level from error to info
2014-02-03 01:25:54 -06:00
Tyler Renelle
ac5ef440fe
chore(merge): Merge remote-tracking branch 'colegleason/disconnect' into develop
...
Conflicts:
src/utils.js
2014-02-02 23:42:59 -07:00
Tyler Renelle
83b3739f46
fix(winston): typo
2014-02-02 23:26:57 -07:00
Tyler Renelle
f8796e9028
feat(winter): remove purchasable winter hair colors, keep available if
...
they purchased during event
2014-02-02 23:17:54 -07:00
Cole Gleason
e966cc956a
chore(logging): only log to console and file on dev (cc @lefnire)
2014-02-03 00:14:31 -06:00
Tyler Renelle
dfa27b3fa2
Merge pull request #2685 from colegleason/logging
...
chore(logging): add Winston and replace console.log
2014-02-02 22:06:35 -08:00
Cole Gleason
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
Cole Gleason
8eaa5f6e9f
Merge pull request #2717 from lorian/mouseover-tags
...
Hovering over a task's tag icon displays a list of that task's tag
2014-02-02 19:54:23 -08:00
Sabe Jones
4f911a68d8
fix(buffs): Move help bubble to left of special buffs
...
Corrects an issue where the popover text for Stealth and Chilling Frost inherited the "strong" formatting of the buff name label, and improves visual consistency with the attribute readout above them.
2014-02-02 21:19:01 -06:00
Lorian
e99118b6a7
Edited appliedTags call to actually call the correct function; now hovering over a task's tag icon displays a list of that task's tags.
2014-02-02 16:35:36 -08:00
Cole Gleason
f193790550
Merge pull request #2698 from deilann/fixstats
...
changing order of stats in character build
2014-02-02 15:58:54 -08:00
