sudoxreboot/habitica
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica.git synced 2026-08-03 17:19:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
5558 commits 3 branches 0 tags 1.6 GiB
Commit graph

710 commits

Author SHA1 Message Date
Tyler Renelle
c6232c2d1a feat(backgrounds): add backgrounds feature 2014-06-10 16:38:29 -06:00
negue
76ac10395f feat(todolist): Push To Top Button 2014-06-10 20:41:30 +02:00
Gaelan
8bd9f3d348 Fix stats.jade. 
I broke it in a previous PR.
 2014-06-09 22:51:28 -07:00
Sabe Jones
7bd421f10c Merge pull request #3582 from Gaelan/just_call_it_perception 
Stop using abbreviated names of attributes in UI.
 2014-06-09 22:09:58 -05:00
Bob Example
33a3958a2c Stop using abbreviated names of attributes in UI. 2014-06-09 17:29:51 -07:00
Tyler Renelle
f85d6b2978 feat(quests): add octopus quest 2014-06-09 14:33:08 -06:00
Tyler Renelle
f46749824f Merge pull request #3524 from OverloadUT/ui-fix-disable-submit-during-edit 
Hide task control buttons during editing
 2014-06-08 10:13:42 -06:00
Matteo Pagliazzi
74d206ab74 fix(i18n): use strings 2014-06-07 14:26:58 +02:00
Tyler Renelle
4aa938dfd9 chore(bailey): june mystery item, earthquake thingy 2014-06-05 22:59:06 -06:00
benmanley
57eb80f9db refactor(.hero-stats): restyle status meters 
Add text to icons to clarify purpose of each bar
Tidy up tooltip behaviour
Aesthetic changes
 2014-06-05 16:19:22 +01:00
Greg Laabs
04034dbdf1 Hide task control buttons during editing 2014-05-23 19:54:32 -07:00
Tyler Renelle
29be5d6e3e feat(mystery): may 2014 mystery item 2014-05-23 00:34:32 +02:00
deilann
020f278577 fix(footer): update github link 
Link updated to https://github.com/HabitRPG/habitrpg/issues/2760
 2014-05-18 04:25:15 -07:00
Tyler Renelle
96c9c7f101 chore(bailey): bailey on level-100 cap 2014-05-14 12:14:46 -06:00
Tyler Renelle
8506db9849 feat(rat): add rat quest 2014-05-14 08:54:24 -06:00
benmanley
0d15006123 refactor(menu): add total gold to gold popover 2014-05-12 21:19:27 +01:00
Matteo Pagliazzi
304beb6482 fix(i18n): use strings 2014-05-12 17:15:38 +02:00
deilann
d801ece19d adding flag, allowing free rebirth purchase, adding modal 2014-05-11 08:01:15 -07:00
Tyler Renelle
e60cf01b6f feat(stats): expos stats jade files to mobile 2014-05-08 16:04:36 -06:00
Tyler Renelle
628ea0accd Merge pull request #3402 from benmanley/toolbar-toggle 
feat(toolbar): add button to hide/show toolbar
 2014-05-07 15:19:00 -06:00
Matteo Pagliazzi
52d2693d94 fix(i18n): use translated attributes and classes 2014-05-06 20:05:57 +02:00
Matteo Pagliazzi
99f50b0461 fix(i18n): missing strings 2014-05-06 20:05:57 +02:00
Matteo Pagliazzi
e4f8ee1b93 fix(i18n): spacing 2014-05-06 20:04:10 +02:00
Matteo Pagliazzi
d242ee3291 refactor(i18n): use strings for content 2014-05-06 20:04:09 +02:00
Matteo Pagliazzi
626352e04b improve(i18n): use strings for gear items and potion 2014-05-06 20:04:09 +02:00
Tyler Renelle
21f79a8139 chore(bailey): mobile + chrome ext. update 2014-05-05 14:13:04 -06:00
benmanley
2309184ae3 feat(toolbar): add button to hide/show toolbar 
menu.jade:
* Add toggle button to toolbar
* Add container to hide the rest of toolbar without hiding the toggle
button.

menu.styl:
* Add toggle button styles
* Update toolbar styles to account for toggle button

header.styl:
* Update rules for adding and removing padding from .header-wrap when
toolbar is toggled.
 2014-05-02 19:49:18 +01:00
