sudoxreboot/habitica
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica.git synced 2026-08-01 07:21:15 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Commit graph

  • be986e09f6 fix(beastmaster): allow hatching pets when petOwned<=0 (fyi @deilann). Man, browserify adds so many lines - this commit is a one-liner, lol Tyler Renelle 2014-01-26 17:47:27 -0800
  • 51bff23885 fix(stable): show hatchable combo when petOwned>0 (fyi @deilann) Tyler Renelle 2014-01-26 17:46:09 -0800
  • 1d8539837c Merge pull request #2576 from Sinza-/mult-sell-buttons Tyler Renelle 2014-01-26 17:26:42 -0800
  • 5caaff1cea fix(beastmaster): fixes #2557, adds opacity to previously-owned pets after they're mounted. You can earn them back again Tyler Renelle 2014-01-26 17:24:48 -0800
  • dcfa9e4724 Merge remote-tracking branch 'ryepdx/conText-bug' into develop Tyler Renelle 2014-01-26 17:07:06 -0800
  • ba1095eb33 Merge pull request #108 from creidieki/develop Tyler Renelle 2014-01-26 17:01:34 -0800
  • bbecfb3ffd Merge pull request #116 from deilann/petcounting Tyler Renelle 2014-01-26 16:57:53 -0800
  • f53a2a87c3 fix(mounts): Offset gryphons by 5x, 5y Sabe Jones 2014-01-26 15:43:28 -0800
  • 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 Tyler Renelle 2014-01-26 14:22:01 -0800
  • 286a69fd46 chore(bailey): udpated bailey for premium Tyler Renelle 2014-01-25 15:30:55 -0800
  • 62af638e8a Merge pull request #2570 from deilann/patch-1 Tyler Renelle 2014-01-26 12:41:06 -0800
  • 4ca67bdee8 Merge pull request #2574 from deilann/copy-3 Tyler Renelle 2014-01-26 12:37:49 -0800
  • e739c4e78f Merge pull request #115 from deilann/copy-strings Tyler Renelle 2014-01-26 12:37:31 -0800
  • 2a32517ae4 Merge pull request #117 from deilann/dequip-1 Cole Gleason 2014-01-26 12:06:50 -0800
  • dbbcee0c1c syntax fix deilann 2014-01-26 11:53:02 -0800
  • c09d89f872 Fix version conflict Marcelo Sizer 2014-01-26 17:39:36 -0200
  • 8d41c44ad7 Fix version conflict Marcelo Sizer 2014-01-26 17:37:54 -0200
  • 285e5904af Removed random 1 at the end of the line. Ryan Casey 2014-01-26 12:36:27 -0700
  • bc023189fd Fix typo Marcelo Sizer 2014-01-26 17:35:23 -0200
  • 58cc787b5c Split main.json Marcelo Sizer 2014-01-26 17:32:40 -0200
  • 8f4016d669 Split main.json Marcelo Sizer 2014-01-26 17:30:41 -0200
  • 6b5c9777d1 Changed 'conText' key for constitution tooltip to 'constText'. Ryan Casey 2014-01-26 11:50:32 -0700
  • f1bbd92ceb fix(mounts): Relocate wing to head layer Sabe Jones 2014-01-26 10:20:39 -0800
  • bc1adeb127 fix(mounts): Move avatar upward when mounted regardless of pet Sabe Jones 2014-01-26 11:02:59 -0600
  • 4274090205 fix(translations): fix #2564 and similar ones Matteo Pagliazzi 2014-01-26 14:48:38 +0100
  • de2c0280b2 Fix multiple sell buttons appearing simultanously when clicking on food + egg or potion Marcelo Sizer 2014-01-26 01:18:54 -0200
  • b44f7088ad new landing copy deilann 2014-01-25 18:21:56 -0800
  • b6c8452043 changing dequip to make sense for all classes deilann 2014-01-25 18:17:33 -0800
  • 44a5a9c716 adding mechanic to count previously owned pets deilann 2014-01-25 17:58:18 -0800
  • 7799ae31e9 adding strings for copy and fixing a typo deilann 2014-01-25 17:53:51 -0800
  • 117c26cfd3 Added tests for translations (env.t) Dušan Juretić 2014-01-25 21:01:43 -0300
  • 54473b7135 feat(i18n): update to ads content Tyler Renelle 2014-01-25 13:46:29 -0800
  • 2c0f5fc5d0 removed stray paren deilann 2014-01-25 13:17:01 -0800
  • 2a91cee0ff Merge branch 'round-boss' into develop Cole Gleason 2014-01-25 13:22:49 -0600
  • 1412570484 revert(party): Round boss health up instead of to nearest integer Cole Gleason 2014-01-25 13:21:48 -0600
  • a369377a06 fix(translations): typo Matteo Pagliazzi 2014-01-25 16:39:16 +0100
  • 11b37c6047 Merge pull request #2553 from djuretic/mark_collected_items Tyler Renelle 2014-01-24 17:36:22 -0800
  • 1dc68112d1 fix(paypal): fixes #2492, remove environment check for now, only have production-mode option. revisit Tyler Renelle 2014-01-24 17:29:10 -0800
  • 70001b1feb Mark collected items in collection quests Dušan Juretić 2014-01-24 22:28:19 -0300
  • ecbe780e70 fix(find_uniq_user): fix Tyler Renelle 2014-01-24 17:03:55 -0800
  • 17c63cdc6e Replace string for env.t Marcelo Sizer 2014-01-24 20:26:33 -0200
  • 13131087ff fix(translations): add env.t to rootScope Matteo Pagliazzi 2014-01-24 23:19:17 +0100
  • 2eb7ea5e91 Merge pull request #2550 from HabitRPG/paglias/translations-refactoring Matteo Pagliazzi 2014-01-24 13:53:46 -0800
  • 138966cf1f Merge pull request #114 from HabitRPG/paglias/translations-refactoring Matteo Pagliazzi 2014-01-24 13:52:46 -0800
  • bd54bf1c53 refactor(translations) Matteo Pagliazzi 2014-01-24 22:49:42 +0100
  • 5336134c7d refactor(translations) Matteo Pagliazzi 2014-01-24 22:49:36 +0100
  • b246a6d430 Merge branch 'round-boss' into develop Cole Gleason 2014-01-24 15:33:30 -0600
  • e76c81b3d7 refactor(api.percent): allow for round direction to be specified Cole Gleason 2014-01-24 15:31:08 -0600
  • 0c935f9c9a Merge branch 'develop' of github.com:HabitRPG/habitrpg into develop Cole Gleason 2014-01-24 15:29:17 -0600
  • 626da5681f fix(party): Round boss health up instead of to nearest integer Cole Gleason 2014-01-24 15:26:43 -0600
  • 50af412b1d refactor(translations) Matteo Pagliazzi 2014-01-24 21:27:34 +0100
  • d107db7013 refactor(translations) Matteo Pagliazzi 2014-01-24 21:27:06 +0100
  • c96adf3552 refactor(translations): achievements Matteo Pagliazzi 2014-01-24 20:08:19 +0100
  • 8e99186e9c refactor(translations): achievements Matteo Pagliazzi 2014-01-24 20:07:02 +0100
  • 95f1dc6e60 improve(translation): allow for data interpolation Matteo Pagliazzi 2014-01-24 18:08:54 +0100
  • 1663e09f74 improve(translation): stringNotFound use template Matteo Pagliazzi 2014-01-24 18:03:03 +0100
  • aae81e7f93 fic(translations): remove string for terms and privacy Matteo Pagliazzi 2014-01-24 17:39:11 +0100
  • a9095f3464 fix(translations): remove translations for privacy & terms Matteo Pagliazzi 2014-01-24 17:38:21 +0100
  • 756e7be751 Merge branch 'fix-spaces' of git://github.com/Sinza-/habitrpg into Sinza--fix-spaces Matteo Pagliazzi 2014-01-24 17:12:00 +0100
  • 0b21a089be fix(translations): merge pr Matteo Pagliazzi 2014-01-24 17:10:05 +0100
  • ed71522131 Fix version conflict Marcelo Sizer 2014-01-24 07:28:30 -0200
  • fd8e67e236 Fix version conflicts Marcelo Sizer 2014-01-24 07:24:29 -0200
  • cbd3aeac70 Merge pull request #89 from colegleason/ultimate-gear Cole Gleason 2014-01-23 22:04:46 -0800
  • a501d5c3ba perf(ultimateGear): move ultimateGear from ops to fns so it only runs once Cole Gleason 2014-01-24 00:02:51 -0600
  • 2283093845 fix(ultimateGear): fix bug where ultimateGear isn't awarded Cole Gleason 2014-01-09 22:33:01 -0600
  • 17e70e84d6 Remove level lock to purchase Marcelo Sizer 2014-01-23 23:30:11 -0200
  • d3d970b87f Make locked quests purchasable Marcelo Sizer 2014-01-23 23:11:30 -0200
  • 576cf1f58b Fix spacing errors Marcelo Sizer 2014-01-23 22:00:12 -0200
  • fe99bca10f Fix spacing errors #2536 Marcelo Sizer 2014-01-23 21:58:38 -0200
  • 9e6a9a3d0e Don't show information if the quest is locked Marcelo Sizer 2014-01-23 18:26:55 -0200
  • 6c68c51ab5 Fix version conflict Marcelo Sizer 2014-01-23 17:26:37 -0200
  • 38b4cea732 fix(tests): include select2 in test manifest Tyler Renelle 2014-01-23 10:09:52 -0800
  • 635451dc8c Close quest modal after quest purchase Marcelo Sizer 2014-01-23 16:11:40 -0200
  • b2d5e2a090 Add popover quest description to quests in the Market and add buyQuest modal to show text and rewards before purchasing the quest Marcelo Sizer 2014-01-23 15:53:42 -0200
  • 13a7cc9d55 improve(translations): merge pr and lots of fixes Matteo Pagliazzi 2014-01-23 17:02:16 +0100
  • 5e0bcfd874 fix(translations) Matteo Pagliazzi 2014-01-23 16:58:03 +0100
  • 63bd5e071c fix(translations) Matteo Pagliazzi 2014-01-23 16:53:21 +0100
  • 2f05c63b8f (translations) Matteo Pagliazzi 2014-01-23 16:09:25 +0100
  • 753760275d improve(translations) Matteo Pagliazzi 2014-01-23 15:51:29 +0100
  • 2bc0286d36 fix(json) Matteo Pagliazzi 2014-01-23 15:48:01 +0100
  • 64c1e74afb Merge pull request #111 from luveluen/develop Matteo Pagliazzi 2014-01-23 06:36:11 -0800
  • 50953ddf81 Merge pull request #2525 from Sinza-/develop Matteo Pagliazzi 2014-01-23 06:01:06 -0800
  • b3d2793e76 Update main.json Luveluen 2014-01-23 10:29:06 +0100
  • 6f3229c679 Update tavern.jade Luveluen 2014-01-23 10:16:32 +0100
  • 669789df67 Update index.jade Luveluen 2014-01-23 09:45:34 +0100
  • 50f992b63c Update hall.jade Luveluen 2014-01-23 09:43:17 +0100
  • ab84219835 Update group.jade Luveluen 2014-01-23 09:40:31 +0100
  • ed180692e3 Update create-group.jade Luveluen 2014-01-23 09:36:32 +0100
  • 6fb88ee1b5 Update chat-message.jade Luveluen 2014-01-23 09:35:18 +0100
  • 34fe364fea Update chat-box.jade Luveluen 2014-01-23 09:33:41 +0100
  • 2282e36bac Update challenges.jade Luveluen 2014-01-23 09:31:33 +0100
  • 9fa4521739 feat(challenges): add angular-ui-select2 for simpler find/select challenge winner. Tyler Renelle 2014-01-22 23:20:59 -0800
  • ae0d758d8f feat(challenges): add button for csv export Tyler Renelle 2014-01-22 23:19:34 -0800
  • 5201343867 Merge pull request #2528 from HabitRPG/sabe/tweak Tyler Renelle 2014-01-22 22:49:39 -0800
  • 16a602f94c feat(challenges): add csv export for challenge progress. WIP, will refine this over time - but we need it something like this for the STWC come 1/31. Tyler Renelle 2014-01-22 22:20:16 -0800
  • d3f4a561fd docs(rebirth): Bullet point about repurchase of limited ed gear after Rebirth Sabe Jones 2014-01-22 20:45:04 -0600
  • 667a4264c5 docs(rebirth): Bullet point to reassure users that they can get their limited ed gear back after Rebirth Sabe Jones 2014-01-22 20:41:43 -0600
  • d782fc6b6a fix(stats): Better layout for attribute point allocation Sabe Jones 2014-01-22 20:34:03 -0600
  • 02311e8500 fix(translations): Remove more spurious NBSPs from English translation Sabe Jones 2014-01-22 20:32:12 -0600
  • 432ab0dc66 Test quests valid values Dušan Juretić 2014-01-22 22:40:12 -0300