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

2147 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tyler Renelle 2a78fb5ea9 Revert "deploying in process.env.NODE_ENV='development' until we can fix #840" 
This reverts commit 6aba44c43d.
 2013-05-10 10:29:33 +01:00
Tyler Renelle 8aee3c7446 chat: small cleanup.hmmm, how to handle duplicates? see https://workflowy.com/shared/3ca12ef1-8335-f196-1b74-c1955402c5f5/ 2013-05-09 14:29:09 +01:00
Tyler Renelle 8db131dbda Merge branch 'master' into develop 2013-05-09 13:59:49 +01:00
Tyler Renelle 1e8adc7e17 tags: add clear-filters button so you can reset filters, but primarily 
to fix #918 (stopgap)
 2013-05-09 13:59:37 +01:00
Tyler Renelle e0e9c5eac4 remove unecessary package.json bits 2013-05-09 10:54:27 +01:00
Tyler Renelle 6aba44c43d deploying in process.env.NODE_ENV='development' until we can fix #840 2013-05-09 09:56:49 +01:00
Tyler Renelle fdb2f2510c remove nix-drop-limit from development 2013-05-09 09:56:05 +01:00
Tyler Renelle d92157cf13 why is findOne crapping out on dev? "function(e){return this.where("id").equals(e).findOne()" 2013-05-09 09:27:21 +01:00
Tyler Renelle 2774662474 backer-gear: add bailey alert 2013-05-09 09:14:05 +01:00
Tyler Renelle 6e3328c614 backer-gear: fix styles to use Shaners' shop sprites 2013-05-09 09:13:56 +01:00
Tyler Renelle 3033fa2f3d Merge branch 'backer-gear' of github.com:lefnire/habitrpg into backer-gear 2013-05-09 08:49:04 +01:00
Tyler Renelle f1660a899b Merge pull request #917 from Shaners/backer-gear 
Backer-Only Shop Sprites
 2013-05-09 00:48:54 -07:00
Tyler Renelle 8137e4b2a6 Merge branch 'develop' of github.com:lefnire/habitrpg into backer-gear 2013-05-09 08:40:34 +01:00
Shane Lister bbf08efd44 105x Sprite Sheet and Lowered Shade Helmet 
I made a 105x sized Sprite Sheet but haven't done the new CSS. Could
still be used for some testing with some quick CSS.
 2013-05-08 23:40:12 -07:00
Shane Lister 25e3500f74 Backer-only GIF Timing Adjustments 2013-05-08 22:11:29 -07:00
Shane Lister 4300e04e43 Backer-Only Shop Sprites 2013-05-08 17:02:39 -07:00
Shane Lister d52d6aa026 Merge pull request #13 from lefnire/backer-gear 
Backer-Gear
 2013-05-08 16:39:26 -07:00
Tyler Renelle e95e313e45 temporary shop sprites to test how things work, will replace with 
@Shaners official stuff
 2013-05-08 22:28:17 +01:00
Tyler Renelle ca14a4a153 backer: slight body armor alignment 2013-05-08 21:48:04 +01:00
Tyler Renelle d3fdd051e1 backer: fix pets html, add migration 2013-05-08 21:40:01 +01:00
Tyler Renelle 78944e93ef party: chat - better messages.length check 2013-05-08 21:30:44 +01:00
Tyler Renelle ef9e058f54 party: chat - better messages.length check 2013-05-08 21:30:35 +01:00
Tyler Renelle ba98179ae0 backers: only show backer gear in store if they are backer 2013-05-08 21:30:23 +01:00
Tyler Renelle d7ad379ec1 achievements: extra note on contrib badge 2013-05-08 20:13:47 +01:00
Tyler Renelle 40eb8588ac tags: remove tags from tasks when the tag gets deleted 2013-05-08 17:33:39 +01:00
Tyler Renelle b7a7260952 typo 2013-05-08 16:42:55 +01:00
Tyler Renelle fcc0c4d3f3 add backer pet, move backer styles into its own stylus 2013-05-08 16:24:26 +01:00
Tyler Renelle 5cb5089e58 add backer stuff to stylesheets 2013-05-08 15:55:10 +01:00
Tyler Renelle 981bf3e71a start setting up backer gear in html 2013-05-08 15:42:44 +01:00
Tyler Renelle da4738ac1a move the subscriptions setup into index.coffee 2013-05-08 15:14:41 +01:00
Tyler Renelle 2ebde9bc1a possible fix to dleting models post empty 2013-05-08 15:03:46 +01:00
Tyler Renelle cf3f960c93 tidy up some party-subscription comments 2013-05-08 13:43:14 +01:00
Tyler Renelle 753c81b366 Merge branch 'develop' of github.com:lefnire/habitrpg into develop 2013-05-08 13:21:14 +01:00
Tyler Renelle 14ab8347ad typo 2013-05-08 13:20:22 +01:00
Tyler Renelle a69fdcc369 add migration script to fix rogue parties 2013-05-08 13:14:32 +01:00
Tyler Renelle fedc5b6a0d small functional overhaul of party.coffee to accomodate new party 
subscriptions, still need to run a migration
 2013-05-08 12:47:10 +01:00
Tyler Renelle 745612d2f4 optimize the initial subscription process by first sbuscribing to 
parties. this will require a small overhaul of the party system, which
I'll do next
 2013-05-08 12:17:41 +01:00
Stan Lindsey c78da3cbfb Merge pull request #911 from Shaners/develop 
Backer Only Gear and Pet
 2013-05-07 23:06:15 -07:00
Shane Lister 26b33d7da4 Backer Only Gear 
Animated GIFs and a sprite sheet.
 2013-05-07 17:38:13 -07:00
Shane Lister b47ee65681 Merge pull request #12 from lefnire/develop 
Update my copy
 2013-05-07 17:28:41 -07:00
Tyler Renelle a64c40cd79 smarter, more performant view.fn equipped() function. also paves way 
for backer gear
 2013-05-07 21:07:52 +01:00
Tyler Renelle b2bc54aead Merge branch 'develop' of github.com:lefnire/habitrpg into develop 2013-05-07 17:59:14 +01:00
Tyler Renelle ecf1ee5dea achievements: h5 for prettier titles 2013-05-07 17:53:18 +01:00
Slappybag 5f48658eff Merge branch 'develop' of https://github.com/lefnire/habitrpg into develop 2013-05-07 17:48:09 +01:00
Slappybag 743474e573 CSS Updates: Filters Edit & Party/Tavern Chat 2013-05-07 17:48:00 +01:00
Tyler Renelle 55d9cfec55 add achievement silhouettes, so peopel know what they can achieve - 
FIXME optimize the {} vs {{}}
 2013-05-07 17:22:01 +01:00
Tyler Renelle 3416a9c71b always show achievements tab (we'll just need to do silhouette) 2013-05-07 16:19:28 +01:00
Tyler Renelle 9c061fadc1 apply backer tier to their backer property, add tokens if not already there, disable ads, etc 2013-05-07 16:19:09 +01:00
Tyler Renelle 53d76ed4fb rename csvexport.phy to .py 2013-05-07 16:06:16 +01:00
Tyler Renelle 6bae30a5bc fix some json errors 2013-05-07 14:57:52 +01:00