This repository was archived by the owner on Mar 3, 2020. It is now read-only.
Merge #551, #555, #556, and #557 #559
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Merged `master` onto `dev` Commits: * add hindi translation (f9f69a7) * added hindi translation (c5a3eb2) * Update lang_hi.php (6bf8317) * Merge pull request #454 from Akhil09/master (f19b5d5) * Error Checking During Build Tests (#452) (de72b28) * HHVM/Hack Typing Error Fixes (#450) (8e4151e) * Require bxslider version 4.2.6 (Fixes #455) (#458) (c2957d7) * Fixed Syntax Errors in Hindi Language (Fixes Build Errors) (#460) (899ab2b) * Automated Game Start and Stop (#449) (ca40091) * Attachments and Links Import/Export, Database Restore, and Control Cleanup (#451)(be35c6b) * Update README.md (8d1db8c) * Update README.md (8f16141) * Update README.md (53a6fa7) * Update README.md (300091c) * Live Sync API (#459) (0b7ca09) * I think its bad (#446) (d326564) * Updated LiveSync Security (#494) (e880251) * Temp fix for issue 499 & 500. Forcing Grunt to continue as it is not correctly detecting node_modules in the folder (#502) (dd3c874) * Merge Deconflict of /dev and /master (#503) (51e06a7) * Added Slack registration link to README (b11322e) * Merge branch 'dev' into WraySec/fbctf/merge@7f8c281 * Fixed conflict in ScoreLog (e181da2) * Fixed conflict in ScoreLog (dd9de6e) * Fixed conflict in Control (f7c6439) * Merge /dev/ to /master (#542) (3047351)
* Remove NodeJS-Legacy (Fixes: #550) * Updated version of node.js installed to fix critical provisioning errors. By default, Ubuntu 14.04 uses a legacy version of node.js. This code removes the legacy version and updates to a newer version. * Source: https://nodejs.org/en/download/package-manager/#debian-and-ubuntu-based-linux-distributions * This PR fixes the provision/build issue from #550
…ixes: #554) (#555) * Downgraded Dropkick.js to version 2.1.10. The project originally was built using 2.1.10 and specified a near version in the 2.x.x release family. On August 27th 2017 Dropkick.js released version 2.2.0 which is incompatible with ES6 specs. The incompatibility with the new release of Dropkick.js caused the provisioning of the platform to fail. * Moved the installation process for Node.js to a function within `lib.sh`. This change streamlines the provision script. * Removed the installation of `wget` from provisioning. `wget` is no longer used within the project and is therefore unneeded. * Updated the `dl()` download function within the provision script to use `curl` exclusively, with retry options. The retry options are set to 5 retries with a 15-second delay between retries. The addition of the retry option ensures the provision can continue if there is a temporary issue with a remote connection or availability of a remote resource. * Added the `dl_pipe()` download function to the provision script. This download function provided the data from the remote resource via standard output to be piped into another command. As piping downloads within the provisioning process have become more common, this function streamlines the process. * Fixes #554 * Updates fixes for #550
* Updated links and information related to the installation process. * Included a link to Quick Setup Guide.
* Included message indicating that Pull Requests need to be submitted against `dev`. * Updated commands to branch from `dev`.
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Remove NodeJS-Legacy (Fixes: NPM error when try to build dev environment #550) Remove NodeJS-Legacy (Fixes: #550) #551
Updated version of node.js installed to fix critical provisioning errors. By default, Ubuntu 14.04 uses a legacy version of node.js. This code removes the legacy version and updates to a newer version.
Source: https://nodejs.org/en/download/package-manager/#debian-and-ubuntu-based-linux-distributions
This PR fixes the provision/build issue from NPM error when try to build dev environment #550
Downgraded DropkickJS and Streamlined Provision for NodeJS/Downloads (Fixes: Provision Failing - Dropkickjs SyntaxError: 'import' and 'export' may only appear at the top level #554) Downgraded DropkickJS and Streamlined Provision for NodeJS/Downloads (Fixes: #554) #555
Downgraded Dropkick.js to version 2.1.10. The project originally was built using 2.1.10 and specified a near version in the 2.x.x release family. On August 27th 2017 Dropkick.js released version 2.2.0 which is incompatible with ES6 specs. The incompatibility with the new release of Dropkick.js caused the provisioning of the platform to fail.
Moved the installation process for Node.js to a function within lib.sh. This change streamlines the provision script.
Removed the installation of wget from provisioning. wget is no longer used within the project and is therefore unneeded.
Updated the dl() download function within the provision script to use curl exclusively, with retry options. The retry options are set to 5 retries with a 15-second delay between retries. The addition of the retry option ensures the provision can continue if there is a temporary issue with a remote connection or availability of a remote resource.
Added the dl_pipe() download function to the provision script. This download function provided the data from the remote resource via standard output to be piped into another command. As piping downloads within the provisioning process have become more common, this function streamlines the process.
Fixes Provision Failing - Dropkickjs SyntaxError: 'import' and 'export' may only appear at the top level #554
Updates fixes for NPM error when try to build dev environment #550
Added Quick Setup Guide to README Added Quick Setup Guide to README #556
Updated links and information related to the installation process.
Included a link to Quick Setup Guide.
Updated CONTRIBUTING Updated CONTRIBUTING #557
Included message indicating that Pull Requests need to be submitted against
dev.Updated commands to branch from
dev.