Code

Staging#36

Code

Open

mzhang28 wants to merge 51 commits intomastereasyctf/ctf-calendar:masterfrom stagingeasyctf/ctf-calendar:stagingCopy head branch name to clipboard

+742-171

Commits

Commits on Aug 26, 2016

• [WIP] Connect with OpenCTF

  

  Michael Zhang

  committed
  b095bc1

  Copy full SHA for b095bc1

Commits on Aug 30, 2016

• Use functools.partial for functions as SQLAlchemy Column defaults.

  Show description for 0ad271b
  chaosagent

  committed
  0ad271b

  Copy full SHA for 0ad271b

Commits on Sep 1, 2016

• Use url_for instead of hardcoding URLs in layout template.

  

  chaosagent

  authored and

  Michael Zhang

  committed
  aba5bb8

  Copy full SHA for aba5bb8

• Paginate lists.

  

  chaosagent

  authored and

  Michael Zhang

  committed
  855bee6

  Copy full SHA for 855bee6

• Move Event start time isoformatting to a @Property

  

  chaosagent

  authored and

  Michael Zhang

  committed
  a32515a

  Copy full SHA for a32515a

• Implement upcoming and past events

  

  chaosagent

  authored and

  Michael Zhang

  committed
  7657e05

  Copy full SHA for 7657e05

• Add page numbers + use .all()

  

  Michael Zhang

  committed
  6eadae3

  Copy full SHA for 6eadae3

• Disable 'next' button on last page.

  

  chaosagent

  authored and

  Michael Zhang

  committed
  69c229f

  Copy full SHA for 69c229f

• Add 'page/' URL component to all paginated things.

  

  chaosagent

  authored and

  Michael Zhang

  committed
  4968553

  Copy full SHA for 4968553

• Use functools.partial for functions as SQLAlchemy Column defaults.

  Show description for 2739305
  

  chaosagent

  authored and

  Michael Zhang

  committed
  2739305

  Copy full SHA for 2739305

• Fix event manage.

  Show description for a849b43
  

  chaosagent

  authored and

  Michael Zhang

  committed
  a849b43

  Copy full SHA for a849b43

• Add (unix time) message.

  

  Michael Zhang

  committed
  846e91a

  Copy full SHA for 846e91a

• Create .travis.yml

  

  Michael Zhang

  committed
  b0a5b88

  Copy full SHA for b0a5b88

• Get rid of python3

  

  Michael Zhang

  committed
  a0d7034

  Copy full SHA for a0d7034

• Add sanity test.

  

  Michael Zhang

  committed
  4adf155

  Copy full SHA for 4adf155

• Remove .coverage and .cache

  

  Michael Zhang

  committed
  728d0d2

  Copy full SHA for 728d0d2

• ayy committing blank lines?

  

  Michael Zhang

  committed
  8deba85

  Copy full SHA for 8deba85

• Request sudo

  

  Michael Zhang

  committed
  786477b

  Copy full SHA for 786477b

Commits on Sep 4, 2016

• Add forgot password page.

  

  Michael Zhang

  committed
  3e26c38

  Copy full SHA for 3e26c38

• Merge branch 'master' of github.com:easyctf/ctf-calendar

  

  Michael Zhang

  committed
  bc45fab

  Copy full SHA for bc45fab

• Merge branch 'master' into feature/forgot-password

  

  Michael Zhang

  committed
  dcaba16

  Copy full SHA for dcaba16

Commits on Sep 5, 2016

• Password reset + send email

  

  Michael Zhang

  committed
  d5c3aa2

  Copy full SHA for d5c3aa2

• Finished password reset

  

  Michael Zhang

  committed
  e2af844

  Copy full SHA for e2af844

• Merge pull request #31 from EasyCTF/master

  Show description for d771c55
  chaosagent

  authored
  d771c55

  Copy full SHA for d771c55

• Update from david-kun's comments

  

  Michael Zhang

  committed
  1f60757

  Copy full SHA for 1f60757

• Clean up code

  chaosagent

  committed
  bfae171

  Copy full SHA for bfae171

• Clean up some code, attach (password reset) tokens to user/email pairs, don't reuse tokens, make email in tokens unicode, rename token table

  chaosagent

  committed
  7498791

  Copy full SHA for 7498791

• Reformat code

  chaosagent

  committed
  23d7245

  Copy full SHA for 23d7245

• Edit revision.

  

  Michael Zhang

  committed
  1f6f508

  Copy full SHA for 1f6f508

• Fix migration for passwordresettoken/user.id FK

  chaosagent

  committed
  7f0b14d

  Copy full SHA for 7f0b14d

• Merge branch 'feature/forgot-password' of github.com:EasyCTF/ctf-calendar into feature/forgot-password

  chaosagent

  committed
  21d7fbf

  Copy full SHA for 21d7fbf

Commits on Sep 6, 2016

• Merge pull request #30 from EasyCTF/feature/forgot-password

  Show description for dc085b0
  chaosagent

  authored
  dc085b0

  Copy full SHA for dc085b0

Commits on Sep 7, 2016

• Add tests.

  

  Michael Zhang

  committed
  8394942

  Copy full SHA for 8394942

Commits on Sep 8, 2016

• Enable testing.

  

  Michael Zhang

  committed
  e90945b

  Copy full SHA for e90945b

• Add configuration.

  

  Michael Zhang

  committed
  dcefa2d

  Copy full SHA for dcefa2d

• Get rid of drop_everything

  

  Michael Zhang

  committed
  6cb1957

  Copy full SHA for 6cb1957

Commits on Sep 9, 2016

• Remove redundant config set

  chaosagent

  committed
  ce864fc

  Copy full SHA for ce864fc

• Drop tables before and after each db fixture

  chaosagent

  committed
  0391330

  Copy full SHA for 0391330

• Merge pull request #35 from EasyCTF/feature/tests

  Show description for 5faa4ef
  chaosagent

  authored
  5faa4ef

  Copy full SHA for 5faa4ef

Commits on Oct 18, 2016

• More tests!

  

  Michael Zhang

  committed
  fe7a93c

  Copy full SHA for fe7a93c

• Merge branch 'feature/tests' of github.com:easyctf/ctf-calendar into feature/tests

  

  Michael Zhang

  committed
  8677fbb

  Copy full SHA for 8677fbb

• Covered filters.

  

  Michael Zhang

  committed
  3633911

  Copy full SHA for 3633911

Commits on Oct 19, 2016

• Fix timezone :/

  

  Michael Zhang

  committed
  4182653

  Copy full SHA for 4182653

Commits on Nov 22, 2016

• More tests.

  

  Michael Zhang

  committed
  4c788eb

  Copy full SHA for 4c788eb

• ayy

  

  Michael Zhang

  committed
  85ae46c

  Copy full SHA for 85ae46c

• Merge branch 'feature/oauth2-provider'

  

  Michael Zhang

  committed
  f135a86

  Copy full SHA for f135a86

• Merge branch 'staging' of github.com:easyctf/ctf-calendar into staging

  

  Michael Zhang

  committed
  0d7d06f

  Copy full SHA for 0d7d06f

• Merge branch 'feature/tests' into staging

  

  Michael Zhang

  committed
  ce804ef

  Copy full SHA for ce804ef

• hi

  

  Michael Zhang

  committed
  b434ff1

  Copy full SHA for b434ff1

• Some stuff.

  

  Michael Zhang

  committed
  1c59dd5

  Copy full SHA for 1c59dd5

Commits on Feb 1, 2017

• Add TODO marking the invalidated redirect.

  chaosagent

  committed
  3c09f66

  Copy full SHA for 3c09f66