Commit Graph

8546 Commits

Author SHA1 Message Date
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 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
Blade Barringer e6e212d436 Added todo for area where test is failing to behave properly 2015-03-04 20:55:08 -06:00
Blade Barringer c26aceb17a Used a numTasks variable and added comments 2015-03-04 20:55:08 -06:00
Blade Barringer 66ac773ce9 Added comment about expect 2015-03-04 20:55:08 -06:00
Blade Barringer 7200f3a1d2 Wrote a todo for test 2015-03-04 20:55:08 -06:00
Blade Barringer e8be1524fc Removed the create a new user function call from groups, as it was now using the correct user to look up the leader 2015-03-04 20:52:05 -06:00
Blade Barringer ab27dd405c Changed challenges completed count to calculate from total number of user tasks minus 2 (the two completed) 2015-03-04 20:52:05 -06:00
Blade Barringer 0716177d41 Corrected tests for archiving todos to reflect the correct number of default todos when creating account. 2015-03-04 20:52:05 -06:00
Blade Barringer bee77ab34c Revereted one time binding 2015-03-04 17:30:05 -06:00
Blade Barringer 90fe516562 Join button was showing even if user was already part of the group 2015-03-04 16:24:37 -06:00
Sabe Jones f5f55c95c5 Merge pull request #4793 from SabreCat/backgrounds
March Backgrounds
2015-03-03 21:54:20 -06:00
Sabe Jones 27446da338 chore(grunt): compile sprites 2015-03-03 21:49:07 -06:00
Sabe Jones 21fd8061cf feat(backgrounds): March BGs 2015-03-03 21:42:15 -06:00
Aaron Morris f3bd5330a9 Updating to more awesome translation. 2015-03-02 21:52:50 -05:00
Aaron Morris 5f739fb078 Updating example translation
No harm done doing this before pushing it officially through transifex, right?
2015-03-02 21:15:44 -05:00
Aaron Morris d9b10a4373 making strings translatable
not translating the body keys though...
2015-03-02 21:13:18 -05:00
Aaron Morris ec15f239c6 removing extraneous lines
Not sure about translations yet...
2015-03-02 21:00:50 -05:00
Aaron Morris b484dd3208 Allow for client notifications to user settings
Added functionality on successful user changes (see userNotifications
object in userServices.js)

On this commit, it will tell the user "Party order updated" when the
sorting settings change.
2015-03-02 09:00:37 -05:00
Matteo Pagliazzi 85b547196e chore(i18n): update locales 2015-02-28 18:23:17 +01:00
Alys 35fea2101a Merge pull request #4743 from Alys/develop
migration script to force active users to be resting in the inn
2015-02-28 14:44:10 +10:00
Blade Barringer cbc49829c8 Merge branch 'food_tray_padding' of https://github.com/kangabell/habitrpg into food-tray 2015-02-26 14:08:17 -06:00
K. Belardinelli 194aac1656 use more specific class for selector 2015-02-26 15:02:58 -05:00