Commit Graph

719 Commits

Author SHA1 Message Date
Matteo Pagliazzi 4ce2dfd60d refactor(bs3): remove unused bootstrap-datepicker from bower 2014-02-05 20:23:10 +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 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 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 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 90ed3eb510 Merge pull request #2703 from deilann/abortquest
correcting quest abort message
2014-02-02 15:57:08 -08:00
Matteo Pagliazzi 07593dc122 refactor(bs3): port quests modals, fix restore modal and various bugs 2014-02-02 16:43:58 +01:00
Matteo Pagliazzi 571954b5cf refactor(bs3): misc fixes, port restore, delete and reset modals 2014-02-02 16:06:30 +01:00
Matteo Pagliazzi 317a148760 refactor(bs3): port newStuff and member modals, misc fixes 2014-02-02 15:55:01 +01:00
Matteo Pagliazzi 3e077fea6d refactor(bs3): port rebirth and reroll modals, misc fixes 2014-02-02 13:52:42 +01:00
Matteo Pagliazzi f31723b0ab refactor(bs3): sync with develop 2014-02-02 13:26:35 +01:00
Cole Gleason 61a4a90d2c Merge pull request #2610 from etryn/develop
Fixed unnecessary margin on button group buttons
2014-02-01 23:56:43 -08:00
Cole Gleason 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
deilann dc7a6175e3 correcting quest abort message 2014-02-01 19:05:25 -08:00
Matteo Pagliazzi 8b29eb530a refactor(bs3): port drops modals 2014-02-01 19:39:05 +01:00
Matteo Pagliazzi f6a8b9e4cb refactor(bs3): port some modals & css fixes 2014-02-01 19:19:48 +01:00
Marc-André Larivière 875698c111 Created new CSS entry for equipment-title and modified inventory.jade accordingly 2014-02-01 12:52:38 -05:00
Matteo Pagliazzi 4dcf74a38a refactor(bs3): port avatar level label 2014-02-01 17:18:37 +01:00
Matteo Pagliazzi af42ec263e refactor(bs3): port several modals & css fixes 2014-02-01 17:04:21 +01:00
Matteo Pagliazzi 0a047f5b2f Merge branch 'develop' into paglias/bs3 2014-02-01 16:47:32 +01:00
Matteo Pagliazzi ff49695635 refactor(bs3): misc fixes & port death modal 2014-02-01 16:46:48 +01:00
Sabe Jones 2d97577708 Textual tweaks for spellcasting
Makes the notification for casting a spell on the party consistent with the message generated in party chat.
2014-02-01 07:01:40 -06:00
Tyler Renelle 800231cf64 feat(quests): allow html in quest notes 2014-01-31 15:06:56 -07:00
Matteo Pagliazzi f4c30390f5 refactor(bs3): start porting app, general layout and filters 2014-01-31 21:18:44 +01:00
Matteo Pagliazzi 7354efc1d5 refactor(bs3): working register & prettier login modal 2014-01-29 21:28:11 +01:00
Matteo Pagliazzi 3f3869ea28 refactor(bs3): working login modals, had to readd bootstrap origin javascript plugins 2014-01-29 18:37:51 +01:00
Matteo Pagliazzi 4c9da6883f refactor(bs3): static pages
works everything exeception made for the login modal, it opens but since this directive has had a lot of changes in angular-ui-bootstrap it will require more work (like all modals), @lefnire
2014-01-29 18:26:58 +01:00
Matteo Pagliazzi f0ebd597b3 refactor(dependencies): update dependencies for bootstrap 3 upgrade @lefnire 2014-01-29 16:44:12 +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
Tyler Renelle a582a0546d feat(marketing): some frontpage updates, a screenshot, & "contact us"
button mods
2014-01-28 10:36:05 -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
Etryn 9fa8646768 Fixed unnecessary margin on button group buttons
Buttons in groups in bootstrap are styled to touch on inside edges to
appear joined, so should not have a 5 px margin between them.
2014-01-28 01:13:24 -08: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
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 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