Matteo Pagliazzi
d70b6fca17
Merge pull request #2875 from thepeopleseason/challenges_spacing_fix
...
Challenges spacing fix
2014-02-21 19:35:19 +01:00
Tyler Renelle
c13b18030b
fix(rewards): hide special event spells section if empty, fixes #2909
2014-02-20 17:52:46 -08:00
James Hsiao
9fe8da3c12
fix space issues: contrib modal, challenge list
2014-02-20 20:33:10 -05:00
Tyler Renelle
02c283b628
chore(Merge): remote-tracking branch 'marcgenesis/develop' into develop
...
Conflicts:
views/options/settings.jade
2014-02-20 16:34:28 -08:00
Tyler Renelle
67876d6306
fix(views): indentation issue, fixes #2913
2014-02-20 12:27:59 -08:00
Hsiao, James (CMG-Atlanta)
0690e1db5a
added mysteryItem listing under subscriptions
2014-02-20 11:28:01 -05:00
Tyler Renelle
8de204dfc6
fix(swagger): let's add bootstrap.css for now, fixes some description
...
theming. If it breaks anything else, revert this
2014-02-19 09:35:22 -08:00
James Hsiao
db74c33af5
transcribed old wiki to api.jade
2014-02-19 12:08:12 -05:00
Matteo Pagliazzi
477937a72c
fix(i18n): add missing string
2014-02-19 17:27:07 +01:00
Matteo Pagliazzi
7baaf42884
Merge branch 'develop' of https://github.com/HabitRPG/habitrpg into develop
2014-02-18 20:31:14 +01:00
Matteo Pagliazzi
3cbe848f0c
fix(i18n): add string
2014-02-18 20:30:59 +01:00
Tyler Renelle
f25fd411df
chore(bailey): translations, bountysource
2014-02-18 11:11:35 -08:00
Tyler Renelle
55782512bf
feat(valentine): remove valentine event
2014-02-18 11:22:31 -07:00
Marc-André Larivière
dc75834ec4
Changed hints style (and small quick fixes)
2014-02-16 10:13:16 -05:00
Matteo Pagliazzi
4018ec885b
fix(header): use strings and a small css fix
2014-02-16 14:51:48 +01:00
deilann
a624ea702d
fix inventory dropdown for pets
2014-02-15 06:48:29 -08:00
Matteo Pagliazzi
fb7b1dca17
Merge branch 'upgrade' into develop
2014-02-14 18:36:22 +01:00
Matteo Pagliazzi
8f19f225f1
fix(misc): some styles & translations
2014-02-14 18:35:21 +01:00
Tyler Renelle
850c4fda9a
fix(tags): span(type='submit') is invalid. But since you can't theme
...
input-groups with input.input-group-addon, let's just make this an
ng-click. fixes #2818
2014-02-14 10:33:26 -07:00
Sabe Jones
e241429cc3
fix(toolbar): Tweak Settings drop-down
...
"Site" was the best I could come up with for all the miscellany in Settings > Settings.
2014-02-14 08:14:02 -06:00
Sabe Jones
4454204f47
fix(toolbar): Tweak icon popovers
...
Changed "Profile" toolbar icon popover to "User" and "Market" icon popover to "Inventory". Straightens out weird paths, so you don't go "Market > Market" or "Profile > Profile".
2014-02-13 20:39:22 -06:00
Tyler Renelle
677c83c592
chore(bailey): valentine
2014-02-13 18:45:36 -07:00
Tyler Renelle
fd6eb8724e
feat(valentine): valentine event
2014-02-13 18:40:33 -07:00
Tyler Renelle
7456f00dc6
feat(toolbar): try with icons instead of text, test against prod / beta
...
& get a vote.
2014-02-12 22:17:26 -07:00
Tyler Renelle
5501d57e10
fix(toolbar): tweaks
2014-02-12 21:51:35 -07:00
Tyler Renelle
f6abfc67b3
feat(tracking): gems > toolbar separately from wallet
2014-02-12 21:44:27 -07:00
Tyler Renelle
2750548d35
chore(bailey): bailey for chat notifs & toolbar
2014-02-12 21:37:14 -07:00
Tyler Renelle
c95c6a4c3b
chore(modals): remove mathUpdates modal (no longer in use). reference
...
this commit for any future emergency updates
2014-02-12 21:24:50 -07:00
Tyler Renelle
f72cb21300
feat(toolbar): add toolbar featuring navigation, gems / subs, bailey, &
...
chat / invite notifications
2014-02-12 21:21:36 -07:00
Matteo Pagliazzi
fef858d555
refactor(caching): cache emojis and remove gemoji from bower
2014-02-12 15:21:40 +01:00
Matteo Pagliazzi
c4244bc3b6
fix(misc)
2014-02-11 21:43:17 +01:00
Matteo Pagliazzi
fa2c64d2d8
chore(i18n): prepare english for transifex: remove ending or starting space & _comment strings
2014-02-11 19:30:55 +01:00
Matteo Pagliazzi
19139f562b
fix(misc): isStaticPage and debug buttons
2014-02-11 18:44:22 +01:00
Tyler Renelle
cbb448478e
feat(marketing): more copy for mobile
2014-02-11 01:34:42 -07:00
Tyler Renelle
cb079977e6
feat(marketing): start fleshing out the about page with images, content,
...
etc. Create separate videos page
2014-02-11 00:51:29 -07:00
Tyler Renelle
2480591444
refactor(bs3): put paypal button back in, use javascript API to
...
construct button on `ng-init` (since you can't nest script tags)
2014-02-10 13:28:16 -07:00
Tyler Renelle
ffb42906e1
feat(event-tracking): start adding some client-side GA event-tracking
2014-02-10 11:33:40 -07:00
Matteo Pagliazzi
a7e3e76daa
refactor(bs3): add fixed height modals & panels for quests & group members
2014-02-09 16:29:16 +01:00
Matteo Pagliazzi
3f28d16478
refactor(bs3): add fixed height modals & panels
2014-02-09 16:25:10 +01:00
Matteo Pagliazzi
1a44c3cf0c
refactor(bs3): css
2014-02-09 16:16:43 +01:00
Matteo Pagliazzi
5874941b94
refactor(bs3): inventory & misc
2014-02-09 12:32:12 +01:00
Lorian
322b257b72
Separated stable into dropped pets, quest pets, and rare pets, and made countPets only count the former. Made countMounts only count dropped and quest-hatched mounts, not rare mounts.
2014-02-08 16:57:28 -08:00
Matteo Pagliazzi
46053cc520
refactor(bs3): spaces
2014-02-08 20:10:37 +01:00
Matteo Pagliazzi
f3c42f19ab
refactor(bs3): hall form
2014-02-08 20:07:37 +01:00
Matteo Pagliazzi
5e98fa013d
refactor(bs3): typo
2014-02-08 19:56:31 +01:00
Matteo Pagliazzi
b4be88f4e0
refactor(bs3): misc
2014-02-08 19:49:47 +01:00
Matteo Pagliazzi
9ea9ed841d
refactor(bs3): buyQuest fix, add back badges colors, minor fixes
2014-02-08 19:20:10 +01:00
Matteo Pagliazzi
ee871ccb01
refactor(bs3): fixes
2014-02-08 16:58:41 +01:00
Matteo Pagliazzi
0fe0cb4f2d
refactor(bs3): labels style and text, buttons classes
2014-02-08 16:27:34 +01:00
Tyler Renelle
313ec3d869
Merge branch 'develop' into bs3
...
Conflicts:
views/options/social/tavern.jade
2014-02-07 23:41:14 -07:00
