Commit Graph

1606 Commits

Author SHA1 Message Date
Amin Arria f79110d6d2 Changed to be more like the FAQ 2015-11-03 22:03:24 -04:30
Amin Arria 167af1afd4 New static page: overview 2015-11-03 13:35:14 -04:30
Amin Arria fa9b331f03 Created route for overview 2015-11-03 13:15:55 -04:30
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
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
Thrashmandicoot 0e52a62ad2 dynamic images for merchant, finishes refactor 2015-10-30 03:43:13 -07:00
Thrashmandicoot e1b26a884c Add display for selling items, needs right img 2015-10-30 02:27:36 -07:00
Sabe Jones d3a6ff5b2d fix(front-page): Remove extra script tag
Why did I even do that?
2015-10-29 17:07:41 -04:00
Matteo Pagliazzi 332df1d646 Merge pull request #6136 from HabitRPG/upgrade-stack
Upgrade stack
2015-10-29 19:28:51 +01:00
Sabe Jones 27d1e9c788 feat(event): Habitoween
Swaps out basic fall costume NPCs for their Halloween versions. Removes "broken" NPC sprites not needed after World Boss.
2015-10-29 14:15:18 -04:00
Blade Barringer dd09633d31 Merge branch 'locks-auto-equip' into develop 2015-10-29 12:25:18 -05:00
Matteo Pagliazzi 37d83fdade mongoo 4 and new travis ci infrastructure 2015-10-29 16:35:02 +01:00
Matteo Pagliazzi 8ea69e90dd enable new relic, node 4 and npm 3 2015-10-29 16:11:56 +01:00
Matteo Pagliazzi 92fc2683c6 fix(cluster): use for loop instead of _.times 2015-10-29 16:04:30 +01:00
Matteo Pagliazzi f9ab04e4f9 upgrade to express 4.x
cleanup package.json

put errorHandler middleware as the last one

use accepts module instead of req.acceptedLanguages

use normal object notation as it is supported is es5

remove deprecations from auth controller

remove deprecations from groups controller

Revert "remove deprecations from groups controller"

This reverts commit 7cf36295ebbc50c1f2b210a8ab447d7f2c41dba9.

Revert "remove deprecations from auth controller"

This reverts commit deecd701e0551862ba53ea894f2d87a746384fed.

request limit upped to 1mb and 10k chars for query parameters

Upgrade to Express 4.x
2015-10-29 15:59:45 +01:00
Blade Barringer 6ff904bd5a Merge branch 'develop' into czan-develop 2015-10-29 08:40:03 -05:00
Blade Barringer 68fabbf56f Update names 2015-10-29 08:07:06 -05:00
Blade Barringer 4b44c935e8 Merge branch 'develop' into Bunjl-develop 2015-10-29 07:58:31 -05:00
Blade Barringer bce37f7220 Adjusted Press Kit naming. 2015-10-29 07:55:17 -05:00
Amin Arria bd230df0d3 Added rebirthLevel var to remove need of extra translation string 2015-10-28 14:33:45 -04:30
Matteo Pagliazzi 01373882c6 make error notification persistent, change text and make it translatable 2015-10-28 19:42:26 +01:00
Blade Barringer 7205ac689d Merge pull request #6114 from kylestratis/issue-5542a
Issue 5542a - remove FIXME comment from invitations section in user model
2015-10-28 06:45:50 -05:00
jpk24rent 909d556a6d Merge remote-tracking branch 'HabitRPG/develop' into develop 2015-10-28 09:47:47 +02:00
jpk24rent 5269df2932 namefix 2015-10-28 09:47:04 +02:00
Blade Barringer b70597e1d1 Merge pull request #6122 from crookedneighbor/batch_update_adjustment
Batch update adjustment
2015-10-27 21:35:19 -05:00
Blade Barringer ed464a2b70 Merge pull request #6127 from crookedneighbor/reinstate_amplitude
Reinstate amplitude
2015-10-27 21:35:10 -05:00
Blade Barringer cdc58c78fd Merge branch 'nicolevonvon-develop' into develop 2015-10-27 20:19:09 -05:00
Blade Barringer c812c0ae90 Add popover to no owner label 2015-10-27 20:18:39 -05:00
kylestratis 0283408d1e Removed FIXME comment above invitations object - the object is still being used. 2015-10-27 21:12:19 -04:00
Blade Barringer a7c52e6086 Reinstate amplitude analytics 2015-10-27 19:37:57 -05:00
Matteo Pagliazzi 3bae95d3ae remove console.log for push notifications 2015-10-27 22:11:47 +01:00
nicolevonvon 47ec2e1f93 Challenges now display'no owner' if original owner deletes account 2015-10-27 22:15:19 +02:00