Commit Graph

1634 Commits

Author SHA1 Message Date
Matteo Pagliazzi ac7d3e642f port middlewares to authenticate users with headers and sessions 2015-11-07 15:37:38 +01:00
Blade Barringer 8967e6ee90 Give function more meaningful name. 2015-11-05 08:46:20 -06:00
Blade Barringer 5cd3f0dd6e Fix eslint styling errors. 2015-11-04 21:19:58 -06:00
Blade Barringer 87eb63ba9b Add case where errorhandlerr does not receive an error 2015-11-04 20:48:39 -06:00
Blade Barringer d5736e1178 Convert classes to use Babel syntax 2015-11-04 20:47:32 -06:00
Blade Barringer 2f6f0eb933 Add Babel require hook 2015-11-04 20:46:37 -06:00
Blade Barringer a4f12f06f4 Remove extraneous white space 2015-11-04 20:46:23 -06:00
Blade Barringer eae9adfaec Merge branch 'develop' into api-v3 2015-11-04 20:25:05 -06:00
Blade Barringer cde66d6167 Merge pull request #6183 from crookedneighbor/clientIdentifier
Client identifier
2015-11-04 20:03:31 -06:00
Blade Barringer 5a36d8e3f5 Switch to single quotes to conform to code style. 2015-11-04 18:03:50 -06:00
Blade Barringer 905e7b17ea Refactor user model 2015-11-04 18:00:40 -06:00
Sabe Jones df7e0236c2 fix(static): Improved /apps layout 2015-11-04 15:30:42 -05:00
Sabe Jones 8c4ecb8f6c feat(static): Apps page 2015-11-04 13:35:31 -05:00
Matteo Pagliazzi 3135613be3 tweaks eslint rules, fixes gulp-eslint, adds some comments 2015-11-04 18:50:08 +01:00
Matteo Pagliazzi 54d89a59e3 add some eslint rules 2015-11-04 18:26:38 +01:00
Matteo Pagliazzi cbca250b99 remove winston-mail and winston-newrelic from deps as they may not be compatible with v2 2015-11-04 18:26:38 +01:00
Matteo Pagliazzi 182e4bff6f wip api-v3: adds some comments and more eslint rules 2015-11-04 18:26:38 +01:00
Matteo Pagliazzi 5e73bc9f1c adds logger and starts logging errors 2015-11-04 18:26:38 +01:00
Matteo Pagliazzi 5f3e798016 add basic .eslintrc and correct some style issues 2015-11-04 18:26:38 +01:00
Matteo Pagliazzi 4322b8c3dc wip api-v3: add error handler middleware and custom error classes 2015-11-04 18:26:38 +01:00
Matteo Pagliazzi b21df9edb3 use node 4, npm 3, mongoose 4 and express 4 2015-11-04 18:26:38 +01:00
Matteo Pagliazzi f1dbe1b51d deprecate api v1 2015-11-04 18:26:38 +01:00
Phillip Thelen 7f189bebba disable tutorial/tour depending on client 2015-11-04 16:54:47 +01:00
Phillip Thelen 921ee881a5 Only create sample habits+dailies when registered through website 2015-11-04 16:41:13 +01:00
Phillip Thelen e13c008076 send "habitica-web" as x-client header 2015-11-04 16:26:50 +01:00
Blade Barringer 799190a898 Merge branch 'develop' into flag_messages_in_api 2015-11-04 07:56:34 -06:00
Blade Barringer 1a68b5e9ee Refactor and add tests to flagged messages. 2015-11-03 08:00:14 -06:00
Blade Barringer 24480e5f04 Merge branch 'develop' into srrvnn-develop 2015-11-03 07:31:48 -06:00
Sabe Jones e74c83be2e feat(content): November backgrounds and Armoire 2015-11-02 17:28:20 -05:00
Sabe Jones 2cb4e80019 chore(event): End Fall Festival 2015-11-02 12:55:48 -05: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 0894a3ea2d Merge branch 'develop' into srrvnn-develop 2015-11-02 06:45:45 -06:00
Sabe Jones 2e7006a0f7 chore(news): Burnout win Bailey 2015-10-31 16:03:34 -04:00
Alys 559a2cea50 revert my stupid tavern quest hack because a server restart was all that was needed 2015-10-31 19:11:07 +09:00
Alys fbb1f9aec5 create a nasty hack to get rid of the persistent Tavern quest exhaust sprites 2015-10-31 19:01:21 +09:00
Blade Barringer c419ca8839 Merge pull request #6068 from AminArria/Wrong-max-level-messages
Wrong max level messages
2015-10-30 23:21:29 -05:00
Blade Barringer 2eb6cab2be Merge pull request #6014 from ahstro/toggle-chevrons
Toggle chevron direction
2015-10-30 23:13:51 -05:00
Blade Barringer add761e58e Remove extraneous div 2015-10-30 23:05:19 -05:00
Blade Barringer 92271c2049 Clean up view for market. 2015-10-30 22:49:13 -05:00
Thrashmandicoot 76de8af848 Merge branch 'develop' of https://github.com/HabitRPG/habitrpg into merchant-button-fix 2015-10-30 20:02:16 -07:00
Thrashmandicoot 1051ff0006 Fix inline-styling to be class styling 2015-10-30 20:01:22 -07:00
Thrashmandicoot c2222a42c7 Add 70% width styling for item sales 2015-10-30 20:01:06 -07:00
Blade Barringer ad6fbef85c Move chat tests to new infrastructure 2015-10-30 14:47:14 -05:00
Sabe Jones 68660b3043 Merge pull request #6140 from HabitRPG/sabrecat/habitoween
WIP: Habitoween
2015-10-30 14:46:44 -05:00
Sabe Jones dca0d7c3f3 fix(event): Keep NPCs burnt out 2015-10-30 15:36:17 -04:00
Blade Barringer 47168cfdc1 Merge pull request #6145 from crookedneighbor/test_updates
Update Tests to test server error messages against translation strings
2015-10-30 09:21:49 -05:00
Blade Barringer aa111b3c1a Update tests to assert against translation strings 2015-10-30 09:01:57 -05:00
Matteo Pagliazzi 0131ba3e45 reert all the deps upgrades 2015-10-30 14:16:35 +01:00
Matteo Pagliazzi 413a06c8d3 disable newrelic 2015-10-30 13:34:18 +01:00
Thrashmandicoot 64ea4e42e7 Merge branch 'develop' of https://github.com/HabitRPG/habitrpg into merchant-button-fix 2015-10-30 03:43:35 -07:00