sudoxreboot/habitica
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica.git synced 2026-08-03 08:21:07 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
8741 commits 3 branches 0 tags 1.6 GiB
Commit graph

8741 commits

This branch
This branch
All branches
Author SHA1 Message Date
Alys
e9062c31a2 Merge pull request #4913 from galarant/apply-level-cap-to-stats-display 
front end reflects level cap for stats bonus
 2015-03-26 17:49:45 +10:00
Alys
20726e3c0f Merge pull request #4873 from gisikw/repair_broken_test_suite 
Repair Broken Test Suite - Full Passing Tests
 2015-03-26 14:49:28 +10:00
Sabe Jones
325c8cabd9 Merge pull request #4917 from SabreCat/eggy-eggy 
March Subscriber Item and Egg Quest Updates
 2015-03-25 22:54:06 -05:00
Sabe Jones
75ab7427fc chore(grunt): Eggy eggy sprites 2015-03-25 22:12:55 -05:00
Sabe Jones
4f89f68797 fix(mounts): Eggy eggy basket 2015-03-25 22:10:51 -05:00
Sabe Jones
63d6a43702 fix(pets): Eggy eggy progress bar 2015-03-25 22:03:46 -05:00
Sabe Jones
77cc05a668 fix(pets): Eggy eggy feed 2015-03-25 22:01:42 -05:00
Sabe Jones
54778a5d0c fix(debug): Eggy eggy break 2015-03-25 21:42:06 -05:00
Sabe Jones
44a56ae0b2 fix(March): Eggy eggy quest 2015-03-25 21:19:34 -05:00
Sabe Jones
354872decb feat(March): Eggy eggy cont'd 2015-03-25 20:46:27 -05:00
Sabe Jones
b24dbe9b86 feat(March): Eggy eggy mystery 2015-03-25 19:53:07 -05:00
Matteo Pagliazzi
de972eebc0 change email priority 2015-03-25 21:24:09 +01:00
Matteo Pagliazzi
488cd8852b move invites to quest to batch mode 2015-03-25 18:11:21 +01:00
Matteo Pagliazzi
ab0c5106a1 move quest-started email to batch mode 2015-03-25 17:52:15 +01:00
Matteo Pagliazzi
f470bcd1e1 add support for personal merge vars and move RECIPIENT_NAME to use them 2015-03-25 17:39:28 +01:00
Matteo Pagliazzi
6e4818cf62 chore(i18n): update locales 2015-03-25 16:53:56 +01:00
kholliday
1a6b828e05 Moved dropClass to correct scope. 2015-03-25 07:49:49 -05:00
Alys
0fc158be2e Merge pull request #4893 from TheHollidayInn/checklist-removed-backspace-delete 
Removed delete function when user hits backspace/delete
 2015-03-25 18:00:31 +10:00
Alys
e7c0c370ee Merge pull request #4909 from TheHollidayInn/notify-user-empty-task 
Added tooltip for when a task is empty
 2015-03-25 17:59:20 +10:00
Kevin Gisi
7bed1efb21 Revised Grunt translations task to use build:test 
* Added build:test task to generate translation JS for tests.

* Removed test/spec/translations.js from the repository, added to .gitignore.

* Updated test/run_tests.sh to run build:test, and accept an optional argument
  to run a particular test suite.
 2015-03-24 21:39:03 -04:00
Kevin Gisi
1e59336d09 Repair remaining Karma specs - all passing. 
* Stubbed out User module to repair rootCtrlSpec

* Loaded RootCtrl in inventoryCtrlSpec, as it was missing shared functions.
  Updated mock user to include a mounts hash.
 2015-03-24 21:39:03 -04:00
Kevin Gisi
2194caec15 Repaired groupServicesSpec, uncommented specs. 
As it turns out, the page reload behavior was not caused by $resource, but
exists somewhere within the User module. Stubbed out the User module as as done
in notificationServicesSpec
 2015-03-24 21:39:03 -04:00
Kevin Gisi
09b6401794 Add translations to Karma specs 
* Added a task to Gruntfile to use website/src/i18n.js to generate a small JS file to be loaded in Karma env which sets window.env.translations to the i18n.translations['en'].

* Added new Grunt task to build:dev

