3f4d266b00
refactor(bs3): sync with develop
2014-02-04 19:59:48 +01:00
1a652eefd6
pull correct information for member modal class
2014-02-03 12:42:09 -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
527f230ee5
Merge pull request #2701 from deilann/wizardtomage
...
Change "Wizard" to "Mage" in member modal & inventory
2014-02-01 16:21:32 -08:00
8843577858
show mage not wizard in inventory and member modal
2014-02-01 15:17:14 -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
af42ec263e
refactor(bs3): port several modals & css fixes
2014-02-01 17:04:21 +01:00
0a047f5b2f
Merge branch 'develop' into paglias/bs3
2014-02-01 16:47:32 +01:00
ff49695635
refactor(bs3): misc fixes & port death modal
2014-02-01 16:46:48 +01:00
a9d7add1e3
chore(bailey): baconsaur update
2014-01-31 22:03:52 -07:00
b29231056b
chore(bailey): vice notif
2014-01-31 15:36:47 -07:00
800231cf64
feat(quests): allow html in quest notes
2014-01-31 15:06:56 -07:00
49e1bf1ba4
refactor(bs3): fix
2014-01-31 22:05:09 +01:00
823296fc41
refactor(bs3): sync with develop
2014-01-31 21:56:39 +01:00
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
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
cc348b2f11
refactor(bs3): sync with develop & misc
2014-01-31 20:04:40 +01:00
0a0c6c73a5
chore(bailey): fix bailey notifs to say Jan 31 for cut off dates @lemoness
2014-01-30 21:34:06 -07:00
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
c7c6181bbc
Merge branch 'develop' of https://github.com/HabitRPG/habitrpg into develop
2014-01-30 22:26:28 +01:00
76db2d49c2
18n(merge): merge @Sinza- pr, @lefnire now it is ready
2014-01-30 22:25:42 +01:00
44d9ea2a15
i18n(interpolation): Add string interpolation
2014-01-30 18:25:25 -02:00
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
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
c93bc46908
refactor(bs3): use templates for modals
2014-01-29 22:18:13 +01:00
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
cd4cb0a552
i18n(subscriber): replace subscriber hard-coded strings for env.t
2014-01-28 22:30:05 -02:00
ffe415e6f3
chore(bailey): add announcement re: STWC processing time
2014-01-28 12:44:19 -08:00
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
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
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
aa6ee57ca7
Replace hard-coded strings for env.t on drops.jade file
2014-01-27 15:45:46 -02:00
286a69fd46
chore(bailey): udpated bailey for premium
2014-01-26 13:59:41 -08:00
1dc68112d1
fix(paypal): fixes #2492 , remove environment check for now, only have
...
production-mode option. revisit
2014-01-24 17:29:10 -08:00
5336134c7d
refactor(translations)
2014-01-24 22:49:36 +01:00
635451dc8c
Close quest modal after quest purchase
2014-01-23 16:11:40 -02:00
b2d5e2a090
Add popover quest description to quests in the Market and add buyQuest modal to show text and rewards before purchasing the quest
2014-01-23 15:53:42 -02:00
d3f4a561fd
docs(rebirth): Bullet point about repurchase of limited ed gear after Rebirth
...
Requires commit 667a426
2014-01-22 20:45:04 -06:00
c51c9ad03b
improve(translation): merge @Sinza- pr
2014-01-22 19:51:30 +01:00
ef97abf1bf
Fix diverging older version
2014-01-22 16:16:19 -02:00
bb13f37525
Fix identation
2014-01-22 16:07:04 -02:00
6ada7f300f
Replace hard-coded strings for env.t on views/shared/modals folder
2014-01-22 16:04:28 -02:00
5a03409e33
Revert "improve(translations): translated shared/modals/achievements"
...
This reverts commit 090c28a35b
2014-01-22 17:38:19 +01:00
eec6ead971
Revert "improve(translations): translate death modal"
...
This reverts commit 50333026b6
2014-01-22 17:34:54 +01:00
Matteo Pagliazzi