Tyler Renelle
befde8ccda chore(bailey): bailey for may 2014-04-30 22:33:12 -06:00
Tyler Renelle
540431ee8b chore(bailey): mobile, spring fling, stwc 2014-04-30 00:28:16 -06:00
SabreCat
3f5e130552 feat(tooltips): Add expand/collapse cues 
Some users (@fragmental) didn't realize that you could click the checklist badge to expand or collapse checklists. This commit adds a tooltip to the badge, as well as to a couple other not-obviously-clickable spots, to cue the user that they can be expanded and collapsed.

BREAKING CHANGE: Will result in "String not found" errors until all locales have an "expandCollapse" string available.
 2014-04-28 20:44:16 -05:00
SabreCat
ef5b7deff3 fix(achievements): Differentiate singular and plural 
Allows Streak and Perfect Day achievements to dynamically show a singular or plural version of their text based on how many achievements the viewed profile has stacked.

BREAKING CHANGE: Will lead to 'string not found' errors until the singular version strings are implemented in all locales on habitrpg-shared.
 2014-04-27 21:36:21 -05:00
Tyler Renelle
3a7c994f1a refactor(avatar): support minimal avatar displays (using for mobile sidebar) 2014-04-26 18:46:26 -06:00
Tyler Renelle
979d7d85a4 refactor(avatar): avatar separated into two mixins: +heroBox() and 
+avatar(). Mobile will be sharing jade files with web, we'll need more
modular markup
 2014-04-26 15:12:03 -06:00
Tyler Renelle
425218d9a7 feat(mystery): april mystery item 2014-04-24 17:48:21 -06:00
benmanley
aeb205b8ad fix(toolbar): change "noNotifications" text to string 2014-04-23 21:39:56 +01:00
benmanley
254ac3d510 fix(toolbar): improve layout and fix scrolling bug 
Consolidate styles from menu.styl into global-modules.styl
Mobile: Remove glyphicons to give more space
Mobile: Fix notif scrolling behaviour
Mobile: Move subscribe button from toolbar to menu modal
 2014-04-23 18:39:55 +01:00
Tyler Renelle
a608419bba feat(coupons): add coupon-code feature 2014-04-16 23:28:37 -06:00
Tyler Renelle
e2eff3b185 fix(toolbar): typo 2014-04-16 23:27:55 -06:00
Tyler Renelle
178cfcd6e6 feat(toolbar): only one expanded menu at a time 2014-04-16 22:46:49 -06:00
Sabe Jones
8a00dfd27e fix(header): Consistent formatting of XP 
Use the "number:0" format for current experience as well as experience to next level, so you don't have inconsistent thousands separators (e.g. "1010 / 1,100")
 2014-04-16 19:03:12 -05:00
Tyler Renelle
5277275b0f feat(accessories): add body accessory 2014-04-16 17:54:40 -06:00
Tyler Renelle
5296a584de Merge pull request #3155 from benmanley/notif-restyle 
Consolidate notifications into one menu
 2014-04-16 11:40:20 -06:00
Tyler Renelle
ffa21ca1f7 feat(backAccessory): add optional collar to back accessories. If you 
name it the same name + _collar (eg, back_base_0.png + back_base_0_collar.png), it's automatically handled
 2014-04-13 22:57:05 -06:00
benmanley
3485722be8 Replace text with env.t and remove unnecessary code 2014-04-08 16:48:11 +01:00
deilann
c1a219380b clarify no adding members to existing quests 
Should hopefully cut back on the number of newer players starting a quest and thinking they can add other folks
 2014-04-07 15:59:16 -07:00
Tyler Renelle
1789317326 chore(bailey): update to bailey egg quest 2014-04-06 22:59:05 -06:00
Tyler Renelle
45dcd0329f chore(bailey): bailey for eggQuest 2014-04-06 21:42:27 -06:00
benmanley
834828ce74 Improve toolbar and global styles 2014-04-05 15:03:36 +01:00
Tyler Renelle
2d444c5ccc chore(bailey): pastel hair 2014-04-03 23:01:48 -07:00
benmanley
0863215102 Redesign toolbar navigation and fix notification logic 2014-04-03 09:21:22 +01:00
Tyler Renelle
3212a60039 chore(bailey): bailey april mystery 2014-04-02 00:15:53 -06:00
Tyler Renelle
8c23bd0d21 chore(april-fools): revert april fools 2014-04-02 00:05:33 -06:00
Matteo Pagliazzi
7a806097b9 Merge pull request #3191 from denis-sokolov/footer-proper-debug-condition 
fix(footer): correct logic to show debug panel
 2014-04-01 16:52:04 +02:00
