Commit Graph

503 Commits

Author SHA1 Message Date
Sabe Jones cfa8a5190f 3.49.0 2016-10-19 19:43:47 +00: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