Kai/habitica
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
6,123 Commits 64 Branches 1,256 Tags
3189ab92afea79ef8beb606d71cd2a4a9ebbb921
Commit Graph

705 Commits

Author SHA1 Message Date
Blade Barringer 753cac236b Added ng-sanitize 2015-01-19 14:17:43 -06:00
Alice Harris 57637d4271 Merge remote-tracking branch 'upstream/develop' into todos-dated-tab-2014-11-01 
ally if it merges an updated upstream into a topic branch.
 2015-01-19 17:52:54 +10:00
Blade Barringer 1318d0de38 Merge pull request #4451 from crookedneighbor/vIiRuS-groupSorting 
Group Sorting
 2015-01-18 23:08:40 -06:00
Blade Barringer 7c10d27c04 Merge branch 'develop' of github.com:HabitRPG/habitrpg into develop 2015-01-18 15:56:11 -06:00
Blade Barringer 13e89f1947 Added sync after changing username so username would update 2015-01-18 15:55:39 -06:00
Tyler Renelle a44e0f7c31 fix(avatar-sharing): screw it, 1.3.3 backwards compat isn't working at 
the router level anyway. Besides, avatar sharing hasn't worked via
addthis for a while, so we don't need this
 2015-01-18 14:53:18 -07:00
Tyler Renelle a053486fcd fix(avatar-sharing): angular@1.3.9 upgrade fixed the /#?memberId=x 
bug. Also, anon wasn't able to view avatar shares!
 2015-01-18 14:51:40 -07:00
Tyler Renelle 503fd9ff51 refactor(services): remove un-used authService, cleanup authCtrl 2015-01-17 18:59:28 -07:00
Tyler Renelle 2306b7c572 refactor(services): move to a single "habitrpg" module for services / 
directives / filters
 2015-01-17 18:43:37 -07:00
Tyler Renelle 90c7142da5 refactor(config): move httpInterceptor from website/app.js to habitrpg-shared/config.js. 2015-01-16 16:48:53 -07:00
Tyler Renelle 35e8097b0c refactor(challenges): wrap group.challenges as $resources, so they're 
convenience functions $join/$leave/etc can be called directly
 2015-01-15 15:24:02 -07:00
Alice Harris 7660141365 Merge remote-tracking branch 'upstream/develop' into todos-dated-tab-2014-11-01 
Conflicts:
	views/shared/tasks/lists.jade
	views/shared/tasks/task.jade
 2015-01-11 14:15:55 +10:00
Sabe Jones 689b13ecb6 fix(world-boss): Justin not stressed yet 2015-01-09 10:00:16 -06:00
Sabe Jones ee339fba4a feat(event): World boss 
Implements the second HabitRPG world boss, the Abominable Stressbeast of Stoïkalm!
 2015-01-08 15:22:42 -06:00
Blade Barringer eca252a269 Corrected moment code to use new format instead of depreciating format 2015-01-07 10:28:46 -06:00
Blade Barringer ff3d942696 Merge branch 'issue4454try' of https://github.com/melissamcewen/habitrpg into melissamcewen-issue4454try 2015-01-04 16:11:22 -06:00
Tyler Renelle fe1672e82d Merge pull request #4441 from crookedneighbor/stripe-name-error 
Stripe name error
 2015-01-03 15:25:29 -07:00
Melissa Mcewen 9d6d375663 Salt spell d 
oesn't check to see if you have enough Gold #4454 adjusting check
 2015-01-01 14:31:11 -06:00
Melissa Mcewen cf40ef8a72 Salt spell doesn't check to see if you have enough Gold #4454 check if spell uses gold 2014-12-31 20:37:54 -06:00
Melissa Mcewen 37a6091638 Salt spell doesn't check to see if you have enough Gold #4454 2014-12-31 19:29:08 -06:00
Sabe Jones d1355faa31 Merge pull request #4452 from SabreCat/nye 
New Year's event features
 2014-12-30 22:18:11 -06:00
