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
b89081dd41
refactor(bs3): misc fixes
2014-02-04 20:18:27 +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
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
Tyler Renelle
2e2fcfcf46
fix(swagger): fix jade script warning in swagger
2014-02-03 11:53:52 -07:00
Tyler Renelle
4d32092e8f
refactor(addthis): remove superfluous addthis inclusion
2014-02-03 11:53:32 -07: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
Matteo Pagliazzi
56133894d8
refactor(bs3): sync with develop
2014-02-03 18:45:25 +01:00
Tyler Renelle
f8796e9028
feat(winter): remove purchasable winter hair colors, keep available if
...
they purchased during event
2014-02-02 23:17:54 -07: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
Cole Gleason
f193790550
Merge pull request #2698 from deilann/fixstats
...
changing order of stats in character build
2014-02-02 15:58:54 -08:00
deilann
2e3ee3f97c
removes progress bar of unfeedable pets
2014-02-02 13:22:24 -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
dafd015173
wizard to mage in inventory
2014-02-01 15:20:02 -08:00
deilann
8843577858
show mage not wizard in inventory and member modal
2014-02-01 15:17:14 -08:00
deilann
d581986dd9
changing order of stats in character build
2014-02-01 13:14:51 -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
0afaa69d7d
Created new CSS entry for equipment title and modified inventory.jade accordingly
2014-02-01 13:17:21 -05: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
Tyler Renelle
52f8f0d5b0
feat(winter): remove winter scrolls & snowballs
2014-02-01 07:43:25 -08: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
Matteo Pagliazzi
f4c30390f5
refactor(bs3): start porting app, general layout and filters
2014-01-31 21:18:44 +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
Marc-André Larivière
2e64b03a63
Fixed inventory alignment. Issue #2158
2014-01-30 19:58:34 -05:00
Marc-André Larivière
49ec9d2e5c
Fixed inventory alignment. Issue #2158
2014-01-30 19:57:50 -05: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
5f0cf6575c
fix(settings): remove unnecessary code
2014-01-30 18:44:53 +01: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
Cole Gleason
a6d66f68ba
Merge remote-tracking branch 'upstream/sabe/attributes' into develop
2014-01-30 11:10:09 -06:00
Sabe Jones
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
Matteo Pagliazzi
c93bc46908
refactor(bs3): use templates for modals
2014-01-29 22:18:13 +01:00
Matteo Pagliazzi
7354efc1d5
refactor(bs3): working register & prettier login modal
2014-01-29 21:28:11 +01:00
Marcelo Sizer
aeb705b652
style(tavern): add space between 2 and gems
2014-01-29 17:38:32 -02: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
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
9226b83d84
Merge pull request #2591 from Alys/patch-2
...
Market "Sell..." button: add spaces, remove bracket
2014-01-28 10:48:54 -08:00
Tyler Renelle
5028707c7b
feat(marketing): add video tuts on "learn more" page until we have some copy
2014-01-28 10:44:33 -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
abdbaa6fe3
Merge pull request #2583 from Sinza-/split-main-json
...
Split main.json
2014-01-28 10:25:31 -08:00
Matteo Pagliazzi
3785dad215
Merge pull request #2605 from Sinza-/split-fix
...
Remove duplicated 'none' and minor adjusts
2014-01-28 10:24:37 -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
Tyler Renelle
66f95cdd4c
feat(premium): updates to group plans info page
2014-01-28 09:22:46 -08:00
Sabe Jones
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
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
Marcelo Sizer
f8bc2d7618
Remove duplicated 'none' and minor adjusts
2014-01-27 23:27:11 -02: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
Marcelo Sizer
aa6ee57ca7
Replace hard-coded strings for env.t on drops.jade file
2014-01-27 15:45:46 -02:00
Marcelo Sizer
06200accad
fix(translation): Fix #2585 .
...
Since it was working before the env.t replacement I put this as translation (and also because I didn't know what else to put =p).
2014-01-27 14:21:50 -02:00
Alice Harris
a0dad56a9b
Market "Sell..." button: add spaces, remove bracket
...
Fix some text appearance issues:
- Use item.text instead of item.key so that users see "Tiger Cub" rather than "TigerCub".
- Remove unwanted ) from end of gold value so that users see "3 Gold" instead of "3) Gold". Bracket had been left over from the end of the old env.t(...) function call - see 4f07ab39b0
2014-01-27 19:27:06 +10:00
Tyler Renelle
51bff23885
fix(stable): show hatchable combo when petOwned>0 (fyi @deilann)
2014-01-26 17:46:09 -08:00
Tyler Renelle
5caaff1cea
fix(beastmaster): fixes #2557 , adds opacity to previously-owned pets
...
after they're mounted. You can earn them back again
2014-01-26 17:24:48 -08:00
Tyler Renelle
47bcaf83e7
feat(homepage): use .marketing for centering, add playbutton as static
...
in footer. This is pretty
ugly (http://gyazo.com/215e20729569689ab48cf56c71c1fe28 ), let's iterate
/ prettify. @deilann
2014-01-26 14:22:01 -08:00
Tyler Renelle
286a69fd46
chore(bailey): udpated bailey for premium
2014-01-26 13:59:41 -08:00
Tyler Renelle
62af638e8a
Merge pull request #2570 from deilann/patch-1
...
removed stray paren in profile.jade
2014-01-26 12:41:06 -08:00
Tyler Renelle
4ca67bdee8
Merge pull request #2574 from deilann/copy-3
...
new landing copy
2014-01-26 12:37:49 -08:00
Marcelo Sizer
c09d89f872
Fix version conflict
2014-01-26 17:39:36 -02:00
Marcelo Sizer
8d41c44ad7
Fix version conflict
2014-01-26 17:37:54 -02:00
Marcelo Sizer
8f4016d669
Split main.json
2014-01-26 17:30:41 -02:00
Sabe Jones
bc1adeb127
fix(mounts): Move avatar upward when mounted regardless of pet
...
Step 1 toward fixing some of our mount sprite positioning issues. If the avatar always moves up when mounted, we gain substantial freedom to reposition the mount, especially on the vertical axis.
2014-01-26 11:02:59 -06:00
Matteo Pagliazzi
4274090205
fix(translations): fix #2564 and similar ones
2014-01-26 14:48:38 +01:00
deilann
b44f7088ad
new landing copy
2014-01-25 18:21:56 -08:00
deilann
2c0f5fc5d0
removed stray paren
...
Stray parentheses was cutting off destination for the string submitted upon changing names in profiles.
2014-01-25 13:17:01 -08:00
