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
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
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
4dcf74a38a
refactor(bs3): port avatar level label
2014-02-01 17:18:37 +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
52f8f0d5b0
feat(winter): remove winter scrolls & snowballs
2014-02-01 07:43:25 -08: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
f4c30390f5
refactor(bs3): start porting app, general layout and filters
2014-01-31 21:18:44 +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
0764aa8c17
refactor(bs3): convert icons to new format
2014-01-31 19:47:48 +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
5f0cf6575c
fix(settings): remove unnecessary code
2014-01-30 18:44:53 +01: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
a6d66f68ba
Merge remote-tracking branch 'upstream/sabe/attributes' into develop
2014-01-30 11:10:09 -06:00
f6e12fa25e
fix(allocateNow): Send empty object to user.ops per @colegleason suggestion
...
Tested with both implemented allocation modes, looks good!
2014-01-30 07:55:27 -06:00
c93bc46908
refactor(bs3): use templates for modals
2014-01-29 22:18:13 +01:00
7354efc1d5
refactor(bs3): working register & prettier login modal
2014-01-29 21:28:11 +01:00
aeb705b652
style(tavern): add space between 2 and gems
2014-01-29 17:38:32 -02:00
3f3869ea28
refactor(bs3): working login modals, had to readd bootstrap origin javascript plugins
2014-01-29 18:37:51 +01:00
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
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
9226b83d84
Merge pull request #2591 from Alys/patch-2
...
Market "Sell..." button: add spaces, remove bracket
2014-01-28 10:48:54 -08:00
5028707c7b
feat(marketing): add video tuts on "learn more" page until we have some copy
2014-01-28 10:44:33 -08:00
a582a0546d
feat(marketing): some frontpage updates, a screenshot, & "contact us"
...
button mods
2014-01-28 10:36:05 -08:00
abdbaa6fe3
Merge pull request #2583 from Sinza-/split-main-json
...
Split main.json
2014-01-28 10:25:31 -08:00
3785dad215
Merge pull request #2605 from Sinza-/split-fix
...
Remove duplicated 'none' and minor adjusts
2014-01-28 10:24:37 -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
66f95cdd4c
feat(premium): updates to group plans info page
2014-01-28 09:22:46 -08:00
76a7ab5bcc
feat(attributes): Add backfill button in flat and classbased allocation modes
...
Partial implementation of a "distribute points now" button for backfilling accrued Attribute points. Works with flat and classbased allocation so far; taskbased will require much fancier handling.
2014-01-28 08:57:29 -06:00
Matteo Pagliazzi