From f9366aae44c11821f83b2dd5b85d4e11218547e1 Mon Sep 17 00:00:00 2001 From: izabellamatos Date: Mon, 24 Jul 2017 21:45:53 -0300 Subject: [PATCH 01/16] Docker file updated #534 Problems running development in docker #534 --- Dockerfile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Dockerfile b/Dockerfile index a23a1dd6..6bf7a7f4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -17,6 +17,10 @@ RUN apt-get update \ rsync \ curl \ ca-certificates \ + build-essential \ + libssl-dev \ + libffi-dev \ + python-dev \ && chown www-data:www-data $HOME \ && ./extra/provision.sh -m $MODE -c $TYPE -k $KEY -C $CRT -D $DOMAIN -e $EMAIL -s `pwd` --docker \ && rm -f /var/run/hhvm/sock \ From 00cf184b91acd0dff27a4b7c19177122245bb296 Mon Sep 17 00:00:00 2001 From: izabellamatos Date: Tue, 25 Jul 2017 23:26:19 -0300 Subject: [PATCH 02/16] Update AdminController.php --- src/controllers/AdminController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/controllers/AdminController.php b/src/controllers/AdminController.php index 621a221f..b2a67db0 100644 --- a/src/controllers/AdminController.php +++ b/src/controllers/AdminController.php @@ -2916,7 +2916,7 @@ class="not_configuration" class={$highlighted_color} href="#" data-action={str_replace('_', '-', $highlighted_action)}> - {$current_status} + {tr($current_status)} ; } else { $status_action = ; From a832bf68f9e442d9f8e4c0ca8b5d552e3de9def7 Mon Sep 17 00:00:00 2001 From: "Justin M. Wray" Date: Mon, 28 Aug 2017 00:08:42 -0400 Subject: [PATCH 03/16] Remove NodeJS-Legacy (Fixes: #550) (#551) * 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 --- extra/provision.sh | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/extra/provision.sh b/extra/provision.sh index 108a64dd..cf5d44a0 100755 --- a/extra/provision.sh +++ b/extra/provision.sh @@ -311,7 +311,14 @@ fi log "Updating npm" sudo npm install -g npm@lts - package nodejs-legacy + log "Removing node.js legacy version" + sudo DEBIAN_FRONTEND=noninteractive apt-get remove --purge nodejs -y + + log "Downloading updated node.js version" + curl -sL https://deb.nodesource.com/setup_6.x | sudo -E bash - + + log "Installing node.js" + package nodejs log "Installing all required npm node_modules" sudo npm install --prefix "$CTF_PATH" From 49c7459bc26f2128c376a47b0b6a7807b866cdaa Mon Sep 17 00:00:00 2001 From: "Justin M. Wray" Date: Thu, 31 Aug 2017 00:28:32 -0400 Subject: [PATCH 04/16] 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 #554 * Updates fixes for #550 --- extra/lib.sh | 25 ++++++++++++++++++------- extra/provision.sh | 13 +------------ package.json | 2 +- 3 files changed, 20 insertions(+), 20 deletions(-) diff --git a/extra/lib.sh b/extra/lib.sh index 3e862a15..6f397e08 100755 --- a/extra/lib.sh +++ b/extra/lib.sh @@ -29,12 +29,12 @@ function ok_log() { function dl() { local __url=$1 local __dest=$2 + sudo curl --retry 5 --retry-delay 15 -sSL "$__url" -o "$__dest" +} - if [ -n "$(which wget)" ]; then - sudo wget -q "$__url" -O "$__dest" - else - sudo curl -s "$__url" -o "$__dest" - fi +function dl_pipe() { + local __url=$1 + curl --retry 5 --retry-delay 15 -sSL "$__url" } function package_repo_update() { @@ -53,7 +53,7 @@ function package() { function install_unison() { cd / - curl -sL https://www.archlinux.org/packages/extra/x86_64/unison/download/ | sudo tar Jx + dl_pipe "https://www.archlinux.org/packages/extra/x86_64/unison/download/" | sudo tar Jx } function repo_osquery() { @@ -280,12 +280,23 @@ function install_composer() { local __path=$1 cd $__path - curl -sS https://getcomposer.org/installer | php + dl_pipe "https://getcomposer.org/installer" | php hhvm composer.phar install sudo mv composer.phar /usr/bin sudo chmod +x /usr/bin/composer.phar } +function install_nodejs() { + log "Removing node.js legacy version" + sudo DEBIAN_FRONTEND=noninteractive apt-get remove --purge nodejs -y + + log "Downloading and setting node.js version 6.x repo information" + dl_pipe "https://deb.nodesource.com/setup_6.x" | sudo -E bash - + + log "Installing node.js" + package nodejs +} + function import_empty_db() { local __u="ctf" local __p="ctf" diff --git a/extra/provision.sh b/extra/provision.sh index cf5d44a0..4ea22b98 100755 --- a/extra/provision.sh +++ b/extra/provision.sh @@ -214,7 +214,6 @@ package_repo_update package git package curl -package wget package rsync # Check for available memory, should be over 1GB @@ -307,18 +306,8 @@ fi fi package ca-certificates - package npm - log "Updating npm" - sudo npm install -g npm@lts - log "Removing node.js legacy version" - sudo DEBIAN_FRONTEND=noninteractive apt-get remove --purge nodejs -y - - log "Downloading updated node.js version" - curl -sL https://deb.nodesource.com/setup_6.x | sudo -E bash - - - log "Installing node.js" - package nodejs + install_nodejs log "Installing all required npm node_modules" sudo npm install --prefix "$CTF_PATH" diff --git a/package.json b/package.json index 1391ddde..5d9be93e 100644 --- a/package.json +++ b/package.json @@ -21,7 +21,7 @@ }, "dependencies": { "d3": "^3.5.16", - "dropkickjs": "^2.1.10", + "dropkickjs": "2.1.10", "hoverintent-jqplugin": "^0.2.1", "jquery": "^2.2.3", "keycode": "^2.1.1", From d2ee4b3f88dc9f9a32116a1f16108a1110a53d89 Mon Sep 17 00:00:00 2001 From: "Justin M. Wray" Date: Thu, 31 Aug 2017 00:29:08 -0400 Subject: [PATCH 05/16] Added Quick Setup Guide to README (#556) * Updated links and information related to the installation process. * Included a link to Quick Setup Guide. --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index cd5112e5..8eef011a 100644 --- a/README.md +++ b/README.md @@ -18,11 +18,11 @@ For more information, see the [Admin Guide](https://github.com/facebook/fbctf/wi # Installation -The FBCTF platform was designed with flexibility in mind, allowing for different types of installations depending on the needs of the end user. The FBCTF platform can be installed either in Development Mode, or Production Mode. Development is for development, and Production is intended for live events utilizing the FBCTF platform. +The FBCTF platform was designed with flexibility in mind, allowing for different types of installations depending on the needs of the end user. The FBCTF platform can be installed either in Development Mode, or Production Mode. -[Development Installation Guide](https://github.com/facebook/fbctf/wiki/Installation-Guide,-Development) +[Quick Setup Guide](https://github.com/facebook/fbctf/wiki/Quick-Setup-Guide) (_Recommended Installation_) -[Production Installation Guide](https://github.com/facebook/fbctf/wiki/Installation-Guide,-Production) +The [Quick Setup Guide](https://github.com/facebook/fbctf/wiki/Quick-Setup-Guide) details the quick setup mode which provides a streamlined and consistent build of the platform but offers less flexibility when compared to a custom installation. If you would prefer to perform a custom installation, please see the [Development Installation Guide](https://github.com/facebook/fbctf/wiki/Installation-Guide,-Development) or [Production Installation Guide](https://github.com/facebook/fbctf/wiki/Installation-Guide,-Production). ## Reporting an Issue From 1f236bba7e5e7a3e7169ff61037502a6928a94ba Mon Sep 17 00:00:00 2001 From: "Justin M. Wray" Date: Thu, 31 Aug 2017 00:29:37 -0400 Subject: [PATCH 06/16] Update CONTRIBUTING (#557) * Included message indicating that Pull Requests need to be submitted against `dev`. * Updated commands to branch from `dev`. --- CONTRIBUTING.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 8a601541..a05ec714 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -7,12 +7,14 @@ Complete your CLA here: ## Submitting a PR +**All Pull Requests should be made against `dev` (even _bug fixes_).** + Before submitting a large PR for a new feature or improvement, please create an issue first. This will allow us to discuss the feature before much development effort is put into it. After we've agreed that the feature would fit in the scope of the project, or if the change is small enough to not require an issue, follow these steps to create a PR: - Make a new branch ``` -git checkout -b my-fix master +git checkout -b my-fix dev ``` - Make your changes, including test cases if applicable. Make sure to follow the coding guidelines described below. From d7d41fb4c024f0a27c25f92dde9fb25b00aa88e7 Mon Sep 17 00:00:00 2001 From: izabellamatos Date: Sun, 1 Oct 2017 18:53:57 -0300 Subject: [PATCH 07/16] =?UTF-8?q?Atualiza=C3=A7=C3=A3o=20de=20tradu=C3=A7?= =?UTF-8?q?=C3=B5es=20ausentes?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/language/lang_en.php | 48 ++++++++++++++++++++++++++++++++++++++-- 1 file changed, 46 insertions(+), 2 deletions(-) diff --git a/src/language/lang_en.php b/src/language/lang_en.php index e5644cef..8fa634dc 100644 --- a/src/language/lang_en.php +++ b/src/language/lang_en.php @@ -140,6 +140,8 @@ 'View mode', 'Tutorial' => 'Tutorial', + 'Account' => + 'Account', 'Scoreboard' => 'Scoreboard', 'You' => @@ -227,14 +229,22 @@ 'Bases Cycle (s)', 'Default Bonus Dec' => 'Default Bonus Dec', + 'Autorun Cycle (s)' => + 'Autorun Cycle (s)', + 'Auto Announcements' => + 'Auto Announcements', 'Game Schedule' => 'Game Schedule', 'Game Start Year' => 'Game Start Year', 'Game End Year' => 'Game End Year', + 'Month' => + 'Month', 'Day' => 'Day', + 'Hour' => + 'Hour', 'Minute' => 'Minute', 'Timer' => @@ -247,6 +257,10 @@ 'Begin Time', 'Expected End Time' => 'Expected End Time', + 'Livesync' => + 'Livesync', + 'Optional Livesync Auth Key' => + 'Optional Livesync Auth Key', 'Internationalization' => 'Internationalization', 'Language' => @@ -255,6 +269,10 @@ 'Branding', 'Custom Logo' => 'Custom Logo', + 'Custom Organization' => + 'Custom Organization', + 'Custom Byline' => + 'Custom Byline', 'Logo' => 'Logo', 'Custom Text' => @@ -263,6 +281,8 @@ 'DELETE', 'Delete' => 'Delete', + 'Announcement Controls' => + 'Announcement Controls', 'No Announcements' => 'No Announcements', 'Game Controls' => @@ -273,8 +293,16 @@ 'Create', 'General' => 'General', - 'Back Up Database' => - 'Back Up Database', + 'Utilities' => + 'Utilities', + 'Flush Memcached' => + 'Flush Memcached', + 'Reset Database' => + 'Reset Database', + 'Restore Database' => + 'Restore Database', + 'Backup Database' => + 'Backup Database', 'Export Full Game' => 'Export Full Game', 'Import Full Game' => @@ -291,6 +319,10 @@ 'Import Levels', 'Export Levels' => 'Export Levels', + 'Import Attachments' => + 'Import Attachments', + 'Export Attachments' => + 'Export Attachments', 'Import Categories' => 'Import Categories', 'Export Categories' => @@ -684,6 +716,18 @@ 'Next', 'Skip to play' => 'Skip to play', + 'account_' => + 'account_', + 'Settings' => + 'Settings' + 'Setup your FBCTF Live Sync credentials. These credentials must be the SAME on all other FBCTF instances that you are linking. DO NOT use your account password.' => + 'Setup your FBCTF Live Sync credentials. These credentials must be the SAME on all other FBCTF instances that you are linking. DO NOT use your account password.', + 'Set your live sync username' => + 'Set your live sync username', + 'Set your live sync password' => + 'Set your live sync password', + 'Close' => + 'Close', 'Powered By Facebook' => 'Powered By Facebook', 'Active Directory / LDAP' => From 07a0d177eccbb4ae1a224e61c8b53cfe1743e472 Mon Sep 17 00:00:00 2001 From: izabellamatos Date: Sun, 1 Oct 2017 23:34:32 -0300 Subject: [PATCH 08/16] =?UTF-8?q?Adicionado=20mais=20tradu=C3=A7=C3=B5es?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/language/lang_en.php | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/language/lang_en.php b/src/language/lang_en.php index 8fa634dc..30d920b1 100644 --- a/src/language/lang_en.php +++ b/src/language/lang_en.php @@ -25,6 +25,8 @@ 'Login', 'Soon' => 'Soon', + 'In Progress' => + 'In Progress', 'Upcoming Game' => 'Upcoming Game', '_days' => @@ -257,9 +259,9 @@ 'Begin Time', 'Expected End Time' => 'Expected End Time', - 'Livesync' => + 'LiveSync' => 'Livesync', - 'Optional Livesync Auth Key' => + 'Optional LiveSync Auth Key' => 'Optional Livesync Auth Key', 'Internationalization' => 'Internationalization', @@ -720,8 +722,8 @@ 'account_', 'Settings' => 'Settings' - 'Setup your FBCTF Live Sync credentials. These credentials must be the SAME on all other FBCTF instances that you are linking. DO NOT use your account password.' => - 'Setup your FBCTF Live Sync credentials. These credentials must be the SAME on all other FBCTF instances that you are linking. DO NOT use your account password.', + 'Setup your FBCTF Live Sync credentials. These credentials must be the SAME on all other FBCTF instances that you are linking. DO NOT use your account password.' => + 'Setup your FBCTF Live Sync credentials. These credentials must be the SAME on all other FBCTF instances that you are linking. DO NOT use your account password.', 'Set your live sync username' => 'Set your live sync username', 'Set your live sync password' => From ac79a650e2e6b4e724e42dd891005eaa90fcd5a1 Mon Sep 17 00:00:00 2001 From: izabellamatos Date: Mon, 2 Oct 2017 21:33:36 -0300 Subject: [PATCH 09/16] Update lang_en.php --- src/language/lang_en.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/language/lang_en.php b/src/language/lang_en.php index 30d920b1..133c2f63 100644 --- a/src/language/lang_en.php +++ b/src/language/lang_en.php @@ -721,7 +721,7 @@ 'account_' => 'account_', 'Settings' => - 'Settings' + 'Settings', 'Setup your FBCTF Live Sync credentials. These credentials must be the SAME on all other FBCTF instances that you are linking. DO NOT use your account password.' => 'Setup your FBCTF Live Sync credentials. These credentials must be the SAME on all other FBCTF instances that you are linking. DO NOT use your account password.', 'Set your live sync username' => From 0ee3aaf8d11c69ff434d3d41eb89dde340bb5484 Mon Sep 17 00:00:00 2001 From: izabellamatos Date: Tue, 3 Oct 2017 17:47:05 -0300 Subject: [PATCH 10/16] =?UTF-8?q?Finalizado=20a=20verifica=C3=A7=C3=A3o=20?= =?UTF-8?q?de=20tradu=C3=A7=C3=B5es?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/language/lang_en.php | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/src/language/lang_en.php b/src/language/lang_en.php index 133c2f63..67cfc364 100644 --- a/src/language/lang_en.php +++ b/src/language/lang_en.php @@ -533,6 +533,8 @@ 'End Game', 'Begin Game' => 'Begin Game', + 'Pause Game' => + 'Pause Game', 'Game Admin' => 'Game Admin', 'Controls' => @@ -610,6 +612,10 @@ 'end_', 'Are you sure you want to finish the current game?' => 'Are you sure you want to finish the current game?', + 'pause_' => + 'pause_', + 'Are you sure you want to pause the current game?' => + 'Are you sure you want to pause the current game?', 'Are you sure you want to logout from the game?' => 'Are you sure you want to logout from the game?', 'Saved' => @@ -624,6 +630,16 @@ 'cancel_', 'Are you sure you want to cancel? You have unsaved changes that will be reverted.' => 'Are you sure you want to cancel? You have unsaved changes that will be reverted.', + 'Database' => + 'Database', + 'restore_' => + 'restore_', + 'Are you sure you want to restore the database? This will overwrite ALL existing data!' => + 'Are you sure you want to restore the database? This will overwrite ALL existing data!', + 'reset_' => + 'reset_', + 'Are you sure you want to reset the database? This will destroy ALL data! Admin accounts will remain.' => + 'Are you sure you want to reset the database? This will destroy ALL data! Admin accounts will remain.', 'choose_logo' => 'choose_logo', 'captured_' => From 3f9ce5d06773cc72ad31e3adde975343c1190c36 Mon Sep 17 00:00:00 2001 From: izabellamatos Date: Tue, 3 Oct 2017 18:55:07 -0300 Subject: [PATCH 11/16] =?UTF-8?q?Adicionado=20tradu=C3=A7=C3=A3o=20para=20?= =?UTF-8?q?o=20ENABLE/DISABLE=20Logos?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Na página de gerenciamento de Logos, o ENABLE e DISABLE não estava sendo traduzidos --- src/controllers/AdminController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/controllers/AdminController.php b/src/controllers/AdminController.php index b46b4313..8425a8e9 100644 --- a/src/controllers/AdminController.php +++ b/src/controllers/AdminController.php @@ -3696,7 +3696,7 @@ class="fb-cta cta--yellow js-confirm-save" class={$highlighted_color} href="#" data-action={str_replace('_', '-', $highlighted_action)}> - {$action_text} + {tr($action_text)}
From 860d4a7a8531282441d4db0b76c843278464102d Mon Sep 17 00:00:00 2001 From: izabellamatos Date: Tue, 3 Oct 2017 18:56:38 -0300 Subject: [PATCH 12/16] =?UTF-8?q?Adicionado=20tradu=C3=A7=C3=A3o=20ao=20Ga?= =?UTF-8?q?me=20Controls?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/controllers/AdminController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/controllers/AdminController.php b/src/controllers/AdminController.php index 8425a8e9..acab6fa2 100644 --- a/src/controllers/AdminController.php +++ b/src/controllers/AdminController.php @@ -1195,7 +1195,7 @@ public function renderControlsContent(): :xhp { return
-

Game Controls

+

{tr('Game Controls')}

{tr('status_')}{tr('OK')} From 4f30c8b3af12cc4d5eb8801c317ab2bf7630eb40 Mon Sep 17 00:00:00 2001 From: izabellamatos Date: Tue, 3 Oct 2017 19:00:22 -0300 Subject: [PATCH 13/16] =?UTF-8?q?Adicionado=20tradu=C3=A7=C3=B5es=20para?= =?UTF-8?q?=20o=20Cron=C3=B4metro?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/inc/gameboard/modules/game-clock.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/inc/gameboard/modules/game-clock.php b/src/inc/gameboard/modules/game-clock.php index 48098d9c..cb6c0c45 100644 --- a/src/inc/gameboard/modules/game-clock.php +++ b/src/inc/gameboard/modules/game-clock.php @@ -98,7 +98,7 @@ class ClockModuleController { return
-
Game Clock
+
{tr('Game Clock')}
@@ -111,8 +111,8 @@ class ClockModuleController {
- [Start] - [End] + [{tr('Start')}] + [{tr('End')}] {$indicator}
@@ -121,7 +121,7 @@ class ClockModuleController { return
-
Game Clock
+
{tr('Game Clock')}
@@ -132,8 +132,8 @@ class ClockModuleController { {$milliseconds}
- [Start] - [End] + [{tr('Start')}] + [{tr('End')}] {$indicator}
From 94a669e220791caed0517164749ba4fe56b30dd2 Mon Sep 17 00:00:00 2001 From: izabellamatos Date: Tue, 3 Oct 2017 19:22:56 -0300 Subject: [PATCH 14/16] =?UTF-8?q?Novas=20tradu=C3=A7=C3=B5es?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/language/lang_en.php | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/src/language/lang_en.php b/src/language/lang_en.php index 67cfc364..99369be8 100644 --- a/src/language/lang_en.php +++ b/src/language/lang_en.php @@ -616,12 +616,26 @@ 'pause_', 'Are you sure you want to pause the current game?' => 'Are you sure you want to pause the current game?', + 'unpause_' => + 'unpause_', + 'Are you sure you want to unpause the current game?' => + 'Are you sure you want to unpause the current game?', 'Are you sure you want to logout from the game?' => 'Are you sure you want to logout from the game?', + 'delete_' => + 'delete_', + 'Are you sure you want to delete this level? All data for this level will be irreversibly removed, including scores.' => + 'Are you sure you want to delete this level? All data for this level will be irreversibly removed, including scores.', + 'Are you sure you want to delete this team? All data for this team will be irreversibly removed, including scoring logs. If you prefer to retain data, you can disable the team instead.' => + 'Are you sure you want to delete this team? All data for this team will be irreversibly removed, including scoring logs. If you prefer to retain data, you can disable the team instead.', 'Saved' => 'Saved', 'All changes have been successfully saved.' => 'All changes have been successfully saved.', + 'Imported' => + 'Imported', + 'Items have been imported successfully' => + 'Items have been imported successfully', 'Error' => 'Error', 'Sorry your form was not saved. Please correct the all errors and save again.' => @@ -744,6 +758,10 @@ 'Set your live sync username', 'Set your live sync password' => 'Set your live sync password', + 'Link Your Google Account' => + 'Link Your Google Account' + 'Link your account with Google. You may link your FBCTF account on this instance with your Google account. Note that this will provide your email address to the administrators of this FBCTF instance.' => + 'Link your account with Google. You may link your FBCTF account on this instance with your Google account. Note that this will provide your email address to the administrators of this FBCTF instance.', 'Close' => 'Close', 'Powered By Facebook' => From 6ab28c0964a38592e290d75cfa86141ac727d3e9 Mon Sep 17 00:00:00 2001 From: izabellamatos Date: Tue, 3 Oct 2017 20:01:10 -0300 Subject: [PATCH 15/16] Update lang_en.php --- src/language/lang_en.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/language/lang_en.php b/src/language/lang_en.php index 99369be8..cb6472ce 100644 --- a/src/language/lang_en.php +++ b/src/language/lang_en.php @@ -759,7 +759,7 @@ 'Set your live sync password' => 'Set your live sync password', 'Link Your Google Account' => - 'Link Your Google Account' + 'Link Your Google Account', 'Link your account with Google. You may link your FBCTF account on this instance with your Google account. Note that this will provide your email address to the administrators of this FBCTF instance.' => 'Link your account with Google. You may link your FBCTF account on this instance with your Google account. Note that this will provide your email address to the administrators of this FBCTF instance.', 'Close' => From c3f72bd1d98d3973fcd2f99a94b4ce7c63403220 Mon Sep 17 00:00:00 2001 From: izabellamatos Date: Tue, 3 Oct 2017 21:54:04 -0300 Subject: [PATCH 16/16] Update lang_en.php --- src/language/lang_en.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/language/lang_en.php b/src/language/lang_en.php index cb6472ce..35419627 100644 --- a/src/language/lang_en.php +++ b/src/language/lang_en.php @@ -363,6 +363,10 @@ 'Enabled', 'Disabled' => 'Disabled', + 'ENABLE' => + 'ENABLE', + 'DISABLE' => + 'DISABLE', 'Quiz Level' => 'Quiz Level', 'Show Answer' =>