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

1760 Commits

Author SHA1 Message Date
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 a7e3e76daa refactor(bs3): add fixed height modals & panels for quests & group members 2014-02-09 16:29:16 +01: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
Lorian 322b257b72 Separated stable into dropped pets, quest pets, and rare pets, and made countPets only count the former. Made countMounts only count dropped and quest-hatched mounts, not rare mounts. 2014-02-08 16:57:28 -08:00
Matteo Pagliazzi 46053cc520 refactor(bs3): spaces 2014-02-08 20:10:37 +01:00
Matteo Pagliazzi f3c42f19ab refactor(bs3): hall form 2014-02-08 20:07:37 +01:00
Matteo Pagliazzi 5e98fa013d refactor(bs3): typo 2014-02-08 19:56:31 +01:00
Matteo Pagliazzi b4be88f4e0 refactor(bs3): misc 2014-02-08 19:49:47 +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 ee871ccb01 refactor(bs3): fixes 2014-02-08 16:58:41 +01:00
Matteo Pagliazzi 0fe0cb4f2d refactor(bs3): labels style and text, buttons classes 2014-02-08 16:27:34 +01:00
Tyler Renelle 313ec3d869 Merge branch 'develop' into bs3 
Conflicts:
	views/options/social/tavern.jade
 2014-02-07 23:41:14 -07:00
Tyler Renelle 5db96ebca2 fix(bs3): port pet feeding bar 2014-02-07 21:57:26 -07: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
deilann 25941623b1 putting in issue ticket 
correctly putting in issue ticket for "report a bug"
 2014-02-07 17:44:56 -08: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
Tyler Renelle d034262834 feat(premium): subscriber mystery item (doesn't yet do anything) 2014-02-07 11:40:34 -07:00
Tyler Renelle 82d9233d99 feat(rainbow-hair): add rainbow hair colors 2014-02-07 10:01:31 -07:00
Tyler Renelle ce8351d622 chore(Merge): branch 'develop' into origin-paglias-bs3 
Conflicts:
	views/options/social/tavern.jade
 2014-02-07 00:03:33 -07:00
deilann 66c7f48e2b updating LFG 
Updating Looking for Group to the proper (not dead) link.
 2014-02-06 11:37:35 -08:00
Matteo Pagliazzi d313a46299 refactor(bs3): push footer down 2014-02-06 18:46:43 +01: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 b6edc28b14 refactor(bs3): merge develop 2014-02-06 16:19:51 +01:00
Marcelo Sizer 386d108c3c Replace hard-coded strings for window.env.t on js files 2014-02-05 20:43:49 -02:00
deilann 908a5a2408 updating tavern link to new issue ticket 
Explains how Github works. Should reduce number of dupe tickets.
 2014-02-05 13:07:56 -08:00
Matteo Pagliazzi 5b9bbb9729 refactor(bs3): settings 2014-02-05 19:54:50 +01:00
Matteo Pagliazzi 0cc31465ed refactor(bs3): challenges 2014-02-05 19:39:26 +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 b89081dd41 refactor(bs3): misc fixes 2014-02-04 20:18:27 +01:00
Matteo Pagliazzi 685b7a3cd2 Merge branch 'develop' into paglias/bs3 2014-02-04 20:16:00 +01:00
Tyler Renelle 07a47d353d Merge pull request #2666 from marcgenesis/develop 
Fixed inventory alignment. Issue #2158
 2014-02-04 11:00:52 -08: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
Tyler Renelle 2e2fcfcf46 fix(swagger): fix jade script warning in swagger 2014-02-03 11:53:52 -07:00
Tyler Renelle 4d32092e8f refactor(addthis): remove superfluous addthis inclusion 2014-02-03 11:53:32 -07:00
Tyler Renelle 67ee011aa3 fix(footer): ensure window.env is accessible from static pages, so we 
can get deferred scripts on frontpage (esp google analytics)
 2014-02-03 11:43:03 -07:00
Matteo Pagliazzi 56133894d8 refactor(bs3): sync with develop 2014-02-03 18:45:25 +01:00
Tyler Renelle f8796e9028 feat(winter): remove purchasable winter hair colors, keep available if 
they purchased during event
 2014-02-02 23:17:54 -07:00