Code

Update with in game admin#7

Code

Open

gartnera wants to merge 64 commits intobalidani:masterbalidani/tinyctf-platform:masterfrom gartnera:mastergartnera/tinyctf-platform:masterCopy head branch name to clipboard

Commits

Commits on Jan 28, 2016

• Removed short names from task list. Only display point values

  gartnera

  committed
  692b816

  Copy full SHA for 692b816

• Modified description text.

  gartnera

  committed
  cea92f1

  Copy full SHA for cea92f1

• Updated task text.

  gartnera

  committed
  1ab38ff

  Copy full SHA for 1ab38ff

• Hide attatchment text if there is no attachment.

  gartnera

  committed
  55ffb1f

  Copy full SHA for 55ffb1f

Commits on Jan 29, 2016

• Modified the database structure.

  Show description for bef6bbd
  gartnera

  committed
  bef6bbd

  Copy full SHA for bef6bbd

• Updated task route to accommodate database changes.

  gartnera

  committed
  cbdec0a

  Copy full SHA for cbdec0a

• Removed unneeded enumerate.

  gartnera

  committed
  608ac04

  Copy full SHA for 608ac04

• Updated tasks code to show add buttons for categories and tasks.

  gartnera

  committed
  395a768

  Copy full SHA for 395a768

• Added admin_required decorator and associated error

  gartnera

  committed
  b743c34

  Copy full SHA for b743c34

• Updated get_user code, calls, and template.

  gartnera

  committed
  5ce38cf

  Copy full SHA for 5ce38cf

• Fixed missing closing tag

  gartnera

  committed
  0d3505c

  Copy full SHA for 0d3505c

• Added functionaly to add categories

  gartnera

  committed
  791b3b0

  Copy full SHA for 791b3b0

• Moved admin check to grid build from template.

  gartnera

  committed
  8d0bb7b

  Copy full SHA for 8d0bb7b

• Added logic to allow add-box for empty categories

  gartnera

  committed
  e67b0b1

  Copy full SHA for e67b0b1

• Added task creation functionality.

  Show description for 6b515e0
  gartnera

  committed
  6b515e0

  Copy full SHA for 6b515e0

• Client side changes to match server side

  gartnera

  committed
  58086e3

  Copy full SHA for 58086e3

• Task addition template

  gartnera

  committed
  67e88c8

  Copy full SHA for 67e88c8

• Removed short_name from categories table.

  gartnera

  committed
  8fd1c18

  Copy full SHA for 8fd1c18

Commits on Feb 1, 2016

• Added percentage ring around tasks.

  gartnera

  committed
  72d7a78

  Copy full SHA for 72d7a78

• Added class to chall-box span

  gartnera

  committed
  8a8881c

  Copy full SHA for 8a8881c

• Added basic edit functionality.

  Show description for db1dfc7
  gartnera

  committed
  db1dfc7

  Copy full SHA for db1dfc7

• Added edit button on task if admin.

  gartnera

  committed
  3e9a5c0

  Copy full SHA for 3e9a5c0

• Fixed if isAdmin wrong line

  gartnera

  committed
  eb2dac7

  Copy full SHA for eb2dac7

• Added file upload functionality to task creation

  gartnera

  committed
  641cbaf

  Copy full SHA for 641cbaf

• Remove description <p></p> wrapping

  gartnera

  committed
  04ca62b

  Copy full SHA for 04ca62b

• Updated and added more SQL for delete cascade.

  Show description for 1381cae
  gartnera

  committed
  1381cae

  Copy full SHA for 1381cae

• Disable task flag input when solved.

  gartnera

  committed
  2922844

  Copy full SHA for 2922844

• Added logic for task page if no tasks present in database.

  gartnera

  committed
  4da87e6

  Copy full SHA for 4da87e6

• Added edit file (replace/add) file functionality

  gartnera

  committed
  0858d09

  Copy full SHA for 0858d09

• Initial work on mobile compatibility.

  gartnera

  committed
  b469b11

  Copy full SHA for b469b11

Commits on Feb 2, 2016

• Added animated/interactive background. More mobile tweaks.

  Show description for 40be195
  gartnera

  committed
  40be195

  Copy full SHA for 40be195

