Commit Graph

8567 Commits

Author SHA1 Message Date
Tyler Renelle 8b04773b2e feat(auth): update manual_password_reset so can pull creds from
config.json, and email from CLI. Much easier when updating en-masse
2015-03-12 13:47:37 -06:00
Tyler Renelle 6ed0ff289f feat(auth): add manual_password_reset migration 2015-03-12 12:22:33 -06:00
Matteo Pagliazzi 8bc5ed83cb chore(i18n): update locales 2015-03-12 16:26:45 +01:00
Tyler Renelle 1687d9aeda feat(auth): 404 on "can't find email" 2015-03-11 18:12:30 -06:00
Alice Harris 9ac0ef0202 explain when survey participants will get their badge 2015-03-12 07:34:01 +10:00
Sabe Jones 676562cfad Revert "fix(emoji): move back to main jsemoji repo, fixes #4265"
This reverts commit 89b1242e53.
2015-03-10 22:05:24 -05:00
Tyler Renelle de67f44e1f Merge pull request #4713 from HabitRPG/lefnire/interactive-tour
Interactive Tour
2015-03-10 19:23:01 -06:00
Sabe Jones c86257b585 Merge pull request #4834 from SabreCat/surveys
Survey achievement update
2015-03-10 19:12:06 -05:00
Sabe Jones 3a9e2a5123 fix(surveys): Visibility tweaks 2015-03-10 19:08:10 -05:00
Sabe Jones 53df85e01b fix(surveys): Fix malformed Angular 2015-03-10 18:47:21 -05:00
Sabe Jones 9cfa27f089 feat(surveys): Survey achievement
Updates the "Helped Habit Grow" achievement to be stackable. Also includes miscellaneous Bailey announcements for 3/10.
2015-03-10 18:39:00 -05:00
Alice Harris 3bd0b57efa add semi-colon at end of line; remove apostrophe from comment 2015-03-11 09:29:44 +10:00
Alys 63c57cce5d Merge pull request #4785 from AAorris/develop
Allow for client notifications to user settings
2015-03-11 08:20:51 +10:00
Tyler Renelle 962bb65608 tmp(interactive-tour): temporarily remove Hide button 2015-03-10 15:40:19 -06:00
Tyler Renelle 16e996c971 fix(interactive-tour): "Buy the Training Sword" 2015-03-10 15:40:19 -06:00
Tyler Renelle bbbec78bff tmp(interactive-tour): hide "Show Tour" temporarily #4726 2015-03-10 15:40:19 -06:00
Tyler Renelle 63a6af6e0a fix(interactive-tour): small updates per
https://github.com/HabitRPG/habitrpg/issues/4726#issuecomment-77643235
2015-03-10 15:40:19 -06:00
Tyler Renelle aee1a3cd6f fix(interactive-tour): just set everyone to "off" for tour on initial migration 2015-03-10 15:40:19 -06:00
Tyler Renelle 98f50374c9 fix(interactive-tour): "hide" on the left, nav on the right 2015-03-10 15:40:19 -06:00
Tyler Renelle a7232b5abe fix(interactive-tour): cleanup steps when navigating chapters, don't use tour.restart() 2015-03-10 15:40:19 -06:00
Tyler Renelle 232224c497 fix(interactive-tour): don't automatically show guide when on mobile devices 2015-03-10 15:40:19 -06:00
Tyler Renelle 62739346c7 tmp(interactive-tour): add "ok" to each step, see #4726 2015-03-10 15:40:18 -06:00
Tyler Renelle d84549e239 feat(interactive-tour): disable ads till lvl 2 2015-03-10 15:40:18 -06:00
Tyler Renelle 812493fec5 feat(tour): Refactor the Justin Guide to be much more streamlined and interactive. Backdrop focuses user on present task. Chapterized guides 2015-03-10 15:40:18 -06:00
Tyler Renelle c5240da81f perf(robots): add robots.txt, see #4746 2015-03-10 14:31:00 -06:00
Tyler Renelle 0c63f6cb7d fix(auth): upgrade facebook to Graph API 2, fixes #4832 2015-03-10 14:11:28 -06:00
Blade Barringer 3830a39804 Removed invite button on challenges page. Closes #4796 2015-03-09 16:39:20 -05:00
Blade Barringer 9c43a7da22 chore(grunt compile:sprites) 2015-03-09 16:34:55 -05:00
Blade Barringer 60a62a282e fix(sprite) Added correctly sized image for iron knight. Closes #4824 2015-03-09 16:33:31 -05:00
Blade Barringer 9e6c268a97 chore(grunt compile:sprites) 2015-03-09 13:42:35 -05:00
Blade Barringer e918aa158d feat(mystery items) March subscriber sprites added 2015-03-09 13:42:21 -05:00
Blade Barringer 934a33ee5b Merge pull request #4671 from crookedneighbor/fix-tests
Fix some api tests (WIP)
2015-03-08 20:58:11 -05:00
Matteo Pagliazzi 1b53aeaee8 increase timeout when usubscribing from email 2015-03-08 16:25:19 +01:00
Blade Barringer 1f8ccf1f65 Merge pull request #4818 from lejeunerenard/fix-tests
Fixed MongoDB service and added Karma tests to Travis-CI
2015-03-07 16:50:50 -06:00
Sean Zellmer 5ab2cb0908 Use PhantomJS and run karma in Travis-CI 2015-03-07 16:37:35 -06:00
Sean Zellmer b507a0fe3a Add mongodb as a service for Travis-CI builds 2015-03-07 16:26:13 -06:00
Blade Barringer 6f8133d760 Corrected indentation of purchase test 2015-03-07 16:23:56 -06:00
blade 35f98993c4 Skipping groups test in api for now, revisit later 2015-03-07 16:09:56 -06:00
Blade Barringer 6ab024619b Merge pull request #4817 from lejeunerenard/fix-tests
WIP
2015-03-07 16:01:22 -06:00
Sean Zellmer 4bc4e836e4 Make karma tests pass.
This pends a lot of tests that are failing due to translations not being loaded in the environment, as well as some issues with the page reload in groupServicesSpec.

