c608d03e35
v3: start writing migrations
2016-04-23 15:00:55 +02:00
7dab7939cc
v3: fix tavern during tests
2016-04-23 03:33:00 +02:00
c5aa15cf47
v3: fix ability to join public guild you were already a member of
2016-04-23 03:08:03 +02:00
2d87cb0d87
Merge branch 'develop' into api-v3
2016-04-22 17:43:48 +02:00
91314a497c
Merge branch 'api-v3-unlock-fix' into api-v3
2016-04-22 12:33:55 +02:00
6ba1afe479
Merge branch 'api-v3' into api-v3-unlock-fix
2016-04-22 12:33:39 +02:00
1fe2220aa1
v3: improve docs and fix bugs
2016-04-22 12:15:24 +02:00
2cdb30bd5b
fix(NR): remove metric check that crashed
2016-04-21 22:47:04 +00:00
867146dc19
fix(xss): Update site to use remarkable instead of marked
...
https://snyk.io/vuln/npm%3Amarked%3A20150520
https://github.com/chjj/marked/pull/592
2016-04-21 13:23:53 -05:00
43f8e943f6
Merge pull request #7097 from vIiRuS/patch-7
...
Fix timezone issue with iOS app
2016-04-21 12:54:44 -05:00
a5fbc08016
Set timezoneOffset to 0 as default
...
Fixes an issue with the iOS app not setting the offset, when no initial value exists.
2016-04-21 19:41:39 +02:00
5c1d86c513
Merge branch 'develop' into MathWhiz-mount-images
2016-04-21 07:52:21 -05:00
45bc69308c
mounts
2016-04-20 23:52:26 +00:00
6568fcfd5e
res.respond: allow for thrid parameter (message), refactor shared ops responses and adapt tests
2016-04-21 00:52:03 +02:00
823f51e727
revert npm 3 to npm 2 for vagrant installs; adjust instructions so novice users don't try to run commands before doing 'vagrant ssh'
2016-04-20 09:25:05 +10:00
cdf4a384d6
fix(sprites): add Bee mount icon
2016-04-19 21:07:03 +00:00
9e3d8ba4ac
Separated out buy functions into buyGear, buyArmoire, and buyPotion ( #7065 )
2016-04-19 16:50:04 +02:00
f44dbbbd71
Merge branch 'develop' into api-v3
2016-04-19 12:16:22 +02:00
2dd633a471
better organize common/index
2016-04-19 12:11:10 +02:00
ad77922cf0
Merge branch 'piousbox-shared-code-random-drop2' into api-v3
2016-04-19 12:07:31 +02:00
7aa6587f2f
Merge branch 'shared-code-random-drop' of https://github.com/piousbox/habitrpg into piousbox-shared-code-random-drop2
2016-04-19 12:07:18 +02:00
ea9900d27f
Fix installation of test dependencies in vagrant provisioning ( #7069 )
...
* Fix #7054 installation test dependencies in vagrant provisioning
* Fix small typo in output during vagrant provisioning
2016-04-19 17:28:17 +10:00
5d040ac442
change habitrpg.com to habitica.com in new profile edit message
2016-04-19 10:39:04 +10:00
ed49a377e1
add community guidelines info to profile editing ( #7086 )
...
* add community guidelines info to profile editing
* Update profile.jade
2016-04-19 10:15:21 +10:00
f1788080da
Add list of Featured third-party Apps ( #7046 )
...
* add list of featured third-party apps
* Add comma
* add descriptions
* add description to other
* add table
* add description to other
Conflicts:
common/locales/en/settings.json
website/views/options/settings.jade
* Update settings.json
* Sort extensions by name
2016-04-19 08:21:07 +10:00
62f44771af
fix(stable): rename Bumblebees throughout code
2016-04-18 21:02:24 +00:00
277248b8b7
switch to standard response format in v3
2016-04-18 21:56:58 +02:00
318abfeefa
v2: fix debug menu in production
2016-04-17 12:54:27 +02:00
2c87a0bf34
v2: fix casting
2016-04-17 12:50:48 +02:00
2eca9fce32
v3: fix linting
2016-04-17 01:24:46 +02:00
b271520c53
v3: general cleanup
2016-04-17 01:17:22 +02:00
dea693f799
v3: start to fix unlocking
2016-04-16 20:51:16 +02:00
c2b8cad886
v3: fix v3 proxied ops in v2, logout
2016-04-16 19:56:33 +02:00
715bb5e047
shared-code-statsComputed ( #7067 )
...
* shared-code-statsComputed
* \$w is in common/script/index.js
2016-04-16 19:24:13 +02:00
881cf0292d
chore(news): mobile and Beguilement Bailey
2016-04-15 18:46:02 +00:00
c608ac9ecc
fix(news): Erratum
2016-04-15 11:53:58 -05:00
887aa478ec
chore: merge in develop
2016-04-15 10:11:54 -05:00
227797a393
Merge pull request #7079 from crookedneighbor/eslint-config
...
chore: Switch to custom eslint-config
2016-04-15 09:15:39 -05:00
10936d9a4d
chore: Switch to custom eslint-config
2016-04-15 09:03:59 -05:00
e27bdfef6a
Merge pull request #7085 from crookedneighbor/lint_for_new_config
...
chore(lint): lint files in preparation for eslint v2
2016-04-15 09:00:44 -05:00
33c0cdd569
chore(lint): lint files in preparation for eslint v2
2016-04-15 08:37:05 -05:00
1a64886f7d
Merge branch 'develop' into api-v3
2016-04-15 08:04:46 -05:00
ffb3ed0aa4
chore(news): annouce Android update
2016-04-14 23:48:45 +00:00
11b5c1b405
v3: several fixes to class system, move /logout outside of api
2016-04-14 20:05:30 +02:00
7562a589c5
apidoc: update urls and add notice about private api
2016-04-14 16:02:28 +02:00
4c4a7ce3ce
do not run cron when user is not available
2016-04-14 13:51:01 +02:00
6ba41f3099
remove console statement
2016-04-14 13:31:35 +02:00
bc9f2b81e7
refactor getUserLanguage, automatically apply getUserLanguage and cron middlewares where needed
2016-04-14 13:30:58 +02:00
a590a66c47
support top level controllers
2016-04-14 11:54:47 +02:00
e70add1ac4
chore: lint files
2016-04-13 20:11:07 -05:00
Matteo Pagliazzi