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

Commit graph

  • 5704b7e818 Merge pull request #148 from tmas/develop Tyler Renelle 2014-02-14 18:50:28 -0700
  • 68b3976b4e chore(i18n): update german locale Matteo Pagliazzi 2014-02-14 20:09:32 +0100
  • 00bece28d4 chore(dependencies): update jquery path Matteo Pagliazzi 2014-02-14 18:46:32 +0100
  • e0193e36c3 chore(dependencies): update jquery parh Matteo Pagliazzi 2014-02-14 18:43:18 +0100
  • fb7b1dca17 Merge branch 'upgrade' into develop Matteo Pagliazzi 2014-02-14 18:36:22 +0100
  • 8f19f225f1 fix(misc): some styles & translations Matteo Pagliazzi 2014-02-14 18:35:21 +0100
  • 1a2ce9d63e chore(i18n): add missing strings Matteo Pagliazzi 2014-02-14 18:34:55 +0100
  • 850c4fda9a fix(tags): span(type='submit') is invalid. But since you can't theme input-groups with input.input-group-addon, let's just make this an ng-click. fixes #2818 Tyler Renelle 2014-02-14 10:33:10 -0700
  • e241429cc3 fix(toolbar): Tweak Settings drop-down Sabe Jones 2014-02-14 08:14:02 -0600
  • 28a744248c fix(feeding): "article" already includes a space Sabe Jones 2014-02-14 08:07:34 -0600
  • 07eef7c723 chore(grunt): bailey valentine Tyler Renelle 2014-02-13 23:29:55 -0700
  • a6b2191927 fix(valentine): what? cards aren't getting added to array first time, only 2nd+. Maybe an issue with markModified? Tyler Renelle 2014-02-13 23:09:00 -0700
  • a33eabf20b chore(bower): angular upgrade => 1.2.12 Tyler Renelle 2014-02-13 22:50:13 -0700
  • 844dc93316 chore(jquery): use updated jquery directory location Tyler Renelle 2014-02-13 21:59:00 -0700
  • 4454204f47 fix(toolbar): Tweak icon popovers Sabe Jones 2014-02-13 20:39:22 -0600
  • 677c83c592 chore(bailey): valentine Tyler Renelle 2014-02-13 18:45:36 -0700
  • fd6eb8724e feat(valentine): valentine event Tyler Renelle 2014-02-13 17:57:00 -0700
  • 608b829d7e feat(valentine): valentine event Tyler Renelle 2014-02-13 17:57:10 -0700
  • 8ba12ef392 chore(contribs_plan): add migration so contribl.lvl >= 7 gets free plan4life Tyler Renelle 2014-02-13 11:54:45 -0700
  • c8faffcc72 fix(css): temp fix for bailey height Tyler Renelle 2014-02-12 22:31:32 -0700
  • 7456f00dc6 feat(toolbar): try with icons instead of text, test against prod / beta & get a vote. Tyler Renelle 2014-02-12 22:17:26 -0700
  • 5501d57e10 fix(toolbar): tweaks Tyler Renelle 2014-02-12 21:51:35 -0700
  • f6abfc67b3 feat(tracking): gems > toolbar separately from wallet Tyler Renelle 2014-02-12 21:44:27 -0700
  • 2750548d35 chore(bailey): bailey for chat notifs & toolbar Tyler Renelle 2014-02-12 21:37:14 -0700
  • c95c6a4c3b chore(modals): remove mathUpdates modal (no longer in use). reference this commit for any future emergency updates Tyler Renelle 2014-02-12 21:24:50 -0700
  • f72cb21300 feat(toolbar): add toolbar featuring navigation, gems / subs, bailey, & chat / invite notifications Tyler Renelle 2014-02-12 21:21:06 -0700
  • ce82be637d feat(groups): add group chat notifications Tyler Renelle 2014-02-12 21:20:42 -0700
  • 33fbc5716b fix(Saddle): Tweak wording Sabe Jones 2014-02-12 20:10:07 -0600
  • 3138c0aee5 fix(spells): Capitalization error Sabe Jones 2014-02-12 20:08:45 -0600
  • be9ad4db84 fix(feeding): Even better phrasing Sabe Jones 2014-02-12 18:54:24 -0600
  • e22f26058e chore(i18n): update german locale Matteo Pagliazzi 2014-02-12 21:06:54 +0100
  • bb852ce9e5 Merge pull request #2827 from HabitRPG/paglias/optimizations Matteo Pagliazzi 2014-02-12 19:21:10 +0100
  • 9ded62c09e Merge pull request #149 from HabitRPG/paglias/optimizations Matteo Pagliazzi 2014-02-12 19:20:56 +0100
  • 0807deb120 fix(typo): active account to active subscription Matteo Pagliazzi 2014-02-12 19:20:06 +0100
  • 99474729aa fix(typo) Matteo Pagliazzi 2014-02-12 19:10:45 +0100
  • bb6931fe83 refactor(grunt): cache gifs Matteo Pagliazzi 2014-02-12 18:08:17 +0100
  • 207d88757d fix(spritesmith): upload spritesmith Matteo Pagliazzi 2014-02-12 15:59:08 +0100
  • ecedb7b547 chore(i18n): update german Matteo Pagliazzi 2014-02-12 15:58:32 +0100
  • 783e874690 Fix positioning of paw sprites benmanley 2014-02-12 14:40:45 +0000
  • fef858d555 refactor(caching): cache emojis and remove gemoji from bower Matteo Pagliazzi 2014-02-12 15:21:40 +0100
  • cddf513359 refactor(grunt): spritesmith cached on server, do not add timestamp to name, remove unused coins icons Matteo Pagliazzi 2014-02-12 15:11:45 +0100
  • 8fdc5327e9 refactor(grunt and caching): cache icon fonts, spritesmith and use icons from spritesmith for coins notification Matteo Pagliazzi 2014-02-12 15:10:22 +0100
  • fb496de42f refactor(caching): only 1 css file, use grunt-contrib-cssmin to rewrite urls Matteo Pagliazzi 2014-02-12 14:34:50 +0100
  • fbe3ecc033 refactor(grunt): simplify run:dev task Matteo Pagliazzi 2014-02-12 13:59:13 +0100
  • aaa230790b Merge branch 'develop' of https://github.com/HabitRPG/habitrpg into develop Matteo Pagliazzi 2014-02-12 10:49:30 +0100
  • 094a4be001 fix(i18n): do not save user language for now Matteo Pagliazzi 2014-02-12 10:49:10 +0100
  • 5c01dbce74 chore(i18n): update german locale removing old strings not updated Matteo Pagliazzi 2014-02-12 10:05:05 +0100
  • ff9d4b886e fix(event-tracking): typo Tyler Renelle 2014-02-11 19:02:20 -0700
  • c0c7095343 Fix typo/phrasing on pet feeding confirmation Sabe Jones 2014-02-11 19:59:37 -0600
  • b093717b8d feat(event-tracking): better page-view tracking via ui-router Tyler Renelle 2014-02-11 18:11:21 -0700
  • 72b6c9bc91 feat(event-tracking): track registration count Tyler Renelle 2014-02-11 17:53:12 -0700
  • 9217b5174a feat(event-tracking): pass ga to server user.ops Tyler Renelle 2014-02-11 17:49:19 -0700
  • 1b2bcc4683 feat(event-tracking): track purchases Tyler Renelle 2014-02-11 17:45:56 -0700
  • c4244bc3b6 fix(misc) Matteo Pagliazzi 2014-02-11 21:43:17 +0100
  • df8a7a9b6e chore(translations): remove all the non translated languages and use the version from transifex for english and german Matteo Pagliazzi 2014-02-11 21:40:58 +0100
  • 65545e4eba chore(i18n): german, remove spaces at the beginning and the at the end Matteo Pagliazzi 2014-02-11 19:56:11 +0100
  • fa2c64d2d8 chore(i18n): prepare english for transifex: remove ending or starting space & _comment strings Matteo Pagliazzi 2014-02-11 19:30:55 +0100
  • 8170ac746f chore(i18n): prepare english for transifex: remove ending or starting space & _comment strings Matteo Pagliazzi 2014-02-11 19:30:35 +0100
  • 19139f562b fix(misc): isStaticPage and debug buttons Matteo Pagliazzi 2014-02-11 18:44:22 +0100
  • 975b516573 fix(css): menu and gems wallet margin Matteo Pagliazzi 2014-02-11 18:37:20 +0100
  • e75a9423d4 Merge pull request #2813 from benmanley/develop Matteo Pagliazzi 2014-02-11 18:10:07 +0100
  • cbb448478e feat(marketing): more copy for mobile Tyler Renelle 2014-02-11 01:34:42 -0700
  • cb079977e6 feat(marketing): start fleshing out the about page with images, content, etc. Create separate videos page Tyler Renelle 2014-02-11 00:51:29 -0700
  • 42766125d5 fix(pets): add questPets to UserSchema.items.mounts too fixes #2814 Tyler Renelle 2014-02-10 19:51:53 -0700
  • bbd9dec8b3 Added attribute associations for stock items Thomas Lord 2014-02-10 21:21:38 -0500
  • 0c99976bf5 fix(event-tracking): stripe sub, not pp Tyler Renelle 2014-02-10 18:54:29 -0700
  • 3cffc5ac02 Merge pull request #147 from chmac/patch-1 deilann 2014-02-10 17:35:48 -0800
  • caa2593edb Typo correction Callum Macdonald 2014-02-11 01:32:46 +0000
  • 39ec102326 Fix alignment of task meta icons (glyphicons) benmanley 2014-02-10 22:22:54 +0000
  • d89fb17b03 feat(event-tracking): track ecommerce events Tyler Renelle 2014-02-10 14:14:45 -0700
  • ebd1df932e fix(bs3): fix to MemberModalCtrl parameter Tyler Renelle 2014-02-10 13:48:34 -0700
  • 2480591444 refactor(bs3): put paypal button back in, use javascript API to construct button on ng-init (since you can't nest script tags) Tyler Renelle 2014-02-10 13:28:16 -0700
  • 2b9089a204 Merge branch 'event-tracking' into develop Tyler Renelle 2014-02-10 13:26:55 -0700
  • f7b4a04a59 feat(event-tracking): add server-side GA tracking for ecommerce events Tyler Renelle 2014-02-10 11:35:33 -0700
  • ffb42906e1 feat(event-tracking): start adding some client-side GA event-tracking Tyler Renelle 2014-02-10 10:39:01 -0700
  • a22e28143f fix(css): lighter columns title Matteo Pagliazzi 2014-02-10 19:04:57 +0100
  • 1c41c4ddb9 fix(css): better food tray Matteo Pagliazzi 2014-02-10 18:38:58 +0100
  • 4a05c36687 Merge pull request #2809 from benmanley/develop Matteo Pagliazzi 2014-02-10 18:35:55 +0100
  • e653d85cb7 adding pertinent info to create party deilann 2014-02-10 05:37:31 -0800
  • 18f922c756 Fix food tray z-index benmanley 2014-02-10 13:30:54 +0000
  • a5467fc931 Merge branch 'develop' of https://github.com/HabitRPG/habitrpg-shared into develop Matteo Pagliazzi 2014-02-09 17:18:22 +0100
  • a8c8b50039 chore(i18n): add base arabic and swedish Matteo Pagliazzi 2014-02-09 17:16:53 +0100
  • a7e3e76daa refactor(bs3): add fixed height modals & panels for quests & group members Matteo Pagliazzi 2014-02-09 16:29:16 +0100
  • 3f28d16478 refactor(bs3): add fixed height modals & panels Matteo Pagliazzi 2014-02-09 16:25:10 +0100
  • 1a44c3cf0c refactor(bs3): css Matteo Pagliazzi 2014-02-09 16:16:43 +0100
  • e7e294333a Merge pull request #140 from luveluen/develop Matteo Pagliazzi 2014-02-09 13:03:03 +0100
  • 757bfa7356 Update pets.json Luveluen 2014-02-09 13:01:11 +0100
  • 5874941b94 refactor(bs3): inventory & misc Matteo Pagliazzi 2014-02-09 12:32:12 +0100
  • 20ed1c3c58 chore(translations): update files Matteo Pagliazzi 2014-02-09 11:26:34 +0100
  • c5b2d28ef9 Merge pull request #2801 from lorian/beastmaster-count Cole Gleason 2014-02-08 22:32:09 -0600
  • a2d01e73aa Merge pull request #138 from lorian/beastmaster-count Cole Gleason 2014-02-08 22:31:50 -0600
  • 914400e159 Simplified run instructions for mocha test. Lorian 2014-02-08 20:19:01 -0800
  • 82b58a7435 dropEggs and questEggs now automatically make the full content.eggs list; no manual duplication required. Lorian 2014-02-08 20:14:50 -0800
  • 04b73c4058 Added unit tests for proper mount counting and beastmaster achievement, and extended unit tests for proper pet counting. Lorian 2014-02-08 17:24:04 -0800
  • 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. Lorian 2014-02-08 16:57:28 -0800
  • c39d2a8a13 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. Lorian 2014-02-08 16:56:07 -0800
  • 3447524d41 refactor(bs3): chat suggestions, revert Matteo Pagliazzi 2014-02-09 00:44:39 +0100
  • e1240dde1d fix(missing-gems): remove ad-removal from script, since ads are part of subscription Tyler Renelle 2014-02-08 10:38:42 -0700
  • 1e3042a4b6 refactor(bs3): maybe fix for chat suggestions Matteo Pagliazzi 2014-02-08 20:23:50 +0100
  • 46053cc520 refactor(bs3): spaces Matteo Pagliazzi 2014-02-08 20:10:37 +0100