Commit graph

294 commits

Author SHA1 Message Date
Blade Barringer
f2fc115034 Set default gulp to be dependant on NODE_ENV 2015-02-03 22:19:02 -06:00
Blade Barringer
9b8f006064 Added sinon and corrected path 2015-02-03 21:30:43 -06:00
Blade Barringer
052d031752 Corrected missing slash 2015-02-03 14:11:39 -06:00
Blade Barringer
8a8ce8d80d Moved folders to website directory 2015-02-03 14:10:55 -06:00
Blade Barringer
e55b8dd5bc Wrote first version of sprite gulp task 2015-02-02 19:00:51 -06:00
Blade Barringer
f5f1964249 Started organizing common folder 2015-02-01 23:09:07 -06:00
Blade Barringer
87d91b07be Added clean task 2015-02-01 17:25:08 -06:00
Blade Barringer
70fdc73d8f Started working on gulp file. First version of karma and stylus complete 2015-02-01 17:10:53 -06:00
Blade Barringer
2313211d30 Merge branch 'develop' into common-convert 2015-02-01 11:55:17 -06:00
Tyler Renelle
8670e269ed upgrade mongoose => 3.8.20, upgrade npm 2015-01-30 17:26:35 -07:00
Blade Barringer
37c7bd8df1 Removed shared form package and bower 2015-01-21 11:00:27 -06:00
Blade Barringer
db5082e0d7 Added shared dependencies to package.json 2015-01-21 10:41:08 -06:00
Sabe Jones
07fbcbcb08 Revert "fix(phantom): downgrade to node 0.10.22 due to CERT error, see"
This reverts commit dc18569e78.
2014-12-21 20:53:03 -06:00
Tyler Renelle
dc18569e78 fix(phantom): downgrade to node 0.10.22 due to CERT error, see
https://github.com/Medium/phantomjs/issues/262 (cc @sabrecat)
2014-12-17 22:16:41 -07:00
Tyler Renelle
709fb2b706 Revert "refactor(iap): use env var for google IAP". orders are being
left in "Chargeable - Delivered" for some reason.

