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
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
13edca4588
chore(news): add skill icon announcement
2016-04-13 21:25:31 +00:00
925881b2a0
misc fixes and enable dev endpoints for easier live testing
2016-04-13 22:55:39 +02:00
54aac99a6a
v2: make tests working with new tavern id
2016-04-13 22:28:29 +02:00
57497f246f
make tests working with new tavern id
2016-04-13 22:27:32 +02:00
cc024533aa
FIXME -> TODO to make searching easier
2016-04-13 21:55:31 +02:00
99e201fc07
v3: move tavern to valid UUID and set Leslie as the leader
2016-04-13 21:52:53 +02:00
2458f92e1b
fix linting and correctly save collect quests progress
2016-04-13 20:03:26 +02:00
7bb6f968b4
feat(content): Pet Quest 2016-04 ( #7071 )
...
Also renames the Be-Wilder special pet/mount rewards to "Magical Bee" from "Bumblebee".
2016-04-13 12:15:38 -05:00
471657c013
fix tests that relied on different logger
2016-04-13 18:43:15 +02:00
8817f795b1
v3: expose public interface for logger and add tests
2016-04-13 18:18:00 +02:00
28d8c370c3
v3 adapt v2: remove references to sanitizeCreate and fix tests
2016-04-12 23:53:55 +02:00
793ce38f6b
v3: review some more files, add logging for unhandled promises
2016-04-12 20:14:36 +02:00
6458796a36
v3: first review of common code and task models
2016-04-12 19:30:39 +02:00
004b032084
adapt reset to v2 and remove deleted files from gulpfile
2016-04-12 18:50:02 +02:00
c64ba3e8d7
Merge pull request #7043 from TheHollidayInn/api-v3-ops-reset
...
Ported reset. Added unit tests. Added reset route. Added integration tests
2016-04-12 18:46:53 +02:00
7de93cdd12
apidoc: change url to testing heroku app
2016-04-12 18:43:20 +02:00
3970064fe5
Ported reset. Added unit tests. Added reset route. Added integration tests
2016-04-12 11:19:36 -05:00
59749acf50
Fixed reward sound playing after gold subtracted
...
(cherry picked from commit 2508b5ac18closes #7058
fixes #6963
2016-04-12 07:36:44 -05:00
Matteo Pagliazzi