* Updated Karma specs to reenable testing where possible, updating comments where not.
 2015-03-24 21:39:03 -04:00
Kevin Gisi
f41933b7a1 Repair Broken Test Suite - Full Passing Tests 
* Repair broken e2e test introduced in 8d03cfc (copywriting change was not
  reflected in the spec)

* Updated i18n.coffee code to be more cautious (it expected the 'en' locale
  would always be available, but provides appropriate error handling as-is).

* Extended timeout duration for protractor, as registration was slightly above
  30s.

* Added karma-mocha-reporter as a dev dependency to ensure test visibility.
 2015-03-24 21:39:03 -04:00
Tyler Renelle
10ce0a622b fix(tour): updated tour steps copy 2015-03-24 18:07:40 -06:00
Jeff
a40a374eb5 front end reflects level cap for stats bonus 2015-03-24 19:53:13 -04:00
Tyler Renelle
d3ebc03865 feat(tour): add tour counter 2015-03-24 15:41:44 -06:00
Tyler Renelle
560d51b2e2 feat(tour): esc force closes, but puts justin head in toolbar. clicking 
justin head brings tour back.
 2015-03-24 15:41:44 -06:00
kholliday
a7873a41a1 Added icons to Notification for the item that is dropped. 2015-03-24 16:28:24 -05:00
Matteo Pagliazzi
4c3ad2f705 chore(i18n): update locales 2015-03-24 22:09:48 +01:00
kholliday
23e7a8e258 Added check for user object to prevent errors 2015-03-24 08:54:45 -05:00
kholliday
e5cd319ef5 Changed empty task messageand added style. 2015-03-23 20:18:14 -05:00
kholliday
9a157eea8c Added tooltip for when a task is empty 2015-03-23 19:36:37 -05:00
kholliday
1a725c0515 Added Conditional Semantics to group member query to always include the user 2015-03-23 15:17:21 -05:00
Matteo Pagliazzi
98220ed0e5 Merge pull request #4906 from gkjt/guildJoinRedirectFix 
Changed guild notification redirect to guilds/public instead of /guilds.
 2015-03-23 21:07:06 +01:00
George Tucker
84b2e39b0b Changed notification redirect to guilds/public instead of /guilds. Fixes #4902. 2015-03-23 17:59:38 +00:00
Tyler Renelle
7c102c577b tmp(robots.txt): temporarily remove robots.txt, not working in current state 2015-03-23 11:45:55 -06:00
Alice Harris
160b19eb70 remove growl notification about party settings saved after changing party order (not needed now that avatars in head are resorted immediately) 2015-03-22 17:50:22 +10:00
Alys
849ef6d862 Merge pull request #4822 from benschenker/fix-stats-rounding 
Fix Mana rounding on the stats page. Fixes #4820
 2015-03-22 17:42:07 +10:00
Matteo Pagliazzi
b756e8e462 chore(i18n): update locales 2015-03-21 11:07:13 +01:00
Alice Harris
5c2818e68a remove message about when the survey achievements badges will be awarded 2015-03-21 19:28:29 +10:00
Tyler Renelle
5de42b03c9 fix(analytics): remove testing code 2015-03-20 17:03:01 -06:00
Sabe Jones
fbcf8e9a6f Merge pull request #4895 from SabreCat/spring2015 
Spring Fling 2015
 2015-03-20 17:29:02 -05:00
Sabe Jones
3f4bddc57d fix(tour): Try k 2015-03-20 17:22:12 -05:00
Sabe Jones
18649144a8 feat(tour): Early quit classes tour 2015-03-20 17:18:48 -05:00
Sabe Jones
58db06c515 chore(grunt): Compile 2015-03-20 15:53:42 -05:00
Sabe Jones
f065feb6cb fix(mouse): Missing ears 2015-03-20 15:50:22 -05:00
Tyler Renelle
009b582f25 feat(analytics): add A/B testing on play button using GA's Experiments 
API. Revert this after the experiment
 2015-03-20 14:44:47 -06:00
Sabe Jones
ae25af7c02 fix(shop): Enable head accessories 2015-03-20 15:27:56 -05:00
Sabe Jones
e2b1083088 fix(spring): Tweaks 2015-03-20 15:19:37 -05:00