Tyler Renelle
71a23096cc feat(april-fools): april fools (revert here when done) 2014-03-31 20:12:16 -06:00
Tyler Renelle
d4bdeaeff1 chore(bailey): april fools bailey 2014-03-31 20:12:16 -06:00
Denis Sokolov
1bc2d74f67 fix(footer): correct logic to show debug panel 
In the controller, the actions behind the buttons are only defined in development.
As a result, if the environment is neither production, nor development,
the buttons would show up but do nothing.

After this fix, the buttons only show up in development.
 2014-03-31 21:22:37 +03:00
Tyler Renelle
301bebe1bd refactor(subscriptions): move unsubscribe message to the cancelSub button 2014-03-30 18:36:44 -06:00
Tyler Renelle
2647ac2f46 chore(bailey): bailey on last-day march subs 2014-03-30 18:22:22 -06:00
Tyler Renelle
c7f7a07aed chore(ultimateGear): take ultimategear offline until it's fixed (see https://github.com/HabitRPG/habitrpg/issues/2232) 2014-03-30 18:20:05 -06:00
Peter Hatch
aa80a0c051 Draw the back acessory layer before the skin layer. 2014-03-29 13:37:22 -07:00
benmanley
ef8f58ea58 Close notifs modal and toolbar when clicking an individual notif 2014-03-26 22:32:14 +00:00
benmanley
7d7785d1c0 Consolidate notifications into one menu 2014-03-26 22:01:30 +00:00
Denis
84a5a513cf feat(mystery): typo in bailey 2014-03-25 09:53:21 +02:00
Tyler Renelle
92c8dbba3e feat(mystery): bailey + migration for march mystery items 2014-03-24 23:42:08 -06:00
Tyler Renelle
0f430e102e feat(subscriptions): add paypal recurring cancelation. refactor stripe & paypal code to use auth.authWithUrl. 2014-03-24 20:47:25 -06:00
Tyler Renelle
10c9595662 feat(subscriptions): convert paypal gem purchases from client-side javascriptButtons to serverside NVP 2014-03-24 20:47:18 -06:00
Tyler Renelle
547c195ae9 chore(bailey): bailey for stag quset 2014-03-21 21:34:37 -06:00
Tyler Renelle
0da696b861 chore(bailey): bailey for spring fling event 2014-03-21 16:00:50 -06:00
Tyler Renelle
bfc6bf44ff feat(accessories): head accessory 2014-03-21 13:17:17 -06:00
Tyler Renelle
531fe5eb31 feat(flower): add flower customization option 2014-03-21 12:29:57 -06:00
Tyler Renelle
2661034fbd Merge pull request #3076 from benmanley/toolbar-restyle 
Redesign navbar
 2014-03-21 12:29:06 -06:00
benmanley
3a899cf3a4 Fix broken logout link in submenu 2014-03-19 14:31:25 +00:00
Peter Hatch
31af4bdfcc In class choice popup, added a space between 'Choose your' and 'Class!'. 2014-03-19 00:06:48 -07:00
Tyler Renelle
809008e753 chore(bailey): pet mechanics, wondercon, LH poll 2014-03-18 16:19:06 -06:00
benmanley
ea650c8acf Fix gap at bottom of toolbar and remove unused code 2014-03-18 20:14:29 +00:00
benmanley
a5bce9e8b6 Close submenu when a navigation link is clicked 2014-03-18 17:33:14 +00:00
benmanley
055c25fac3 Remove gold and silver totals from Reward list 2014-03-18 17:30:57 +00:00
benmanley
addb05686b Hide .navbar-info on mobile until toggled 2014-03-17 23:47:43 +00:00
benmanley
bd79234570 Hide toolbar-submenu until toggled 2014-03-17 23:42:04 +00:00
benmanley
543e3695c2 Improve navbar layout 
Make navbar fixed for desktop and static for mobile.
 2014-03-16 23:53:15 +00:00
benmanley
6ca6bbedec Move sync button from submenu into navbar 2014-03-15 18:21:11 +00:00
benmanley
495e0fe60f Change hardcoded text to variable 2014-03-15 13:05:31 +00:00
benmanley
eef5e55ad9 Redesign navbar 
Restyle navigation and improve mobile layout
 2014-03-14 23:32:32 +00:00
