aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeLines
* updates docker-compose, changes default rdb port and handles a socket error i...Gravatar Christopher Baklid2018-07-08-40/+24
* 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
| | * | [Jams/Teams] De-associate delete teams from jamsGravatar momothereal2018-06-23-1/+25
| | * | [Jams/Teams] Simplify getting the code jam for a team (team -> jam)Gravatar momothereal2018-06-23-13/+17
| |/ /
* / / [API] Implement chunk-based user update mechanismGravatar Gareth Coles2018-06-24-91/+162
|/ /
* | [API] Check for DB-nuking empty data in users POSTGravatar Gareth Coles2018-06-23-4/+5
* | [Jams/Teams] Replace user Discord button with avatar linkGravatar momothereal2018-06-23-10/+16
* | [Jams/Teams] Reduce participant card paddingGravatar momothereal2018-06-23-2/+2
* | Styling and title adjustments to team listGravatar momothereal2018-06-23-5/+19
* | Merge branch 'teams-user-frontend' into 'master'Gravatar Gareth Coles2018-06-23-22/+840
|\ \
| * | Add some documentation to the team_edit_repo routeGravatar Momo2018-06-23-8/+28
| * | Fix linting issueGravatar momothereal2018-06-23-1/+1
| * | Show more helpful error messages when editing team repoGravatar momothereal2018-06-23-12/+29
| * | Some improvementsGravatar momothereal2018-06-23-7/+20
| * | Pluck team repo in team listGravatar momothereal2018-06-23-1/+1
| * | Fix linting issueGravatar momothereal2018-06-23-1/+1
| * | GitLab team repo storage, edit form, etc.Gravatar momothereal2018-06-23-20/+280
| * | Add button to jam index in team listGravatar momothereal2018-06-22-1/+7
| * | Rebuild JSGravatar momothereal2018-06-22-2/+2
| * | Merge branch 'master' into teams-user-frontendGravatar momothereal2018-06-22-265/+273
| |\ \ | |/ / |/| |
* | | Update Font-Awesome Pro to 5.1.0Gravatar Gareth Coles2018-06-21-4/+4
* | | [Jams] Allow editing info while preparingGravatar Gareth Coles2018-06-20-3/+3
* | | Fix RST editor loading on pages that use itGravatar Gareth Coles2018-06-20-263/+271
| * | Free some space in jam list, allow preparing state to edit infoGravatar momothereal2018-06-22-3/+3