• Updated templates for new background

  gartnera

  committed
  84ac4cd

  Copy full SHA for 84ac4cd

• Updated SQL and added email field to users.

  gartnera

  committed
  1084c9e

  Copy full SHA for 1084c9e

• Added code to encforce sqlite foreign key constraits.

  gartnera

  committed
  9200ada

  Copy full SHA for 9200ada

• Added email field when logging in

  gartnera

  committed
  8242bcb

  Copy full SHA for 8242bcb

• Added proxy config option and associated code

  gartnera

  committed
  64c48ef

  Copy full SHA for 64c48ef

• Added IP logging

  gartnera

  committed
  04b2b01

  Copy full SHA for 04b2b01

• Changed font to improve cross platform compatibility.

  gartnera

  committed
  73277b5

  Copy full SHA for 73277b5

• Fixed error message not visible

  gartnera

  committed
  612e8d9

  Copy full SHA for 612e8d9

Commits on Feb 3, 2016

• Added configuration option for competition start time.

  gartnera

  committed
  9c822d3

  Copy full SHA for 9c822d3

• Update for uWSGI compatibility.

  Show description for 48aef29
  gartnera

  committed
  48aef29

  Copy full SHA for 48aef29

• Updated dependencies

  gartnera

  committed
  f76b29d

  Copy full SHA for f76b29d

• Readded hidden user field. Hide admin by default.

  gartnera

  committed
  4304800

  Copy full SHA for 4304800

• Switched from htmllaundry to bleach

  gartnera

  committed
  4923f3e

  Copy full SHA for 4923f3e

Commits on Feb 7, 2016

• Updated deployment instructions

  gartnera

  committed
  ab4b5da

  Copy full SHA for ab4b5da

• Added scoreboard.json url/endpoint

  gartnera

  committed
  d719eb4

  Copy full SHA for d719eb4

Commits on Feb 8, 2016

• If no value specified in edit flag field, use the original value.

  gartnera

  committed
  a134d11

  Copy full SHA for a134d11

• Removed old code and files.

  gartnera

  committed
  eeb39e3

  Copy full SHA for eeb39e3

• Added command to create files folder

  gartnera

  committed
  51210d8

  Copy full SHA for 51210d8

Commits on Feb 9, 2016

• Updated image

  gartnera

  committed
  3b96a8f

  Copy full SHA for 3b96a8f

Commits on Feb 12, 2016

• Added delete button and functionality for tasks

  gartnera

  committed
  f4df8b3

  Copy full SHA for f4df8b3

Commits on Mar 5, 2016

• Simplified task grid page logic.

  Show description for 2dc3192
  gartnera

  committed
  2dc3192

  Copy full SHA for 2dc3192

Commits on Apr 25, 2016

• Added category edit/delete functionality.

  Show description for 86f8d70
  gartnera

  committed
  86f8d70

  Copy full SHA for 86f8d70

• Exclude hidden users from percent complete calculation.

  gartnera

  committed
  e7abb5e

  Copy full SHA for e7abb5e

• Update dateutil/dateparser usages to match upstream changes.

  Show description for 5fa79c8
  gartnera

  committed
  5fa79c8

  Copy full SHA for 5fa79c8

• Updated dependencies

  gartnera

  committed
  5bacc3a

  Copy full SHA for 5bacc3a

• Added placeholder text for flag edit

  gartnera

  committed
  33b0d76

  Copy full SHA for 33b0d76

• Optimized tasks page generation code.

  gartnera

  committed
  e0d4dd3

  Copy full SHA for e0d4dd3

• Added settings page to change password and email.

  gartnera

  committed
  c18f3f0

  Copy full SHA for c18f3f0

Commits on Mar 5, 2017

• Removed animated background

  gartnera

  committed
  149a652

  Copy full SHA for 149a652

• Added requirements.txt

  gartnera

  committed
  64ecdc9

  Copy full SHA for 64ecdc9

• Added settings template

  gartnera

  committed
  e017db7

  Copy full SHA for e017db7

Commits on Mar 25, 2017

• Made description optional.

  gartnera

  committed
  f60fc14

  Copy full SHA for f60fc14

Commits on Mar 27, 2017

• Changed settings password field type.

  gartnera

  committed
  0dff113

  Copy full SHA for 0dff113