aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeLines
* Tweaks to the Infractions API for the botGravatar Momo2018-07-26-18/+45
* Merge branch 'momo/infractions-api' into 'master'Gravatar Gareth Coles2018-07-21-2/+696
|\
| * Infraction system API to replace RowboatGravatar Momo2018-07-21-2/+696
|/
* Merge branch 'update-dev-env' into 'master'Gravatar Leon Sandøy2018-07-18-40/+24
|\
| * updates docker-compose, changes default rdb port and handles a socket error i...Gravatar Christopher Baklid2018-07-08-40/+24
* | Merge remote-tracking branch 'origin/master'Gravatar Gareth Coles2018-07-15-0/+17
|\ \
| * \ Merge branch 'Hemlock_Work' into 'master'Gravatar Johannes Christ2018-07-13-0/+17
| |\ \
| | * | Updating resources.jsonGravatar LordHemlock2018-07-13-0/+17
| |/ /
* / / Prevent Google from indexing login-redirecting pagesGravatar Gareth Coles2018-07-15-1/+4
|/ /
* | Minecraft? Never heard of 'emGravatar Gareth Coles2018-07-13-12/+0
* | Merge branch 'feature/add-big-brother-api' into 'master'Gravatar Johannes Christ2018-07-12-0/+278
|\ \
| * | Add the big-brother API.Gravatar Johannes Christ2018-07-12-0/+278
|/ /
* | Check that the page is not NoneType before checking that the page has no cont...Gravatar Joseph2018-07-11-10/+11
* | Fix robots.txt for main blueprintGravatar Gareth Coles2018-07-11-1/+1
* | Merge remote-tracking branch 'origin/master'Gravatar Gareth Coles2018-07-11-1/+4
|\ \
| * | Do not add lock to page if there is no content on itGravatar Joseph2018-07-10-1/+4
* | | robots.txt: I can code, I swearGravatar Gareth Coles2018-07-11-1/+1
|/ /
* | Fix robots.txt templateGravatar Gareth Coles2018-07-10-1/+1
* | [Wiki] Add OG description text to pagesGravatar Gareth Coles2018-07-10-1/+4
* | All domains: sitemap.xml and robots.txtGravatar Gareth Coles2018-07-10-4/+253
* | Merge branch 'fix-numbers-in-channel-names' into 'master'Gravatar Leon Sandøy2018-07-10-2/+14
|\ \ | |/ |/|
| * Fix duplicate channel names in test.Gravatar Johannes Christ2018-07-09-0/+4
| * Allow numbers in channel names.Gravatar Johannes Christ2018-07-09-2/+10
|/
* Remove space from end of `JAMMERS_ROLE` id in constants.pyGravatar Joseph Banks2018-07-06-1/+1
* Settings routeGravatar momothereal2018-07-05-0/+64
* Merge branch 'momo/jam-winner' into 'master'Gravatar Gareth Coles2018-07-04-67/+376
|\
| * Revamp jam index, add winner team staff backend and user frontendGravatar Momo2018-07-04-67/+376
|/
* Update channel listingGravatar Gareth Coles2018-07-03-18/+39
* Merge remote-tracking branch 'origin/master'Gravatar Gareth Coles2018-07-03-1/+180
|\
| * Fix typo in table editor postGravatar Joseph2018-07-02-1/+1
| * Merge branch 'off-topic-channel-names-api' into 'master'Gravatar Gareth Coles2018-07-02-0/+179
| |\
| | * Add a simple API for off-topic category names.Gravatar Volcyy2018-07-02-0/+179
| |/
* / [Privacy] Point out that emailing GitLab does show your emailGravatar Gareth Coles2018-07-03-1/+23
|/
* Merge branch 'momo/optimize-team-list-v2' into 'master'Gravatar Momo2018-07-02-8/+11
|\
| * Optimize the team list, again.Gravatar Momo2018-07-02-8/+11
|/
* Merge branch 'momo/enhance-jam-index' into 'master'Gravatar Gareth Coles2018-07-02-4/+24
|\
| * Fix typo from last commitGravatar momothereal2018-06-19-1/+1
| * Needs a selfGravatar Momo2018-06-19-1/+1
| * Make it a class method (review comment)Gravatar Momo2018-06-19-6/+6
| * Disable the join button if the user has already applied to a code jamGravatar momothereal2018-06-19-4/+24
* | [Jams/Teams] Show pushes creating new branches in GitLab activityGravatar momothereal2018-06-26-3/+4
* | Merge remote-tracking branch 'origin/master'Gravatar Gareth Coles2018-06-24-5/+12
|\ \
| * | [Jams/Teams] Add day padding to activity feed, disabled submit button to avoi...Gravatar momothereal2018-06-24-5/+12
* | | [Jams] Fix broken team-jam assoc on editGravatar Gareth Coles2018-06-24-1/+14
|/ /
* | [Jams] Fix margin on theme labelGravatar Gareth Coles2018-06-24-3/+7
* | Fix broken flatpickrGravatar Gareth Coles2018-06-24-4/+8
* | Fix testsGravatar Gareth Coles2018-06-24-0/+6
* | Merge remote-tracking branch 'origin/master'Gravatar Gareth Coles2018-06-24-37/+57
|\ \
| * \ Merge branch 'momo/optimize-teams-list' into 'master'Gravatar Momo2018-06-23-37/+57
| |\ \
| | * | [Jams/Teams] Hopefully optimize jam team listGravatar momothereal2018-06-23-24/+16