This reverts commit 43961a5ab9.
2014-12-16 13:07:01 -07:00
Tyler Renelle
43961a5ab9 refactor(iap): use env var for google IAP, intead of key file. See
cb31043281
cc @negue
2014-12-16 11:44:58 -07:00
Matteo Pagliazzi
7356e0bafe feat(loggly): add loggly 2014-12-12 12:11:26 +01:00
Negue
2ea12d5c71 Add in-app-purchase Package 2014-12-10 14:21:02 -07:00
benmanley
50b1cba0a6 refactor(tasks) improve UI consistency
* Round corners for UI elements / “8-bit” outlines for RPG elements.
* Tag bar – Make it clearer that “Tags” is a heading, not an option
* Task filters – restyle in line with tag bar + nav menu
2014-11-27 10:32:57 +00:00
Matteo Pagliazzi
2fdb1973eb upgrade winston-mail 2014-10-07 21:30:01 +02:00
Matteo Pagliazzi
80042a7a64 update jade 2014-10-07 21:30:00 +02:00
Matteo Pagliazzi
e49402a1ec remove unused packages 2014-10-07 21:30:00 +02:00
Matteo Pagliazzi
fc580595e0 Revert "chore(npm): upgrade paypal-express-checkout -> manual fix now in module"
This reverts commit 07691885bc50937b251be6d364a21c748b0722cd.
2014-10-07 21:30:00 +02:00
Matteo Pagliazzi
81308f700d stick nconf to specific version 2014-10-07 21:30:00 +02:00
Matteo Pagliazzi
f0deb2bf90 upgrade some other package 2014-10-07 21:30:00 +02:00
Matteo Pagliazzi
9ccf2c8d11 upgrade moment 2014-10-07 21:30:00 +02:00
Matteo Pagliazzi
3aa450f8d4 upgrade a few other packages 2014-10-07 21:30:00 +02:00
Matteo Pagliazzi
ebcce81baa chore(npm): upgrade paypal-express-checkout -> manual fix now in module 2014-10-07 21:30:00 +02:00
Matteo Pagliazzi
d71f126ac4 chore(npm): upgrade express to ~3.17.5 2014-10-07 21:30:00 +02:00
Tyler Renelle
27d6514629 chore(mongoose): finally, mongoose 3.8.17! 2014-10-02 23:29:23 -06:00
Tyler Renelle
3f7b9b98cb chore(modules): upgrade mongoose, attempt to mitigate these server
meltdowns. Also upgrade newrelic
2014-09-24 13:08:48 -06:00
Matteo Pagliazzi
fca45a3c0b feat(emails): add emails on signup, subscription begin and donation 2014-09-13 14:28:11 +02:00
Tyler Renelle
b73da19487 Revert "chore(packages): test upgrade to mongoose 3.8.15"
This reverts commit cbcd0728b5.
2014-08-29 19:55:53 -06:00
Tyler Renelle
cbcd0728b5 chore(packages): test upgrade to mongoose 3.8.15 (see
https://github.com/LearnBoost/mongoose/issues/1920 for concern)
2014-08-29 18:23:13 -06:00
Tyler Renelle
4c6090220f chore(packages): upgrade newrelic 2014-08-29 17:48:09 -06:00
Tyler Renelle
3a4e9b135f chore(packages): upgrade newrelic 2014-08-27 19:10:04 -06:00
Alice Harris
a2b0612212 allow bower install to run without asking for permission to collect stats 2014-08-25 12:32:15 +10:00
David Marshall
3bbb4e6966 Exactly request karma-mocha 0.1.3, cause tilda was loading 0.1.6 on CI 2014-07-21 13:52:03 -07:00
David Marshall
1361b71b6c Pin karma-mocha to 0.1.3, fixes CI 2014-07-21 13:40:05 -07:00
Matteo Pagliazzi
899581ee56 fix(package.json): relax and update bower version 2014-07-12 16:04:28 +02:00
Tyler Renelle
8d31376165 fix(mongo): tmp fix to #3607 until
https://github.com/LearnBoost/mongoose/issues/1920 fixed
2014-06-16 17:45:42 -06:00
Tyler Renelle
81b7eed8ca chore(npm): upgrade mongoose 2014-06-11 12:37:58 -06:00
Matteo Pagliazzi
f29eaab719 fix(shared): use develop branch 2014-05-11 16:55:12 +02:00
Matteo Pagliazzi
f3d15c9b91 fix(i18n): use correct branch 2014-05-06 20:16:28 +02:00
Matteo Pagliazzi
11eca7e947 fix(i18n) 2014-05-06 20:04:09 +02:00
Denis Sokolov
8888322ded chore(validator): update to 3.11.2 2014-05-05 19:22:34 +09:00
Tyler Renelle
5af5314a8d fix(express): express: 3.5.x (from 3.5.0), due to https://github.com/visionmedia/express/issues/1979 2014-04-17 17:32:37 -06:00
Tyler Renelle
a608419bba feat(coupons): add coupon-code feature 2014-04-16 23:28:37 -06:00
James Hsiao
5ff0b9503b pinning express to 3.5.0 2014-04-11 11:28:14 -04:00
Tyler Renelle
440a2e2884 refactor(subscriptions): move all payments stuff to it's own controller 2014-03-24 21:51:20 -06:00
Tyler Renelle
0f430e102e feat(subscriptions): add paypal recurring cancelation. refactor stripe & paypal code to use auth.authWithUrl. 2014-03-24 20:47:25 -06:00
Tyler Renelle
10c9595662 feat(subscriptions): convert paypal gem purchases from client-side javascriptButtons to serverside NVP 2014-03-24 20:47:18 -06:00
Tyler Renelle
b8cd762de2 chore(package.json): upgrade karma-requirejs, fixes #3061 2014-03-14 11:40:12 -06:00
Tyler Renelle
bb6f63710c chore(bower): bowerrc (see https://github.com/bower/bower/issues/933) 2014-02-28 22:12:15 -07:00
Tyler Renelle
f7b4a04a59 feat(event-tracking): add server-side GA tracking for ecommerce events 2014-02-10 11:35:33 -07:00
Tyler Renelle
55c28cbe52 chore(domain-middleware): back to real module version 2014-02-06 11:01:38 -07:00
Tyler Renelle
2837edd51f chore(cluster): use domain-middleware properly, so domains are used to restart cluster workers 2014-02-06 10:58:47 -07:00
Cole Gleason
71f4371d9c chore(logging): add Newrelic and Email transports for Winston
This will send an email on errors logged with winston and thus removes
the old error emailing code.
2014-02-01 02:46:22 -06:00
Cole Gleason
2188b5a6c0 chore(logging): add logging via Winston and wrapped it with a custom logging module 2014-02-01 01:47:11 -06:00
Tyler Renelle
92563915ef chore(throttling): add api-throttling (request limiting) so users can
only request routes 120times per minute (aka, 2req/second but spread out
for sanity). fixes #2645
2014-01-31 10:32:33 -07:00
Tyler Renelle
5b06392879 chore(newrelic): add newrelic 2014-01-30 11:04:39 -07:00
Tyler Renelle
f3bd7bcfc6 chore(modules): downgrade coffee-script to 1.6.x, 1.7.0 was breaking on us 2014-01-28 16:12:39 -08:00
Tyler Renelle
e0646bb98d fix(spells): add some spells tests, don't send up body to spell paths 2014-01-22 00:16:52 -08:00
Cole Gleason
564241cd38 chore(changelog): add git-changelog config and sample CHANGELOG.md
This is the setup for the Grunt task that generates a changelog. Note
that it currently generates the changelog for the range
changelog-start..HEAD where changelog-start is a tag. It will always use
the most recent tag it can find. We may want to change this
behavior. Also, the original repo has some bugs, so I'm using my fork
until he accepts my PRs.

Migration notes: To run: `grunt git_changelog`
2014-01-16 02:10:00 -06:00
Tyler Renelle
039bdabb49 let's upgrade passport-facebook to see if this will mitigate all the
facebook login errors we're seeing
2014-01-07 22:06:58 -07:00
Tyler Renelle
2c1eb955ac fix #1954 . Start updating API tests, beginning with challenges. Use
test to fix "challenge updates not updating users' tasks"
2014-01-03 00:01:24 -07:00
Tyler Renelle
e927c897cb Merge branch 'api-docs' into develop 2014-01-01 21:17:20 -07:00
Tyler Renelle
a2b30dcb1a #2217 merge apiv2 route definitions with swagger decorations 2014-01-01 20:21:46 -07:00
Tyler Renelle
0edcfac46b #2217 start adding APIv2 generated documentation via swagger-node-express 2014-01-01 15:33:37 -07:00
Dušan Juretić
431622ce14 E2e tests: launch Selenium and node server and kill them after finishing the tests, using a test database 2014-01-01 14:01:51 -03:00
Dušan Juretić
462bc416de Starting e2e testing 2014-01-01 14:01:23 -03:00
Tyler Renelle
bde22636cf checklsits: package & bower use habitrpg-shared#develop 2013-12-31 09:15:25 -07:00
Tyler Renelle
74c905f1e1 checklists WIP 2013-12-30 10:33:17 -07:00
Tyler Renelle
e6e961f991 #2135 remove connect-domain commented-out examples 2013-12-26 22:39:40 -07:00
Tyler Renelle
1b8cba1945 #2135 use domain-middleware to handle top-level error-handling so we can
email admins UUIDs
2013-12-26 22:38:52 -07:00
Tyler Renelle
43fb430681 bosses: habitrpg-shared#develop 2013-12-25 08:28:02 -07:00
Tyler Renelle
8095397317 Quests: hurt boss via score method, refactor chat function, change all content.*.name to content.*.key for consistency 2013-12-23 01:19:18 -07:00
Tyler Renelle
4323443dbd [#1977] stricter PUT /user set-path validation, require they're setting on a
leaf-path (except for tasks.* - we still need to handle that properly)
2013-12-10 09:10:00 -07:00
Tyler Renelle
81dc41e177 classes: use habitrpg-shared#develop for current production
feature-freeze & classes feature sprint (@paglias @Fandekasp we're good
to go on translations et all now)
2013-12-08 18:21:28 -07:00
Tyler Renelle
caaebe01a2 re: d3eed22 , migration to fix 0'd dayStarts (@paglias, thanks for the fix!) 2013-11-27 10:53:47 -07:00
Nick Gordon
c0a02eeef8 support for xml and json export of all user data 2013-11-25 08:06:27 -08:00
Matteo Pagliazzi
75ce46d4af moment version consistent with habitrpg-shared 2013-11-17 16:12:25 +01:00
Matteo Pagliazzi
34d5eda736 [#1832] remove relative-date, use moment instead 2013-11-17 13:21:21 +01:00
Nick Gordon
e2e7ba15b2 ack, trailing comma 2013-11-15 08:56:54 -08:00
Nick Gordon
c69bc0de58 derp. moment is already a dependency 2013-11-15 08:55:06 -08:00
Nick Gordon
7bf1bf2af0 data export commit, supports exporting task history via csv
*adds the following new dependencies: moment, express-csv
*recommend replacing functionality of 'relative-date' with features from 'moment'
*supports retrieval of CSV history via the API and in browser
**/api/v1/export/history (requires typical API authorization)
**/export/history.csv (requires session authorization)
*adds new routes for data export
2013-11-15 06:18:16 -08:00
Tyler Renelle
d589c24371 Merge pull request #1700 from djuretic/develop
Tests working (for continuous intregration)
2013-11-03 18:59:56 -08:00
Matteo Pagliazzi
5a103db716 upgrade lodash to 2.2.1 2013-11-02 09:52:48 +01:00
Dušan Juretić
142024b818 define karma task for continuous integration 2013-10-31 22:45:10 -03:00
Dušan Juretić
f4ac5dfe8c fix unit tests 2013-10-31 22:35:35 -03:00
Tyler Renelle
a90f37f35c more migration fixes, fix up metrics.js 2013-10-30 18:58:09 -07:00
Tyler Renelle
96f7db3d8a switching habitrpg-shared over from #rewrite to #master, will remove
rewrite branch soon after we're launched with challenges @shaners @paglias
2013-10-29 23:12:38 -07:00
Tyler Renelle
c5671550f1 challenges: add group.memberCount and ability to specifiy field projections in GET request /api/v1/groups?type=guild&fields=name,description,chat 2013-10-28 18:20:02 -07:00
Tyler Renelle
fa25f3d300 challenges: WIP beginning challenges feature. some basic CRUD & some
basic subscribe / unsubscribe functional (but buggy)
2013-10-28 11:34:07 -07:00
Tyler Renelle
5d46793373 Merge pull request #1591 from djuretic/develop
Tests for AuthCtrl
2013-10-15 19:59:47 -07:00
Dušan Juretić
89b4d2ece0 authCtrl tests now working, replaced window for $window 2013-10-12 22:46:13 -03:00
Tyler Renelle
09cd132420 paypal: begin adding paypal alternative to credit-card payments 2013-10-12 15:24:35 -07:00
Andre Casey
730c82ccaf Removes devDependecies for docker from Package.json. 2013-09-30 19:11:14 -07:00
Andre Casey
92485a938e Documentation configuration for Docker
Includes:
- Gruntfile config
- read me for docs (docs-home.md. maps to --> docs-home.md.html)
- updated package.json for docker dep
- updated .gitignore to not include generated files
2013-09-26 18:10:50 -04:00
Tyler Renelle
423170d0cf Revert "Fixes the bower post install fail in windows. I think it should be fine on all other OS, but I don't have the environment set up to test it."
This reverts commit 219bb4e572.
2013-09-22 12:57:00 -04:00