We removed the module declarations for habitrpg in each spec since that
has been moved to specHelper.
2015-03-07 15:48:23 -06:00
Nick Tomlin 64493375ad Fix broken group and member service specs
Both were trying to declare an angular mock module that did not exist.
The group service spec urls were also asserting a trailing `?` that
doesn't seem to be party of the actual request.
2015-03-05 12:43:07 -06:00
Nick Tomlin e7f65f219a WIP - Fix karma config file order to successfully boostrap app
There were a few issues here:

1. Relying on globs meant that modules were loaded out of order. So
'habitrpgc' was undefined when we were trying to add services etc to it.
The short term solution is to list them in the same way we list them in manifest
json. The long term would be switching everything to browserify so as to
avoid ordering/listing nightmare by having a single bundle.
2. We were missing exeternal deps (like 'hello') so the tests were
breaking before they even started. Some of them still are
3. We were including services that don't seem to exist anymore  (e.g. `habitrpgstatic`). We still are in certain places
2015-03-05 12:12:32 -06:00
Blade Barringer cdc8ff6000 Changed quest egg behavior closes #4792 2015-03-04 23:46:27 -06:00
Blade Barringer f44c3b84ab Revert "Changed requirement to only need to complete one quest instead of two to"
This reverts commit f8bdaf4c99.
2015-03-04 23:43:27 -06:00
Blade Barringer f8bdaf4c99 Changed requirement to only need to complete one quest instead of two to
buy eggs
2015-03-04 23:39:29 -06:00
Blade Barringer 5b546d5ff1 Moved karma dependency 2015-03-04 20:55:09 -06:00
Nick Tomlin dccf95a3c2 Fix nconf path in api test 2015-03-04 20:55:09 -06:00
Blade Barringer c66966139b Fixed typo in comment 2015-03-04 20:55:09 -06:00
Blade Barringer 4de6ce0331 Wrote todo about what is wrong with the registerNewUser function 2015-03-04 20:55:08 -06:00
Blade Barringer 735aa59851 Updated request call to use correct form 2015-03-04 20:55:08 -06:00