Commit Graph

11483 Commits

Author SHA1 Message Date
Sabe Jones 02abee9f4e fix(sharing): Landing page tweaks 2015-11-03 16:16:17 -05:00
Sabe Jones 0260ea3fcd WIP(sharing): Draft functional landing page 2015-11-03 15:04:31 -05:00
Sabe Jones 502e7f0af2 Merge branch 'develop' into sabrecat/more-modals 2015-11-03 14:29:23 -05:00
Sabe Jones 1fa15ba24a Merge pull request #6167 from HabitRPG/sabrecat/content-201511
November backgrounds and Armoire
2015-11-03 11:58:51 -06:00
Blade Barringer 0923077f2f Correct task. 2015-11-03 08:49:10 -06:00
Blade Barringer b71f1f7862 Extract mocha function into taskHelper 2015-11-03 08:41:16 -06:00
Blade Barringer 8c95de0835 Move api tests to v2 namespace 2015-11-03 08:31:20 -06:00
Blade Barringer 2713b0f26f chore(i18n): update locales 2015-11-02 22:08:28 -06:00
Sabe Jones 6b3fcd3d11 fix(content): Correct stats for Royal Robes
...in newtype content file
2015-11-02 17:34:59 -05:00
Sabe Jones 510080325d fix(content): Correct missing Armoire items
...in newstyle content files
2015-11-02 17:33:03 -05: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
Sabe Jones 9227dd89be fix(event): Extend festival one day 2015-11-01 13:27:36 -06:00
Blade Barringer da06e0736a Adjust style of tests. 2015-10-31 21:37:44 -05:00
Blade Barringer f84a10ee4e Simplify delete user test 2015-10-31 21:37:17 -05:00
Blade Barringer d5c346bf3f Merge branch 'develop' into jeremyabbott-deleteusertestupdates 2015-10-31 21:27:16 -05:00
Jeremy Abbott 19128cf8f2 Fnished user in solo group tests
Also minor code cleanup in random files.
2015-10-31 16:19:50 -05:00
Sabe Jones 2e7006a0f7 chore(news): Burnout win Bailey 2015-10-31 16:03:34 -04:00
Blade Barringer 421b402948 Add helper to check the existence of a document 2015-10-31 10:55:28 -05:00
Blade Barringer 6a65711c2f Close db connections in helpers 2015-10-31 10:55:17 -05:00
Alys fa060bf6cd revert a commit that went live prematurely when I was distracted - sorry for commit spam 2015-10-31 19:26:05 +09: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
Alys 8f21fb2419 set lastCron to current moment if the user's timezone has changed when they authenticate 2015-10-31 18:34:35 +09:00
Blade Barringer eaad27dfee Merge pull request #6147 from crookedneighbor/modals_adjustments
Create a social layout
2015-10-30 23:23:00 -05: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 4a9b0f1d12 Merge branch 'Thrashmandicoot-merchant-button-fix' into develop 2015-10-30 22:50:26 -05:00
Blade Barringer 898850fd6e Adjust wording of market message. 2015-10-30 22:50:04 -05:00
Blade Barringer 92271c2049 Clean up view for market. 2015-10-30 22:49:13 -05:00
Blade Barringer 391e09dd33 Fix auto-redirect 2015-10-30 22:28:11 -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
Alys 154fcb4f8c make daysMissed have a negative value for a lastCron in the future so that setting your PC time backwards doesn't trigger cron 2015-10-31 13:00:42 +10:00
Alys 34c51fc710 revert recent cron change (better code incoming; what WAS I thinking) 2015-10-31 10:59:41 +10:00
Blade Barringer d37450622c Create a social layout 2015-10-30 18:41:46 -05:00
Sabe Jones 0c5e520e6f WIP(sharing): Incomplete landing page
First stab at creating landing pages for inbound social traffic. May need a different solution.
2015-10-30 17:35:30 -04:00
Sabe Jones 5d3f41637f Merge branch 'develop' into sabrecat/more-modals 2015-10-30 16:33:17 -04: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
Alys 161069cfec prevent cron running if the lastCron date is in the future 2015-10-31 04:12:43 +10:00
Blade Barringer 003524a19b Update npm 2015-10-30 10:28:10 -05:00
Blade Barringer 724bc6e861 Compiled css for sprites 2015-10-30 10:10:12 -05:00
Matteo Pagliazzi e82d4e59d8 put.nvmrc back 2015-10-30 15:29:56 +01:00
Matteo Pagliazzi e145439b0b starts cleaning up the repo 2015-10-30 15:27:33 +01:00
Blade Barringer e8fa22bf93 chore(i18n): update locales 2015-10-30 09:25:43 -05:00