Commit Graph

127 Commits

Author SHA1 Message Date
Matteo Pagliazzi 5fa514b6fa Merge branch 'develop' into api-v3 2015-11-27 17:05:29 +01:00
Oliver Eyton-Williams 9bda5657d2 Fixed syntax for linter. 2015-11-25 12:40:40 +01:00
Oliver Eyton-Williams 707cd08a8b Merged: updating two-handed tests to use arrow functions. 2015-11-25 12:12:22 +01:00
Blade Barringer 7d49a8cbf8 Merge branch 'develop' into HabitRPG-sabrecat/modularize-statHelpers 2015-11-23 08:07:58 -06:00
Alys a380c1aa30 refactor api.daysSince to a cron.js function not exposed on api 2015-11-22 10:48:15 +10:00
Alys 2f8b6d68e8 refactor api.startOfDay to a cron.js function not exposed on api 2015-11-22 07:13:44 +10:00
Blade Barringer 4dee29a20b tests(fix): Correct path to i18n.js module 2015-11-21 09:42:40 -06:00
Blade Barringer 85a08f881b chore(lint): Correct linting errors in test files. 2015-11-21 09:19:48 -06:00
Alys 6183fd9e71 refactor api.startOfWeek to a cron.js function not exposed on api 2015-11-21 22:26:05 +10:00
Matteo Pagliazzi 041224b5ac fix merge conflicts 2015-11-21 12:09:40 +01:00
Alys a73662bab6 refactor api.dayMapping to DAY_MAPPING const, not exposed on api 2015-11-21 20:48:18 +10:00
Sabe Jones 66725a561c fix(test): Remove only 2015-11-20 13:39:54 -05:00
Sabe Jones e5d3e7bc83 fix(test): Linting and coverage 2015-11-20 13:36:41 -05:00
Sabe Jones fb17c3ae80 Merge branch 'develop' into sabrecat/modularize-statHelpers 2015-11-20 13:27:25 -05:00
Blade Barringer 776faddb34 (chore): lint test/common files 2015-11-19 20:27:39 -06:00
Sabe Jones 31b68219d1 refactor(stats): Address PR comments 2015-11-18 15:06:55 -05:00
Oliver Eyton-Williams 570d7c3c76 Added tests for buying two-handed weapons 2015-11-18 16:41:06 +01:00
Sabe Jones 4bf20959dd refactor(stats): Math helpers ES2015 module 2015-11-17 15:41:26 -05:00
Blade Barringer 4ab2fafc5e Remove coffee files 2015-11-15 15:45:56 -06:00
Blade Barringer 49fd6b9f5c Merge branch 'api-v3' of github.com:HabitRPG/habitrpg into api-v3 2015-11-15 14:59:57 -06:00
Blade Barringer 00055ad055 Merge branch 'develop' into api-v3 2015-11-15 14:57:41 -06:00
Blade Barringer 037337d54f Remove extraneous anonymous function. 2015-11-15 08:24:42 -06:00
Blade Barringer c829eb21ed Removed unused mocha.opts 2015-11-14 21:50:47 -06:00
Blade Barringer bc90893284 Correct test to declare variable 2015-11-14 21:45:20 -06:00
Blade Barringer ff929b669d Convert common tests to js 2015-11-14 21:44:10 -06:00
Blade Barringer be672e570c Merge branch 'api-v3' into api-v3-i18n 2015-11-13 07:44:48 -06:00
Blade Barringer 6e8e1648d9 Merge branch 'develop' into api-v3 2015-11-13 07:38:24 -06:00
Matteo Pagliazzi de21b72027 move old i18n version to api-v2 folder and use new i18n where possible 2015-11-12 16:43:02 +01:00
Blade Barringer 3a13a5ee2c Remove unneeded coffeescript requires in tests. 2015-11-11 20:32:17 -06:00
Matteo Pagliazzi 3795b1d151 wip: starts upgrading lodash to v3 2015-11-11 10:32:49 +01:00
Blade Barringer 851631e465 Fix build errors 2015-11-09 08:19:24 -06:00
Matteo Pagliazzi ed0e4c6d20 Reorganize files under /src, separate express app in two apps, one for api v1 and v2 and the other \
for the upcoming api v3

Reorganize files under /src, separate express app in two apps, one for api v1 and v2 and the other for the upcoming api v3

move api v2 routes in a separate folder, rename apiv1 file for better readability, remove auth routes for api v1

move api-v2 controllers in subdirectory

move unorganized files to /libs

fix gulp requires and separate server in old (api v1 and v2) and new (api v3) app

fix require paths

fix require paths

fix require paths

put api v1 back

Reorganize files under /src and separate express app in one for api v1 and v2 and the other for v3
2015-11-02 17:43:32 +01:00
Blade Barringer 0c82d757c8 Move cs tests to js 2015-10-29 12:25:02 -05:00
Ricardo Mendes 6e68450309 Tweaks tests to account for autoEquip user preference. 2015-10-19 08:26:15 +00:00
Blade Barringer be3decf859 Merge branch 'develop' into refactor-content 2015-10-01 21:20:04 -05:00
Sabe Jones 926bedcfea fix(test): Change quest's canBuy to fn call 2015-09-25 15:16:17 -04:00
Blade Barringer 3d1bbaf6ef Move Content index file to js 2015-09-25 12:09:43 -05:00
Sabe Jones 8c67d22a91 feat(pets): Full purchase behavior 2015-09-22 17:03:41 -04:00
Sabe Jones acd3480b51 fix(test): Remove only 2015-09-21 17:14:57 -04:00
Sabe Jones 389b5b370a feat(pets): Magic Hatching Potions WIP 2015-09-21 17:12:23 -04:00
Sabe Jones b608e061a5 test(drops): Generalize 2015-09-21 12:57:35 -04:00
Sabe Jones bbf9f45aa4 fix(test): Seasonal food drop 2015-09-18 15:32:24 -04:00
Sabe Jones 2bde07fa1c fix(test): Call hasAll correctly 2015-09-16 16:12:29 -04:00
Sabe Jones 7cc29810f3 fix(test): inject Content
Also refactors to remove lodash where it's overkill.
2015-09-16 16:01:13 -04:00
Sabe Jones 2ce52e980d feat(hourglass): Buy pets/mounts 2015-09-15 14:55:38 -04:00
Sabe Jones 66a8be526b WIP(hourglass): Error catches 2015-09-15 12:40:01 -05:00
Sabe Jones bc16ec1729 Merge branch 'develop' into sabrecat/timetravel-stable 2015-09-15 11:32:28 -05:00
Blade Barringer b9bbc3f1ea Move content to own directory 2015-09-06 15:31:08 -05:00
Sabe Jones c370344164 test(time-travel): TDD for pets/mounts 2015-09-02 15:03:57 -04:00
Sabe Jones 9eaa35ba2f test(time-travel): Rename test 2015-09-02 13:47:37 -04:00