Commit graph

627 commits

Author SHA1 Message Date
Sabe Jones
6ab091645c 3.58.0 2016-12-01 21:44:23 +00:00
Sabe Jones
5bfc3a5ff4 3.57.2 2016-11-30 21:07:17 +00:00
Sabe Jones
559f9b1825 3.57.1 2016-11-28 21:40:34 +00:00
Sabe Jones
a56b2d68fb 3.57.0 2016-11-24 02:05:03 +00:00
Matteo Pagliazzi
bc3ebbd095 pin mongoose 2016-11-23 21:22:35 +01:00
Matteo Pagliazzi
e5b9581743 update vue 2016-11-23 20:02:35 +01:00
Sabe Jones
f6c26fe869 3.56.0 2016-11-23 02:05:23 +00:00
Matteo Pagliazzi
64754777ed New Client: working navigation (#8131)
* initial work

* new client: working navigation and tasks showing up

* finish header menu and add avatar component

* fix sprites in new client

* initial header version

* initial styling for top menu

* more progress on the header menu

* almost complete menu and avatar

* correctly apply active class for /social and /help

* fix header colors and simplify css

* switch from Roboto to native fonts

* remove small avatar and add viewport

* fixes

* fix user menu with and progress bars

* fix avatar rendeting

* move bars colors to theme

* add site overrides

* fix tests

* shrinkwrap

* fix sprites path

* another try at fixing the sprites path

* another try at fixing the sprites path
2016-11-18 19:20:25 +01:00
Sabe Jones
3b5e4b6d84 3.55.0 2016-11-17 22:26:26 +00:00
Sabe Jones
7ed26c0dbe 3.54.0 2016-11-16 02:12:33 +00:00
Sabe Jones
00e6389672 3.53.5 2016-11-15 04:21:46 +00:00
Sabe Jones
e27512f626 3.53.4 2016-11-15 00:46:15 +00:00
Sabe Jones
95968b1b1c 3.53.3 2016-11-06 22:05:28 +00:00
Sabe Jones
7cf17c0e63 3.53.2 2016-11-04 21:15:10 +00:00
Sabe Jones
905549e379 3.53.1 2016-11-04 19:23:55 +00:00
Sabe Jones
bdd0e2bb79 3.53.0 2016-11-03 00:12:32 +00:00
Sabe Jones
7f38c61c70 3.52.0 2016-10-31 19:02:24 +00:00
Sabe Jones
4dd7e49552 3.51.1 2016-10-27 20:44:17 +00:00
Sabe Jones
d4e20ee4aa 3.51.0 2016-10-25 21:56:09 +00:00
Matteo Pagliazzi
a622344d44 3.50.0 2016-10-22 18:12:09 +02:00
Blade Barringer
ba19c00617 Setup up non-API tests to not need server and mongo running
chore(travis): Build files before running tests

chore(travis): require server for api tests
2016-10-22 08:14:00 -05:00
Blade Barringer
417455e5ef Merge branch 'snyk-community-snyk-community-patch-1' into develop 2016-10-19 17:42:20 -05:00
Blade Barringer
136502a110 chore: update express 2016-10-19 17:41:58 -05:00
Sabe Jones
cfa8a5190f 3.49.0 2016-10-19 19:43:47 +00:00
Snyk Community
e73c3147c1 Fix for the ReDOS vulnerability
habitica is currently affected by the high-severity [ReDOS vulnerability](https://snyk.io/vuln/npm:tough-cookie:20160722). 

Vulnerable module: `tough-cookie`
Introduced through: ` request`

This PR fixes the ReDOS vulnerability by upgrading ` request` to version 2.74.0

Check out the [Snyk test report](https://snyk.io/test/github/HabitRPG/habitica) to review other vulnerabilities that affect this repo. 

[Watch the repo](https://snyk.io/add) to 
* get alerts if newly disclosed vulnerabilities affect this repo in the future. 
* generate pull requests with the fixes you want, or let us do the work: when a newly disclosed vulnerability affects you, we'll submit a fix to you right away. 

Stay secure, 
The Snyk team
2016-10-19 17:50:16 +03:00
Sabe Jones
2a0747ed72 3.48.0 2016-10-13 23:23:34 +00:00
Sabe Jones
009ab26711 Add special spells to Seasonal Shop API (#8138)
* WIP(shops): add spells to Seasonal API

* refactor(shops): remove superfluous if

* feat(shops): handle spell purchasing

* fix(test): proper required fields check
Also corrects a linting error.

* refactor(shops): use constants
2016-10-13 17:53:02 -05:00
Matteo Pagliazzi
aeb86db306 3.47.2 2016-10-12 18:45:00 +02:00
Blade Barringer
932cb5cf6a 3.47.1 2016-10-12 08:07:47 -05:00
Sabe Jones
55d94c129a 3.47.0 2016-10-11 21:19:41 +00:00
Matteo Pagliazzi
b6104c3ef3 remove dup dependency 2016-10-11 18:52:50 +02:00
Sabe Jones
2f4b8c569a 3.46.2 2016-10-06 23:20:55 +00:00
Sabe Jones
68b2d19b04 3.46.1 2016-10-04 23:32:02 +00:00
Sabe Jones
30fe5088b8 3.46.0 2016-10-04 15:55:41 +00:00
Blade Barringer
e3a619c7ff 3.45.0 2016-10-02 09:53:54 -05:00
Blade Barringer
ee15e29ba4 3.44.5 2016-09-30 13:01:36 -05:00
Matteo Pagliazzi
2bca92b4d5 3.44.4 2016-09-29 23:22:30 +02:00
Sabe Jones
816e4a2f19 3.44.3 2016-09-29 18:12:31 +00:00
Sabe Jones
023ff5789d 3.44.2 2016-09-29 17:13:16 +00:00
Sabe Jones
145bcb6f7c 3.44.1 2016-09-29 16:46:26 +00:00
Matteo Pagliazzi
257e932bc3 Vue Store (#8071)
* vue: use our own store in place of vuex

* vue store: add getters, watcher and use internal vue instance

* vue store: better state getter and credits to Vuex

* vue store: $watch -> watch

* vuex store: pass store to getters and fix typos

* add comments to store, start writing tests

* fix unit tests and add missing ones

* cleanup components, add less folder, fetch tassks

* use Vuex helpers

* pin vuex version

* move semantic-ui theme to assets/less, keep website/build empty but in git

* import helpers from vuex
2016-09-29 13:32:36 +02:00
Matteo Pagliazzi
177f78cbb0 3.44.0 2016-09-28 12:49:30 +02:00
Phillip Thelen
e3b484b29a Add Google Signin (#7969)
* Start adding google login

* fix local js issue

* implement syntax suggestions

* fix delete social tests

* Add service for authentication alerts

* fix social login tests

* make suggested google sign in changes

* fix accidentally deleted code

* refactor social network sign in

* fix incorrect find

* implement suggested google sign in changes

* fix(tests): Inject fake Auth module for auth controller

* fix(test): prevent social service from causing page reload

* fix loading user info

* Use lodash's implimentation of find for IE compatibility

* chore: increase test coverage around deletion route

* chore: clean up social auth test

* chore: Fix social login tests

* remove profile from login scope

* fix(api): Allow social accounts to deregister as user has auth backup

* temporarily disable google login button
2016-09-28 12:11:10 +02:00
Sabe Jones
941000d737 3.43.2 2016-09-28 03:12:35 +00:00
Sabe Jones
d6bf30eff8 3.43.1 2016-09-27 14:43:34 +00:00
Matteo Pagliazzi
e3bcea4077 Add semantic-ui (#8076)
* client: add semantic-ui

* add README, disable google fonts

* karma: limit coverage to .vue and .js files

* add missing deps

* semantic-ui in assets folder
2016-09-27 09:34:45 +02:00
Matteo Pagliazzi
d3371e323e Vuex Structure (#8054)
* wip: vuex structure

* add missing files

* client: do not fail dev build on eslint error

* eslint does not block compilation, mount app when data is ready

* eslintrc.js -> eslintrc
2016-09-23 19:49:11 +02:00
Sabe Jones
8f9ed6e377 3.43.0 2016-09-22 20:02:48 +00:00
Matteo Pagliazzi
b907590bf2 rebuild npm-shrinkwrap 2016-09-22 17:54:40 +02:00
Sabe Jones
7f1e27f6e4 3.42.1 2016-09-21 14:55:05 +00:00
Matteo Pagliazzi
bde01c30ad Merge branch 'develop' of github.com:HabitRPG/habitrpg into develop 2016-09-21 14:37:57 +02:00
Matteo Pagliazzi
12275cc174 build new client in production 2016-09-21 14:37:44 +02:00
Sabe Jones
589b2aaf3a 3.42.0 2016-09-21 01:34:33 +00:00
Matteo Pagliazzi
2f626c7875 Vuex (#8041)
* add vuex, cleanup client directory and create example components

* disale sample unit test

* disable import for non existing file

* correct regexp for unit tests, add simple test to avoid error, add babel-polyfill for Vuex

* add line wrongly removed, update regexp
2016-09-20 18:58:02 +02:00
Matteo Pagliazzi
4f3a9802c1 Vue Project Setup (#8018)
* add files for new client side and reorg gulp tasks

* add deps and script for new client

* fix webpack paths so that building works

* fix static assets not copied into prod build

* fix linting

* add eslint deps and re-enable it in webpack

* add most missing deps for client side and split .babelrc for client

* reorganize .eslintignore

* update client tests paths and .gitignore

* uncomment code

* client: move App component

* client: update oaths in App component

* fix client tests and add more deps

* add client side tests to npm test

* fix typo in depencency name

* update more deps

* fix karma.conf.js and upgrade phantomjs

* fix dep and move karma.conf to subdirectory

* update karma.conf.js position in Gruntfile

* try downgrading phantomjs

* Fixup client tests (#8032)

* Use phantom 2

* fix(tests): Fix refresher test

* gitignore translation mock

* Update karma version

* disable e2e tests for new client from build

* write vue templates with pug

* add basic routing

* remove unnecessary Function.bind shim

* remove unused dependency
2016-09-18 21:51:20 +02:00
Blade Barringer
c615af82f8 Merge pull request #8030 from crookedneighbor/switch_serverside_markdown
Switch serverside markdown
2016-09-17 21:04:01 -05:00
Sabe Jones
4468c2ca2f 3.41.4 2016-09-17 03:49:23 +00:00
Blade Barringer
b3f21421e5 chore: remove unused packages 2016-09-16 20:35:15 -05:00
Blade Barringer
de9644f126 chore: switch out markdown-it for habitica-markdown 2016-09-16 20:35:06 -05:00
Sabe Jones
c7fd6701ae 3.41.3 2016-09-16 21:58:00 +00:00
Matteo Pagliazzi
ab84e88650 reorganize old client tests 2016-09-15 13:05:23 +02:00
Sabe Jones
a4fd687510 3.41.2 2016-09-14 22:28:15 +00:00
Matteo Pagliazzi
f6108ddb40 update npm shrinkwrap and add missing dependency for amazon payments 2016-09-14 16:18:28 +02:00
Blade Barringer
0c04a1880b 3.41.1 2016-09-14 08:19:36 -05:00
Sabe Jones
0fe0c38a17 3.41.0 2016-09-13 22:00:14 +00:00
Alys
31a1a14bae 3.40.0 2016-09-09 17:14:01 +10:00
Jordan Schneidler
405798d958 Changed slack client to use npm package instead of github. 2016-09-08 17:38:27 -05:00
Blade Barringer
543a9d06c1 3.39.1 2016-09-07 21:00:46 -05:00
Sabe Jones
0de3efe942 3.39.0 2016-09-07 20:39:51 +00:00
Blade Barringer
c703517b25 3.38.0 2016-09-02 13:04:27 -05:00
Blade Barringer
2180cb3d98 feat(api): Send flag notifications to slack 2016-09-02 11:10:46 -05:00
Sabe Jones
bd5471a0e3 3.37.0 2016-09-01 21:01:40 +00:00
Sabe Jones
3649699b8d 3.36.1 2016-09-01 17:57:13 +00:00
Sabe Jones
95d33a1dff 3.36.0 2016-09-01 16:03:14 +00:00
Sabe Jones
e69b733f90 3.35.0 2016-08-30 17:36:30 +00:00
Blade Barringer
92bbafeb5d chore: Update require-again 2016-08-27 09:57:13 -05:00
Blade Barringer
e957617386 3.34.1 2016-08-23 22:14:19 -05:00
Sabe Jones
53254beaaf 3.34.0 2016-08-23 20:48:36 +00:00
Sabe Jones
106bf52915 3.33.1 2016-08-18 20:28:09 +00:00
Sabe Jones
f5224282d9 3.33.0 2016-08-18 17:58:49 +00:00
Blade Barringer
bd8b1b0ece chore(tests): Rewrite analytics tests to remove dependency on nock 2016-08-15 22:20:39 -05:00
Blade Barringer
02545ae439 3.32.0 2016-08-14 14:10:40 -05:00
Phillip Thelen
679378331d add client and OS info to amplitude events
closes #7865
2016-08-11 08:58:13 -05:00
Blade Barringer
395e602cfc 3.31.0 2016-08-10 12:28:32 -05:00
Sabe Jones
64ffa4912d 3.30.2 2016-08-10 05:28:29 +00:00
Sabe Jones
0d1bff5dda 3.30.1 2016-08-10 03:47:30 +00:00
Sabe Jones
f92cba6a40 3.30.0 2016-08-09 23:40:31 +00:00
Matteo Pagliazzi
8ffc93f9c5 3.29.1 2016-08-07 22:24:39 +02:00
Sabe Jones
ae533652c3 3.29.0 2016-08-05 19:29:45 +00:00
Sabe Jones
d097868cad 3.28.0 2016-08-03 20:40:18 +00:00
Matteo Pagliazzi
fb939e0300 Migrate from GCM to FCM notifications (#7860)
* Fixed logging. Fixed lint issues. Temporarly removed GCM code

* Removed extra packages. Removed lingering gcm code

* Update message structure to send a data notification instead of a regular notification

* Removed excess code

* switch from fcm-push to node-gcm
2016-08-02 23:12:39 +02:00
Sabe Jones
d37ee98c6d 3.27.0 2016-08-01 23:12:21 +00:00
Matteo Pagliazzi
60f34dafb0 Deprecate API v2 (was Revert "Revert "Deprecate API v2"") (#7802)
* Revert "Revert "Deprecate API v2""

* fix path in shops controller
2016-08-01 22:36:10 +02:00
Sabe Jones
a8226b2363 3.26.0 2016-08-01 00:20:13 +00:00
Sabe Jones
e021212481 Naming Day and Take This migrations (#7838)
* feat(migrations): Naming Day and Take This

* fix(migration): more goodies, better query

* fix(migration): query in wrong migration

* fix(migration): don't award goodies repeatedly

* fix(migrations): move logic to query

* fix(migrations): better field lookup

* fix(migrations): use timeouts
2016-07-31 18:55:57 -05:00
Sabe Jones
6e55be033b 3.25.3 2016-07-30 01:26:44 +00:00
Sabe Jones
98e74b42e0 3.25.2 2016-07-29 23:39:26 +00:00
Blade Barringer
c7d08a6811 chore(tests): Add sanity test for proper babel routes 2016-07-26 21:56:51 -05:00
Sabe Jones
1ed7e21542 3.25.1 2016-07-26 22:35:28 +00:00
Sabe Jones
8e2ab11056 3.25.0 2016-07-26 19:54:38 +00:00
Sabe Jones
ef65325f67 3.24.1 2016-07-21 17:29:43 +00:00
Sabe Jones
8d0e157ead 3.24.0 2016-07-19 19:21:22 +00:00
Matteo Pagliazzi
590adb3438 Revert "Deprecate API v2" (#7801) 2016-07-17 18:15:25 +02:00
Matteo Pagliazzi
45c31a2bcf Deprecate API v2 (#7761)
* deprecate api-v2

* remove v2 test helpers

* remove unused string
2016-07-16 19:56:18 +02:00
Sabe Jones
bd8d7bb745 3.23.1 2016-07-15 03:23:34 +00:00
Alys
852651bc0d 3.23.0 2016-07-14 10:08:53 +10:00
Sabe Jones
dea813c296 3.22.1 2016-07-13 14:58:24 +00:00
Sabe Jones
28ebc92aa9 3.22.0 2016-07-12 20:38:05 +00:00
Sabe Jones
485deb1a70 3.21.1 2016-07-07 22:54:00 +00:00
Sabe Jones
cfd5455e3b 3.21.0 2016-07-05 20:58:58 +00:00
Matteo Pagliazzi
76397e64af upgrade in-app-purchase 2016-07-04 17:23:49 +02:00
Matteo Pagliazzi
0dee20f7eb 3.20.0 2016-07-02 15:18:44 +02:00
Matteo Pagliazzi
0880850408 Real-time Chat (#7664)
* feat(realtime-chat): add Pusher library to the server

* feat(realtime-chat): only for private groups

* feat(realtime-chat): add authentication endpoint for Pusher

* feat(realtime-chat): client proof of concept

* fix typo in apidoc

* feat(realtime-chat): redo authentication and write integration tests

* remove firebase code

* fix client side tests

* fix line ending in bower.json

* feat(realtime chat): use presence channels for parties, send events & disconnect clients if user leaves or is removed from party, automatically update UI

* pusher: enable all events in the background

* fix pusher integration tests
2016-07-02 15:17:24 +02:00
Blade Barringer
e077f7f150 3.19.0 2016-07-01 20:28:12 -05:00
Sabe Jones
168bc952d1 3.18.0 2016-06-29 19:30:59 +00:00
Blade Barringer
6ad65c35fc 3.17.0 2016-06-28 09:53:01 -05:00
Sabe Jones
db2ed83a58 3.16.0 2016-06-23 19:48:52 +00:00
Matteo Pagliazzi
7edde56dad fix(deps): add apn package 2016-06-23 17:27:20 +02:00
Matteo Pagliazzi
08d7727881 Push notifications (#7682)
* Fix Social Push notifications

* Fix code formatting issues

* Fix commented issues

* Fix Syntax errors

* update push notify dependency

* specify push-notify version

* change how apn key is loaded

* feat(push-notifications): improve logging

* feat(push-notifications): disable v2 push notifications

* test(push-notifications): add unit tests and improve integration ones

* fix(push-notifications): throw when required params are missing

* fix(tests): correct descriptions and remove wrong comment

* fix(push-notifications): trim APN key

* fix(apn): log feedback only if it has data

* fix(apn): load cert and key differently

* fix(tests): correctly load apn during tests

* download creds from S3 and create AWS lib

* convert s3 buffer to a string

* fix(apn): remove console.log and do not use cert twice

* invert key and cert, disable failing test

* invert key and cert
2016-06-23 00:19:37 +02:00
Sabe Jones
b3c9bd9021 3.15.0 2016-06-22 01:13:26 +00:00
Matteo Pagliazzi
36ef208e18 3.14.0 2016-06-19 12:33:45 +02:00
Sabe Jones
4b98295977 3.13.0 2016-06-18 00:44:54 +00:00
Blade Barringer
ca32cac6fe chore(dependency): Pin to version of eslint that is not broken 2016-06-17 17:36:48 -05:00
Alys
00140eee35 3.12.1 2016-06-16 10:35:10 +10:00
Sabe Jones
23c854f068 3.12.0 2016-06-15 17:37:53 +00:00
Blade Barringer
c77f165b3e 3.11.0 2016-06-11 18:26:03 -05:00
Sabe Jones
a90d0f9233 3.10.0 2016-06-10 01:18:00 +00:00
Sabe Jones
00491670e0 3.9.0 2016-06-08 03:06:49 +00:00
Sabe Jones
eb63e481fa 3.8.1 2016-06-08 02:31:37 +00:00
Matteo Pagliazzi
e1b8d52a27 3.8.0 2016-06-07 16:16:06 +02:00
Blade Barringer
e0aff79ee4 3.7.3 2016-06-05 22:08:17 -05:00
Blade Barringer
ced1e97475 3.7.2 2016-06-05 20:48:11 -05:00
Blade Barringer
e7c9fc70d4 3.7.1 2016-06-05 07:42:36 -05:00
Blade Barringer
cc0d556c10 3.7.0 2016-06-04 08:36:52 -05:00
Blade Barringer
7e7fe3dfd6 3.6.1 2016-06-04 07:14:41 -05:00
Sabe Jones
9828dfea21 chore(minor): Bump version to 3.6.0 2016-06-02 22:15:41 +00:00
Sabe Jones
afea917409 chore(minor): Bump version to 3.5.0 2016-06-01 16:25:43 +00:00
Matteo Pagliazzi
c33b7273fa 3.4.4 2016-06-01 08:59:22 +02:00
Sabe Jones
c746f643fd chore(patch): Bump version to 3.4.3 2016-05-31 20:14:20 +00:00
Blade Barringer
038dd64b12 chore: Create broken challenges migration 2016-05-30 14:23:26 -05:00
Sabe Jones
d89b1e3b08 chore(patch): Bump version to 3.4.2 2016-05-30 18:07:32 +00:00
Matteo Pagliazzi
2d81b31c3a remove legacy loggly code 2016-05-27 16:38:55 +02:00
Matteo Pagliazzi
20ce394999 chore: Bump version to 3.4.1 2016-05-27 13:24:17 +02:00
Matteo Pagliazzi
39a9753fd6 chore: Bump version to 3.4.0 2016-05-27 11:05:12 +02:00
Sabe Jones
9b7458c022 chore(patch): bump version to 3.3.3 2016-05-27 01:20:00 +00:00
Sabe Jones
f95e19c14e chore: Bump version to 3.3.2 2016-05-26 20:38:53 +00:00
Blade Barringer
db7a4f1911 chore: Update package.json version 2016-05-26 07:24:05 -05:00
Blade Barringer
0bb7f8d931 chore: Move apidoc config to separate file 2016-05-25 11:10:03 -05:00
Blade Barringer
bca7d9fad3 chore: Correct version number 2016-05-25 11:07:45 -05:00
Matteo Pagliazzi
f1f593bcfd fix unlocking items with numbers in paths 2016-05-23 19:59:14 +02:00