Kai/habitica
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
3,035 Commits 64 Branches 1,256 Tags
afcd2b38036c27f59ceead7645f4c8abd1d3c4c2
Commit Graph

3035 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Shane Lister afcd2b3803 Rare Pets Layout 
Shows rare pets header always.

Shows golden missing rare pet graphic if Hydra not obtained with link to how to obtain it.
 2013-10-30 23:10:03 -07:00
Shane Lister d7b24883b4 Update pets.jade 2013-10-27 19:21:40 -07:00
Shane Lister d2af7a442a Add Contributor Only Pet Choice 
This PR https://github.com/HabitRPG/habitrpg-shared/pull/33 should completed before this one.
 2013-10-26 19:56:18 -07:00
Matteo Pagliazzi d336c65633 Merge branch 'develop' of https://github.com/lefnire/habitrpg into develop 2013-10-26 18:16:38 +02:00
Matteo Pagliazzi 6b23530caa fix typo 2013-10-26 18:16:16 +02:00
Tyler Renelle 5d14a1811f Merge pull request #1637 from ozymandiasthegreat/manual-due-date 
Manual due date
 2013-10-24 12:45:42 -07:00
Matteo Pagliazzi 29f5eb5293 remove self from group after sending invite, fix #1509 2013-10-24 21:38:25 +02:00
Tyler Renelle ef972bf70d [#1540] add restore option for streak achievement 2013-10-24 11:04:35 -07:00
Tyler Renelle c7c8338316 Merge pull request #1642 from Shaners/develop 
Adds red hair option for web.
 2013-10-24 10:10:27 -07:00
Matteo Pagliazzi 1f8915f5de add api.deleteTag to batch update operations 2013-10-24 18:21:34 +02:00
Matteo Pagliazzi 211433858c correctly remove tag from task 2013-10-24 17:50:35 +02:00
Matteo Pagliazzi 715e4e42a5 remove console.log 2013-10-24 17:50:24 +02:00
Matteo Pagliazzi 3a45e72138 fix group chat syncing 2013-10-24 14:44:08 +02:00
Shaners 5fa398780f Adds red hair option for web. 2013-10-24 00:03:09 -07:00
J. Ozymandias Fallick 22b429242f Merge remote-tracking branch 'upstream/develop' into manual-due-date 2013-10-23 14:34:36 -04:00
Tyler Renelle b23ce8426b fix to editing profile: "TypeError: Cannot call method 'toString' of undefined" 2013-10-23 10:25:43 -07:00
Matteo Pagliazzi fe52731393 fix small error on startup 2013-10-23 18:49:14 +02:00
Matteo Pagliazzi 20f2d75bbf add streak achievement notification 2013-10-23 17:57:02 +02:00
Matteo Pagliazzi f56b76b5ae Merge branch 'develop' of https://github.com/lefnire/habitrpg into develop 2013-10-23 16:38:37 +02:00
Matteo Pagliazzi 0c7ba32c6b fix #1635 2013-10-23 16:38:05 +02:00
Tyler Renelle 9397c13960 add an "oh-shit" backtrack migration 2013-10-22 20:56:13 -07:00
Tyler Renelle 5c4c4ae252 typo in donate page 2013-10-22 20:55:55 -07:00
Tyler Renelle 619a15b316 gem icon for unlock-set as well 2013-10-22 19:33:55 -07:00
Tyler Renelle 077850b172 halloween: explicit gems instead of 'G' 2013-10-22 19:22:32 -07:00
Tyler Renelle 44cb797063 migrate: flags.ads -> purchased.ads (boolean); flags.newStuff to boolean 2013-10-22 18:50:50 -07:00
Tyler Renelle c40697761b halloween: fix to transient skin set 2013-10-22 18:16:23 -07:00
Tyler Renelle f59d5b056c Merge branch 'halloween' into develop 2013-10-22 17:57:57 -07:00
Tyler Renelle e7886e00b4 halloween: highlght limited skins, add description about limited, rename 
to "rainbow" and "spooky" @lemoness
 2013-10-22 17:56:46 -07:00
Tyler Renelle b90aadf7ab update bailey notif 2013-10-22 16:52:54 -07:00
Tyler Renelle 2c7fc72419 better modal indenting 2013-10-22 16:33:06 -07:00
Tyler Renelle b3853800a3 remove Ultra Mega Update (since we've been live for a long time). Add 
bailey notif for halloween, update contrib gear wording as per @lemoness recommendation
 2013-10-22 16:28:13 -07:00
Tyler Renelle a1959a9beb halloween: use halloween npcs habitrpg-shared@0ffd265 2013-10-22 16:20:37 -07:00
Tyler Renelle 534a761875 remove customizer css, moved to habitrg-shared@06e489d 2013-10-22 16:19:54 -07:00
Tyler Renelle ec50c7d0ec halloween fix to 401 error 2013-10-22 14:46:58 -07:00
Tyler Renelle 2c1d8e1688 halloween: functional new skins for female sprites (requires habitrpg-shared@d7482fe) 2013-10-22 14:32:51 -07:00
Tyler Renelle 6f32ac2a24 halloween: purchase full set 2013-10-22 13:59:30 -07:00
Tyler Renelle 619c00fb5c halloween: some unlocking bug fixes (appears a markModified was required) 2013-10-22 13:37:55 -07:00
Tyler Renelle d184237c79 halloween: begin adding mechanic for the special skins 2013-10-22 13:24:31 -07:00
Matteo Pagliazzi 18c06b5043 user top right button should not cover notifications, they can be closed with a click on the "x" 2013-10-21 20:44:31 +02:00
Matteo Pagliazzi c4882942d6 fix chart shown below task edit form 2013-10-21 20:41:19 +02:00
Matteo Pagliazzi cc05926e6b do not log "Reply sent" after every user update 2013-10-21 17:51:14 +02:00
Tyler Renelle 00b47dfd35 Merge pull request #1622 from djuretic/develop 
Add tests for memberServices
 2013-10-20 00:27:22 -07:00
Tyler Renelle b55cb1ccdb bailey update for skin tones, 0.0.10, selling drops. @lemoness this is 
the new format (jade), hit me offline for a tour
 2013-10-20 00:13:50 -07:00
Tyler Renelle 2cf814acd6 drops: description on combining eggs/potions, selling to 
alex. de-selectable drops. sell in a button of alex's dialog
 2013-10-19 23:44:03 -07:00
Tyler Renelle e4f2a4386d eggs: bug fixes on selling potions 2013-10-19 20:22:12 -07:00
Tyler Renelle c882525150 eggs: add ability to sell potions / eggs 2013-10-19 20:04:26 -07:00
Tyler Renelle 017398eb83 eggs: some cleanup and passing around of $index so we can retrieve 
egg/pot value
 2013-10-19 19:58:11 -07:00
Tyler Renelle 378d158a44 pegs: restructure inventory/market html so we market is aware of 
inventory and we can sell items
 2013-10-19 19:36:59 -07:00
Dušan Juretić bb4350fb52 add tests for memberServices 2013-10-19 23:33:27 -03:00
Tyler Renelle be624a03b0 pets: basic framework for selecting both eggs & potions. now it shows which is hatchable with green background, setting up for selling eggs 2013-10-19 19:30:39 -07:00