James Hsiao
f192e2df39 fixed  /space issue 2014-03-10 08:57:41 -04:00
Tyler Renelle
7dcc9e29ea Merge pull request #2987 from thepeopleseason/member-modal-spacing 
Member modal spacing
 2014-03-09 16:48:55 -06:00
Tyler Renelle
cbd6e6f4e8 Merge pull request #3002 from Omnomnobot/patch-2 
Update API footer link
 2014-03-09 16:47:41 -06:00
Sabe Jones
d3f755d30c fix(buffs): Even out spacing on level tag 
Inline CSS is bad! Also the buff icon looked lopsided on a character who also had the Rebirth badge.
 2014-03-08 17:15:33 -06:00
Tyler Renelle
658598f9ea fix(extensions): redirect extensions page to wikia, fixes #3022 2014-03-07 12:14:54 -07:00
Omnomnobot
9daf3c2f97 Update API footer link 
The Wiki page here on Github is quite useless now, the most useful infos are in https://habitrpg.com/static/api an the official Wiki
 2014-03-04 22:41:29 +01:00
Matteo Pagliazzi
2321b40753 fix(i18n): do not translate DELETE when used to delete account 2014-03-04 19:53:15 +01:00
Tyler Renelle
129189f033 chore(bailey): bailey for march mystery 2014-03-02 14:40:11 -07:00
James Hsiao
a5cdbcc158 added spacing for member modal 2014-03-02 09:38:01 -05:00
Tyler Renelle
82c6c14985 chore(bailey): hedgehog quest 2014-03-01 08:41:47 -07:00
Matteo Pagliazzi
010883409d fix(i18n): use string for new subscriber item 2014-02-23 12:12:00 +01:00
Tyler Renelle
fda191ffc2 chore(bailey): mystery item 2014-02-22 22:10:39 -08:00
Tyler Renelle
a1e66ab99e feat(premium): mystery item notif in toolbar 2014-02-22 21:00:10 -08:00
Tyler Renelle
7311850d09 feat(accessories): add back accessory 2014-02-22 20:38:16 -08:00
Tyler Renelle
aaa38a5070 fix(static): move About => Features 2014-02-21 17:58:43 -08:00
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
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
8f19f225f1 fix(misc): some styles & translations 2014-02-14 18:35:21 +01: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
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
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
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
Matteo Pagliazzi
46053cc520 refactor(bs3): spaces 2014-02-08 20:10:37 +01:00
Matteo Pagliazzi
5e98fa013d refactor(bs3): typo 2014-02-08 19:56:31 +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
0fe0cb4f2d refactor(bs3): labels style and text, buttons classes 2014-02-08 16:27:34 +01:00
Tyler Renelle
37340d2318 fix(mounts): fix pets & mounts css to position the user based on 
pet/mount equip
 2014-02-07 21:48:11 -07:00
Tyler Renelle
3473b73452 chore(Merge): branch 'develop' into bs3 
Conflicts:
	views/options/inventory/inventory.jade
 2014-02-07 17:42:12 -07:00
Tyler Renelle
5d0ef55429 chore(bailey): update with stability info & subscriber links 2014-02-07 13:43:41 -07:00
Tyler Renelle
677d23939d chore(bailey): add images for previous commit 2014-02-07 11:53:01 -07:00
Tyler Renelle
82241634b3 chore(bailey): bailey re: rainbow hair, critical hammer, mystery item 2014-02-07 11:42:05 -07:00
Matteo Pagliazzi
e4bd817443 refactor(bs3): sync with develop 2014-02-06 17:36:33 +01:00
Matteo Pagliazzi
90e9a1aeaa i18n(refactor): load all files in a locale, not the ones defined in app.json, move env.t client code to own file, add env.isStaticPage (from isFrontPage) 2014-02-06 17:17:21 +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
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
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
Tyler Renelle
286a69fd46 chore(bailey): udpated bailey for premium 2014-01-26 13:59:41 -08: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
Tyler Renelle
1dc68112d1 fix(paypal): fixes #2492, remove environment check for now, only have 
production-mode option. revisit
 2014-01-24 17:29:10 -08:00
Matteo Pagliazzi
5336134c7d refactor(translations) 2014-01-24 22:49:36 +01:00
Matteo Pagliazzi
d107db7013 refactor(translations) 2014-01-24 21:27:06 +01:00
Matteo Pagliazzi
8e99186e9c refactor(translations): achievements 2014-01-24 20:07:02 +01:00