Tyler Renelle edf66cbb59 feat(discount) google discount & use sub.key instead of sub.months 2014-12-30 20:05:07 -07:00
Sabe Jones 51acc477fe feat(NYE): New Year's cards 2014-12-30 19:57:24 -06:00
Blade Barringer a8888a0a53 Added last logged in choice for sorting 2014-12-30 13:05:55 -06:00
Blade Barringer b4975bb8a4 Merge branch 'groupSorting' of https://github.com/vIiRuS/habitrpg into vIiRuS-groupSorting 
Conflicts:
	public/js/controllers/headerCtrl.js
	views/options/social/group.jade
 2014-12-30 12:57:32 -06:00
Blade Barringer 33e5802333 Added image to stripe checkout 2014-12-29 20:35:07 -06:00
Blade Barringer ffa8072800 Made name field HabitRPG so sms will be correct. Uncomented description 
and put the old name field
 2014-12-29 20:31:59 -06:00
Sabe Jones 53fff0dbc6 feat(seasonal): Implement Snowball 
Adds the snowball from Winter 2014 to the Seasonal Shop.
 2014-12-29 19:40:11 -06:00
Blade Barringer ae8542eaf1 Removed extraneous console logs left while testing 2014-12-29 15:50:44 -06:00
Blade Barringer efba545147 Merge branch 'develop' of github.com:HabitRPG/habitrpg into develop 2014-12-29 15:44:06 -06:00
Blade Barringer b3025c36b1 Fixed checklist not advancing to next input. Closes #4430 2014-12-29 15:43:20 -06:00
Matteo Pagliazzi 756fa83418 fix(date): typo 2014-12-29 22:26:12 +01:00
Matteo Pagliazzi cb13b5ac26 fix(date): add YYYY/MM/DD format 2014-12-29 22:16:58 +01:00
Matteo Pagliazzi 3105b61cb5 Merge branch 'Verabird-dateformat' into develop 2014-12-29 21:24:44 +01:00
Matteo Pagliazzi 4a37bec652 fix(pr): indentation and simplify 2014-12-29 21:21:54 +01:00
Blade Barringer 4e1b298a42 Corrected spelling error in comment 2014-12-29 14:16:25 -06:00
Matteo Pagliazzi 752161b284 Merge branch 'dateformat' of git://github.com/Verabird/habitrpg into Verabird-dateformat 2014-12-29 21:09:04 +01:00
Negue a082e88b5d Filter Array only once and one time binding - closes #4429 2014-12-27 23:26:30 +01:00
Blade Barringer 2bb1e5cf7f Merge branch 'confirm-delete' into develop 2014-12-26 21:04:48 -06:00
Blade Barringer 695c463b40 Added confirmation dialog before deleting message 2014-12-26 21:04:22 -06:00
Alice Harris af7e68259d Merge pull request #4404 from sbreiler/develop 
Fix #4296 (Subscription "Update Card" message is cut off)
 2014-12-27 12:29:04 +10:00
Verabird 8852ad61b2 Add dateFormat preference field to user model and make settingsCtrl change the field when form is changed 2014-12-26 15:52:42 -05:00
Verabird 7297429888 Make it possible to choose between MM/dd and dd/MM date format 2014-12-26 15:52:42 -05:00
Sabe Jones 0e28f04c90 feat(event): Implement Seasonal Shop 2014-12-25 14:33:11 -06:00
breiste e1eaefa943 Fix #4296 (Subscription "Update Card" message is cut off) 2014-12-24 00:14:08 +01:00
Blade Barringer 9406b3cf70 Removed unnecessary console.log 2014-12-18 22:36:52 -06:00
Blade Barringer 7f10049b37 Merge branch 'develop' of github.com:HabitRPG/habitrpg into add-flag-to-chat 
Conflicts:
	views/options/social/chat-message.jade
 2014-12-18 21:55:50 -06:00
Sabe Jones eadedd5897 Merge pull request #4383 from SabreCat/seasonal 
Seasonal Shop Basics
 2014-12-16 21:51:02 -06:00
Blade Barringer 9cdbca8c2b Reverted routing for groups back 2014-12-14 20:05:01 -06:00
Blade Barringer d1b1a866ac Fixed when routing. Closes #4371 2014-12-14 19:01:52 -06:00