Commit graph

311 commits

Author SHA1 Message Date
Blade Barringer
d1faa50e5e Merge branch 'develop' into refactor-content 2015-09-28 07:52:02 -05:00
Blade Barringer
1616b237fa Revert npm bin commit
Vagrant installs don't use the .bin directory because Virtualbox has issues with symlinks see https://github.com/HabitRPG/habitrpg/issues/4591#issuecomment-72344790
2015-09-27 22:54:01 -05:00
Blade Barringer
c21802e7e7 Merge branch 'develop' into refactor-content 2015-09-25 12:22:11 -05:00
Matteo Pagliazzi
5ac46716a3 add eslint tasks to gulp, remove .jshintrc 2015-09-25 15:44:45 +02:00
Blade Barringer
a4f0d96606 Move backgrounds to module 2015-09-19 21:12:09 -05:00
Blade Barringer
85a16b62e5 Add babel task and move to src directory 2015-09-17 17:42:53 -05:00
Blade Barringer
f71e3e20eb Merge pull request #5934 from HabitRPG/adjustments_to_group_front_end_only
Adjustments to group quest behavior
2015-09-15 18:57:32 -05:00
Tim PILLARD
6a96a2910e Ensure NPM scripts always use local binary 2015-09-16 00:19:19 +02:00
Blade Barringer
6aa04aa6fb Add another dev dep to deps 2015-09-15 10:57:18 -05:00
Blade Barringer
41afe0a2f5 Add another dev dep to deps 2015-09-15 10:49:28 -05:00
Blade Barringer
76bd6cbd59 Move some dev dependencies to normal dependencies 2015-09-15 10:38:48 -05:00
Blade Barringer
d3d365a74a Move sprites task to gulp 2015-09-11 19:59:06 -05:00
Blade Barringer
bd1ae09749 Simplify scripts (node scripts use ./node_modules version of things by default) 2015-09-09 09:04:10 -05:00
Blade Barringer
a85116540c Move run:dev task to gulp 2015-09-08 15:45:09 -05:00
Blade Barringer
1e29020df9 Add marked to packagejson 2015-09-06 19:44:55 -05:00
Matteo Pagliazzi
db0a73d332 add router to get firebase token for user 2015-09-05 16:21:46 +02:00
Matteo Pagliazzi
f5f19d146e start adding firebase 2015-09-05 15:44:45 +02:00
Blade Barringer
c8c9d6c892 Set different gulp tasks for production use 2015-09-04 15:53:07 -05:00
Blade Barringer
7aae3d6aa9 Move gulp-grunt to regular dependency 2015-09-04 15:44:18 -05:00
Blade Barringer
3434a13782 Move glob to normal dependencies 2015-09-04 15:40:57 -05:00
Blade Barringer
cfae45a5f7 Move build task to gulp 2015-09-04 15:30:44 -05:00
Blade Barringer
0f5f80f910 Unpend preening test 2015-08-19 19:23:23 -05:00
Matteo Pagliazzi
078ea4768a upgrade jade version 2015-08-14 10:58:19 +02:00
Blade Barringer
054d884154 Merge branch 'develop' into analytics-service-server-side 2015-07-19 10:13:34 -05:00
Blade Barringer
16c6647b34 Bump version number to resolve error message 2015-07-19 10:09:00 -05:00
Blade Barringer
ac02ad3aa2 Update amplitude version 2015-07-10 07:35:45 -05:00
Blade Barringer
52620bb69d Impliment analytics in user actions; remove mixpanel 2015-07-09 22:18:37 -05:00
Blade Barringer
e6ee4d303c Set up purchase tracking 2015-07-06 08:11:31 -05:00
Blade Barringer
fca4ef8d3f Remove changelog; pin to lefnire's version of icalendar 2015-07-05 21:57:39 -05:00
Joe Gallo
b8df812621 all possible unregistered packages in package.json replaced/upgraded
(upgrading swagger-node-express breaks api tests)
2015-07-04 19:17:23 -04:00
Blade Barringer
e6f0acba4c Add initial server side analytics service 2015-07-01 18:36:43 -05:00
Matteo Pagliazzi
6faef6f737 wip amazon payments 2015-06-30 17:59:30 +02:00
Andy Martin
24f35d84e7 add imagemin task to grunt, to shrink file size after spritesmith 2015-06-27 00:13:03 -06:00
Sabe Jones
e9877b6684 Revert "Update node version"
This reverts commit 837c26415d.
2015-06-25 12:35:23 -05:00
Blade Barringer
837c26415d Update node version 2015-06-20 10:02:46 -05:00
Kevin Gisi
a80501261b Switch coverage reporting to coveralls 2015-06-09 07:52:20 -04:00
Kevin Gisi
9272f0ee91 Add CodeClimate coverage reporting 2015-06-09 04:21:54 -04:00
Kevin Gisi
9795fda951 Add karma coverage reporting; added coverage folder to .gitignore 2015-06-09 03:36:44 -04:00
Blade Barringer
ed421ebcc5 Set npm test to call gulp test 2015-06-06 12:15:17 -05:00
Kevin Gisi
6a397a8be5 First pass at Gulpifying the test suite. 2015-06-06 08:27:15 -04:00
Sabe Jones
a2f9e0579d chore(npm): install mixpanel 2015-05-29 16:24:03 -05:00
Blade Barringer
60857994c3 Add expectation that push notification gets called when sending gems 2015-05-11 17:27:58 -05:00
Blade Barringer
a7fa8dc9a4 Merge branch 'develop' into negue-WIP-Push-notifications 2015-05-11 08:18:11 -05:00
Blade Barringer
ed8a4ef651 Use chai expect instead of expect.js 2015-05-11 08:13:23 -05:00
Blade Barringer
d4a296870b Add test for push notification when gems are sent 2015-05-10 20:39:11 -05:00
Negue
b23e901780 Merge branch 'develop' into pushNotifications2 2015-04-27 17:20:25 +02:00
Kevin Gisi
205e26883e Provisional commit of revised test manager and protractor version, pending a Travis run 2015-04-04 21:35:16 -04:00
Kevin Gisi
12ef81424f Upgrade protractor version 2015-04-04 11:05:25 -04:00
Negue
fcec1dc1e6 forgot to add the push-notify package 2015-03-27 19:29:29 +01: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