Commit Graph

420 Commits

Author SHA1 Message Date
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 3f4d266b00 refactor(bs3): sync with develop 2014-02-04 19:59:48 +01: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
Matteo Pagliazzi 56133894d8 refactor(bs3): sync with develop 2014-02-03 18:45:25 +01: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
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 211be37cfc refactor(bs3): fix classes modal 2014-02-02 13:42:29 +01:00
Matteo Pagliazzi f31723b0ab refactor(bs3): sync with develop 2014-02-02 13:26:35 +01:00
Tyler Renelle 527f230ee5 Merge pull request #2701 from deilann/wizardtomage
Change "Wizard" to "Mage" in member modal & inventory
2014-02-01 16:21:32 -08:00
deilann 8843577858 show mage not wizard in inventory and member modal 2014-02-01 15:17:14 -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
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
Tyler Renelle a9d7add1e3 chore(bailey): baconsaur update 2014-01-31 22:03:52 -07:00
Tyler Renelle b29231056b chore(bailey): vice notif 2014-01-31 15:36:47 -07:00
Tyler Renelle 800231cf64 feat(quests): allow html in quest notes 2014-01-31 15:06:56 -07:00
Matteo Pagliazzi 49e1bf1ba4 refactor(bs3): fix 2014-01-31 22:05:09 +01:00
Matteo Pagliazzi 823296fc41 refactor(bs3): sync with develop 2014-01-31 21:56:39 +01:00
Tyler Renelle 179316e10f feat(restore): add restore-gp back in. Parly to end the winter event,
partly due to the convo at #2681 regarding subscriptions. Fixes #2681
2014-01-31 12:54:37 -07:00
Tyler Renelle 4ba5a9cf26 refactor(restore): remove restore-gear commented-out code, that stuff is
incompatible with new gear setup (circa class system)
2014-01-31 12:50:13 -07:00
Matteo Pagliazzi cc348b2f11 refactor(bs3): sync with develop & misc 2014-01-31 20:04:40 +01:00
Matteo Pagliazzi 0764aa8c17 refactor(bs3): convert icons to new format 2014-01-31 19:47:48 +01:00
Tyler Renelle 0a0c6c73a5 chore(bailey): fix bailey notifs to say Jan 31 for cut off dates @lemoness 2014-01-30 21:34:06 -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
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
Marcelo Sizer 44d9ea2a15 i18n(interpolation): Add string interpolation 2014-01-30 18:25:25 -02: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 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
Matteo Pagliazzi c93bc46908 refactor(bs3): use templates for modals 2014-01-29 22:18:13 +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
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 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 abdbaa6fe3 Merge pull request #2583 from Sinza-/split-main-json
Split main.json
2014-01-28 10:25:31 -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