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

Commit graph

  • 6b8a4f966b Merge pull request #4321 from sbreiler/develop Blade Barringer 2014-12-04 08:15:38 -0600
  • a55fa37412 Converted strings to be able to use links Blade Barringer 2014-12-03 22:46:41 -0600
  • 2e2faa6117 Moved pre-subscription time travelers title and popover to shared Blade Barringer 2014-12-03 22:24:43 -0600
  • ce8b6d2901 fix(style): Give room for badge Sabe Jones 2014-12-03 22:22:21 -0600
  • 87092e8109 Added mystic hourglass and time travelers screens Blade Barringer 2014-12-03 22:19:33 -0600
  • cc32369497 fix(style): Prettify Market Gem Sabe Jones 2014-12-03 22:10:35 -0600
  • b017623621 fix(subscriptions): Fix to Gems badge Sabe Jones 2014-12-03 21:39:26 -0600
  • 6ac6f4d476 fix(plans): fix conversion cap Tyler Renelle 2014-12-03 20:24:35 -0700
  • 9e64bc3788 fix(plans): move plan reset up for people in inn Tyler Renelle 2014-12-03 20:16:33 -0700
  • 9d3e6c71fe fix(plans): possible safe-check of gemcapextra cc @Sabrecat Tyler Renelle 2014-12-03 20:03:40 -0700
  • 62e526f8dc feat(subscriptions): Show count of purchasable Gems Sabe Jones 2014-12-03 20:55:22 -0600
  • 3423e9857d fix(gifts): $rootScope => Payments Tyler Renelle 2014-12-03 19:38:09 -0700
  • bd5f8d79ea fix(bailey): mystery 3014 promo Tyler Renelle 2014-12-03 19:24:42 -0700
  • cb8c1359c4 fix(plans): mystery 3014 promo Tyler Renelle 2014-12-03 19:24:26 -0700
  • 78a4edb38a i18n(plans): update wording cc @Alys Tyler Renelle 2014-12-03 19:14:27 -0700
  • c14af0e855 chore(multi-core): allow "CORES" nconf var, so can just use one core (or however many) cc @paglias Tyler Renelle 2014-12-03 19:12:20 -0700
  • 3dd775235d fix(): remove some logs Tyler Renelle 2014-12-03 19:05:54 -0700
  • 1a84d01933 fix(gifts): allow gifting 0<gift<1 (cc @Alys @crookedneighbor) Tyler Renelle 2014-12-03 19:00:49 -0700
  • d2e230db1f fix(plans): various bug fixes Tyler Renelle 2014-12-03 16:43:27 -0700
  • e1492809fd bailey(plans): Gifting Subscriptions And Gems, New Subscription Benefits, Mysterious Time Travelers, Steampunk Item Sets, And Block Subscriptions Tyler Renelle 2014-12-03 16:31:10 -0700
  • 754fb549ea Merge pull request #4320 from crookedneighbor/show-full-time-on-hover-in-chat Blade Barringer 2014-12-03 17:03:44 -0600
  • a62a09d7d2 Merge pull request #376 from HabitRPG/block-subs Tyler Renelle 2014-12-03 16:02:14 -0700
  • a0a576f143 Merge pull request #4323 from HabitRPG/block-subs Tyler Renelle 2014-12-03 16:02:09 -0700
  • 30c1ac4b1e fix(plans): lots of bug fixes & cleanup Tyler Renelle 2014-11-30 17:18:54 -0700
  • bf7e1e66ed feat(plans): time traveler - by full sets Tyler Renelle 2014-11-29 11:16:54 -0700
  • d81badde69 feat(plans): add time traveler - buy individual mystery items Tyler Renelle 2014-11-28 19:44:32 -0700
  • 76be625f6d feat(plans): add consecutive-month benefits for subscribers Tyler Renelle 2014-11-17 16:36:03 -0800
  • 0a53a5717e refactor(payments): move payments into it's own service, out of rootCtrl Tyler Renelle 2014-11-30 14:01:58 -0700
  • 8c5842eb52 feat(plans): cleanup plans' perks page, rename Time Trinket => Mystic Hourglass Tyler Renelle 2014-11-29 17:55:41 -0700
  • 0fffd66588 feat(plans): time travelers tab, 1 trinket to buy 1 set Tyler Renelle 2014-11-28 19:24:56 -0700
  • 7f2b6b5cfb feat(plans): allow block subscriptions from paypal/stripe Tyler Renelle 2014-11-28 16:11:13 -0700
  • 5fd805db88 feat(plans): consectuive-month subscription perks (gifting) Tyler Renelle 2014-11-28 14:44:40 -0700
  • 5b01fff700 feat(gifts): allow gifting subscriptions Tyler Renelle 2014-11-26 18:13:25 -0700
  • e8dbd5ca1a feat(gifts): allow gifting gems from paypal/stripe Tyler Renelle 2014-11-26 15:14:23 -0700
  • 7e9b92fcad feat(gifts): allow gifting from balance Tyler Renelle 2014-11-25 14:53:52 -0700
  • 57bfee02cf feat(plans): consecutive months & extra months (like a time-card) Tyler Renelle 2014-11-26 12:39:30 -0700
  • 117a424a5d refactor(members): DRY some members code Tyler Renelle 2014-11-25 13:48:36 -0700
  • fc3272ddc8 Merge pull request #4322 from HabitRPG/old-news Tyler Renelle 2014-12-03 14:02:13 -0700
  • 66b4dae0d9 feat(news): move old news to /static/old-news, better use of content space Tyler Renelle 2014-12-03 13:49:24 -0700
  • ffb073102f Fix #2879 (Check-Icons) Steffen Breiler 2014-12-03 18:51:17 +0100
  • 073b338bde fix(tasks): stop reward values overflowing benmanley 2014-12-03 15:39:58 +0000
  • 8794adde69 Updated function to go to correct options pane. Closes # 4319 Blade Barringer 2014-12-03 08:01:23 -0600
  • c7c5aee6a0 Added tooltip to show chat time in date format with minutes and seconds Blade Barringer 2014-12-03 07:49:06 -0600
  • 3cf6e84451 chore(Bailey): Outage announcement Sabe Jones 2014-12-01 21:05:36 -0600
  • 985171f856 fix(tavern): jade fix Tyler Renelle 2014-12-01 17:45:50 -0700
  • 9c2c08c03d fix(.task-filter): force long words to wrap benmanley 2014-12-01 13:31:15 +0000
  • 9bc38b0b2e Merge pull request #4287 from taldin/market-poptop Alice Harris 2014-12-01 17:58:12 +1000
  • f3e2ee33f7 Merge pull request #4306 from SabreCat/develop Sabe Jones 2014-11-30 23:21:42 -0600
  • a6944ec072 Merge pull request #375 from SabreCat/develop Sabe Jones 2014-11-30 23:20:22 -0600
  • d7b904efec chore(December): grunt Sabe Jones 2014-11-30 23:08:53 -0600
  • 1713843067 fix(Bailey): correct date Sabe Jones 2014-11-30 23:06:00 -0600
  • 452b459d69 chore(Bailey): Announce December Sabe Jones 2014-11-30 23:03:08 -0600
  • 4d8a9c5287 feat(backgrounds): December purchasables Sabe Jones 2014-11-30 22:54:37 -0600
  • 0c675f704b Simplified styles for locked and unlocked backgrounds Blade Barringer 2014-11-30 18:57:01 -0600
  • 632d0fdf5d Merge pull request #4299 from pollockjj/develop Blade Barringer 2014-11-30 18:41:51 -0600
  • 703451d452 fix(mystery): typo Tyler Renelle 2014-11-30 14:11:26 -0700
  • f7c6e9063b chore(i18n): update locales Matteo Pagliazzi 2014-11-30 21:59:49 +0100
  • 96f8f2cdd5 refactor(inventory): move all special items into single category "special" (cleaner) Tyler Renelle 2014-11-30 13:12:28 -0700
  • aa6afcdce8 chore(i18n): update locales Matteo Pagliazzi 2014-11-30 20:21:59 +0100
  • 2ee6f0ed61 feat(Bailey): November subscription reminder Sabe Jones 2014-11-30 11:50:31 -0600
  • 9e42c7fb05 Merge pull request #4303 from crookedneighbor/develop Blade Barringer 2014-11-30 10:54:32 -0600
  • 44baa822c8 Adjusted ng-hide so users cannot block themeselves Blade Barringer 2014-11-30 10:50:39 -0600
  • 6520caed7d Modified to 15px border and lock icon based on feedback from dev team pollockjj 2014-11-29 21:56:10 -0600
  • 0f3070e334 Allow send messages to yourself - see #4295 negue 2014-11-30 01:52:46 +0100
  • 9abaedc7c5 Modified two-line solution for ticket #4261 to one-line based on feedback/solution from B. Barringer pollockjj 2014-11-29 13:17:54 -0600
  • 70c7894354 Merge pull request #4295 from crookedneighbor/do-not-send-private-messages-to-system negue 2014-11-29 19:56:02 +0100
  • e4b2351b42 Removed extraneous space Blade Barringer 2014-11-29 12:53:19 -0600
  • 223cac838e Added one time binding to ng-if Blade Barringer 2014-11-29 12:52:34 -0600
  • 3a29eef799 Removed pm symbol if sent by own user Blade Barringer 2014-11-29 12:30:15 -0600
  • e0f09cd468 Removed option to send private message if it would go to system. Closes Blade Barringer 2014-11-28 19:48:31 -0600
  • 1a567ce82f Changes to address github ticket: Differentiate Locked and Unlocked Backgrounds (#4261). Added two new background-specific styles to customizer.styl and utilized them in profile.jade by checking for ownership of the asset and displaying a border or not, as appropriate pollockjj 2014-11-29 12:25:21 -0600
  • 3204418af1 Revert #4291 Tyler Renelle 2014-11-29 09:16:44 -0700
  • 5823a25d06 cleanup 20140829_change_headAccessory_to_eyewear.js Tyler Renelle 2014-11-29 09:05:27 -0700
  • 192110e25a grunt Tyler Renelle 2014-11-29 09:04:58 -0700
  • e63f2b6d97 Merge remote-tracking branch 'remotes/Alys/eyewear1' into develop Tyler Renelle 2014-11-29 08:33:28 -0700
  • 5ee9f4904a Merge remote-tracking branch 'remotes/Alys/eyewear1' into develop Tyler Renelle 2014-11-29 08:26:23 -0700
  • 391bd76c03 Merge pull request #4294 from crookedneighbor/indentation-error Tyler Renelle 2014-11-29 08:18:36 -0700
  • e4478355bc Merge pull request #372 from ShilohT/gear Alice Harris 2014-11-29 21:00:12 +1000
  • 9a1b209da1 Corrected indentation error Blade Barringer 2014-11-28 19:41:11 -0600
  • eb27a76709 feat(thanksgiving): revert npcs back to normal Tyler Renelle 2014-11-28 18:34:36 -0700
  • 607c72049c Merge pull request #4291 from sbreiler/develop Matteo Pagliazzi 2014-11-28 20:51:04 +0100
  • 5011ae63c1 Merge branch 'develop' of https://github.com/HabitRPG/habitrpg into develop benmanley 2014-11-27 23:47:38 +0000
  • 0d7b05dbc6 resolve merge conflict benmanley 2014-11-27 23:47:28 +0000
  • 28b25c6b89 Fix #4259 (always 100% long bars in IE11) Steffen Breiler 2014-11-27 22:55:01 +0100
  • 64a76566a0 Fix #4259 (always 100% long bars in IE11) Steffen Breiler 2014-11-27 22:52:03 +0100
  • a1ea6869b7 Fix #4259 (always 100% long bars in IE11) Steffen Breiler 2014-11-27 22:47:52 +0100
  • 1c70a5bad5 upgrade angular-ui-router Tyler Renelle 2014-11-27 12:12:36 -0700
  • 17f3868b96 Merge pull request #374 from SabreCat/turkey Tyler Renelle 2014-11-27 12:13:05 -0700
  • 60bf777668 grunt Tyler Renelle 2014-11-27 12:11:14 -0700
  • a4a94f7973 fix(event): grunt Sabe Jones 2014-11-27 09:13:20 -0600
  • d37dd90484 fix(event): Festify missed NPCs Sabe Jones 2014-11-27 09:05:21 -0600
  • 50b1cba0a6 refactor(tasks) improve UI consistency benmanley 2014-11-27 10:32:57 +0000
  • 68305eb6d8 Nerfed Burst of Flames and Backstab; Buffed Tools ShilohT 2014-11-27 02:22:43 -0500
  • 0a4dc94474 Merge pull request #370 from Alys/gem-cap-message-2014-11-25 Alice Harris 2014-11-27 14:46:23 +1000
  • a86b92f5a0 Standardized text in gear.json ShilohT 2014-11-26 23:26:30 -0500
  • a8cf102610 feat(thanksgiving): add migration for turkey mounts / pets Tyler Renelle 2014-11-26 19:12:59 -0700
  • eb80bdf3e0 grunt(turkey-mount) Tyler Renelle 2014-11-26 19:10:22 -0700
  • be3342cb26 feat(event): Thanksgiving Bailey Sabe Jones 2014-11-26 19:34:16 -0600
  • 645327b9b0 feat(event): Thanksgiving updates Sabe Jones 2014-11-26 19:33:01 -0600
  • 212868010c bugfix: all-market-poptop breaks on the left side Taldin 2014-11-26 14:17:42 -0800