685b7a3cd2
Merge branch 'develop' into paglias/bs3
2014-02-04 20:16:00 +01:00
07a47d353d
Merge pull request #2666 from marcgenesis/develop
...
Fixed inventory alignment. Issue #2158
2014-02-04 11:00:52 -08: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
4c094ebf47
Merge pull request #2729 from deilann/fixclass
...
pull correct information for member modal class
2014-02-03 12:45:56 -08:00
1a652eefd6
pull correct information for member modal class
2014-02-03 12:42:09 -08:00
2e2fcfcf46
fix(swagger): fix jade script warning in swagger
2014-02-03 11:53:52 -07:00
4d32092e8f
refactor(addthis): remove superfluous addthis inclusion
2014-02-03 11:53:32 -07:00
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
43d05a54a3
refactor(footer): ensure debug buttons only show in development
2014-02-03 11:42:23 -07:00
535fd4fe82
refactor(footer): remove amazon affiliate code
2014-02-03 11:41:47 -07:00
cdc13d2ffb
refactor(bs3): misc
2014-02-03 19:24:37 +01:00
f95dac7d1d
chore(analytics): upgrade GA to universal analytics (cc @deilann)
2014-02-03 11:06:10 -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
f8796e9028
feat(winter): remove purchasable winter hair colors, keep available if
...
they purchased during event
2014-02-02 23:17:54 -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
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
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
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
f193790550
Merge pull request #2698 from deilann/fixstats
...
changing order of stats in character build
2014-02-02 15:58:54 -08:00
aa53b38a9e
Merge pull request #2714 from deilann/petprogress
...
removes progress bar of unfeedable pets
2014-02-02 15:57:44 -08:00
90ed3eb510
Merge pull request #2703 from deilann/abortquest
...
correcting quest abort message
2014-02-02 15:57:08 -08:00
2e3ee3f97c
removes progress bar of unfeedable pets
2014-02-02 13:22:24 -08:00
07593dc122
refactor(bs3): port quests modals, fix restore modal and various bugs
2014-02-02 16:43:58 +01:00
571954b5cf
refactor(bs3): misc fixes, port restore, delete and reset modals
2014-02-02 16:06:30 +01:00
317a148760
refactor(bs3): port newStuff and member modals, misc fixes
2014-02-02 15:55:01 +01:00
3e077fea6d
refactor(bs3): port rebirth and reroll modals, misc fixes
2014-02-02 13:52:42 +01:00
211be37cfc
refactor(bs3): fix classes modal
2014-02-02 13:42:29 +01:00
f31723b0ab
refactor(bs3): sync with develop
2014-02-02 13:26:35 +01:00
61a4a90d2c
Merge pull request #2610 from etryn/develop
...
Fixed unnecessary margin on button group buttons
2014-02-01 23:56:43 -08:00
dab9ddbda2
fix(quests): quests with a level cap cannot be bought before that level.
...
Users were buying the vice quest hoping to play it, not realizing it
would drop at that level. Let's restrict buying the quest (at least in
the short term) until you reach that level.
Fixes #2707 .
2014-02-02 01:54:23 -06:00
dc7a6175e3
correcting quest abort message
2014-02-01 19:05:25 -08:00
b01d08ccfe
Merge pull request #2693 from colegleason/csv
...
Set filename when exporting challenge to CSV
2014-02-01 17:10:09 -08:00
527f230ee5
Merge pull request #2701 from deilann/wizardtomage
...
Change "Wizard" to "Mage" in member modal & inventory
2014-02-01 16:21:32 -08:00
78315d828b
feat(quests): add flags.levelDrops for dropping items at certain levels
2014-02-01 16:15:20 -08:00
dafd015173
wizard to mage in inventory
2014-02-01 15:20:02 -08:00
8843577858
show mage not wizard in inventory and member modal
2014-02-01 15:17:14 -08:00
d581986dd9
changing order of stats in character build
2014-02-01 13:14:51 -08:00
8b29eb530a
refactor(bs3): port drops modals
2014-02-01 19:39:05 +01:00
f6a8b9e4cb
refactor(bs3): port some modals & css fixes
2014-02-01 19:19:48 +01:00
0afaa69d7d
Created new CSS entry for equipment title and modified inventory.jade accordingly
2014-02-01 13:17:21 -05: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
875698c111
Created new CSS entry for equipment-title and modified inventory.jade accordingly
2014-02-01 12:52:38 -05:00
Matteo Pagliazzi