-
-
Notifications
You must be signed in to change notification settings - Fork 5
Admin fixes #171
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Admin fixes #171
Changes from all commits
Commits
Show all changes
10 commits
Select commit
Hold shift + click to select a range
39c4d2a
Fix admin editing of events
Sherlouk 9274e32
Update Swift references throughout website
Sherlouk c4079cf
Temporarily enable the KotlinLeeds homepage
Sherlouk 28efd24
Linting because indents should block deploys
Sherlouk f7da140
update copy for adam
Sherlouk 03e7eda
disable KotlinLeeds website again
Sherlouk 212e51b
setup GCR logging
Sherlouk 1826285
add real error page
Sherlouk 3cfd1e3
fix zeroed durations
Sherlouk 5eba8b8
swiftformat vibes
Sherlouk File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,5 @@ | ||
| #extend("base"): | ||
| #export("title", "SwiftLeeds") | ||
| #export("title", event.event) | ||
|
|
||
| #export("content"): | ||
|
|
||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,5 @@ | ||
| #extend("base"): | ||
| #export("title", "SwiftLeeds") | ||
| #export("title", event.event) | ||
|
|
||
| #export("content"): | ||
| #extend("Shared/_header") | ||
|
|
@@ -13,7 +13,7 @@ | |
| <section class="container mb-5 pt-4 pb-2 py-mg-4"> | ||
| <div class="row justify-content-center"> | ||
| <div class="col-lg-9"> | ||
| <p>SwiftLeeds is a conference built by the community for the community and we take pride in our conference being a safe place for everyone. We take this very seriously and we expect everyone attending our conference to abide by these rules.</p> | ||
| <p>#(event.event) is a conference built by the community for the community and we take pride in our conference being a safe place for everyone. We take this very seriously and we expect everyone attending our conference to abide by these rules.</p> | ||
|
|
||
| <p>All attendees, speakers, sponsors and volunteers at our conference are required to agree to the following code of conduct. Organisers will enforce this code throughout the event. We expect cooperation from all participants to help ensure a safe environment for everybody.</p> | ||
|
|
||
|
|
@@ -31,7 +31,7 @@ | |
|
|
||
| <p>We expect participants to follow these rules at conference and workshop venues and conference-related social events.</p> | ||
|
|
||
| <p>If you have any questions please contact us on: <a href="mailto:[email protected]">[email protected]</a></p> | ||
| <p>If you have any questions please contact us on: #if(event.event == "KotlinLeeds"):<a href="mailto:info@kotlinleeds.com">[email protected]</a>#else:<a href="mailto:info@swiftleeds.co.uk">[email protected]</a>#endif</p> | ||
| </div> | ||
| </div> | ||
| </section> | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -20,9 +20,9 @@ | |
| <h3 class="h5 pb-1 pb-sm-2 pb-lg-3">Contact us</h3> | ||
| <ul class="nav flex-column mb-3"> | ||
| <li> | ||
| <a href="mailto:[email protected]" class="nav-link fs-lg fw-normal px-0 py-1"> | ||
| <a href="mailto:#if(event.event == "KotlinLeeds"):info@kotlinleeds.com#else:info@swiftleeds.co.uk#endif" class="nav-link fs-lg fw-normal px-0 py-1"> | ||
| <i class="bx bx-envelope fs-4 me-2"></i> | ||
| [email protected] | ||
| #if(event.event == "KotlinLeeds"):info@kotlinleeds.com#else:info@swiftleeds.co.uk#endif | ||
| </a> | ||
| </li> | ||
| </ul> | ||
|
|
@@ -51,6 +51,12 @@ | |
| <li class="nav-item"><a href="/" class="nav-link d-inline-block px-0 pt-1 pb-2">Home</a></li> | ||
| <li class="nav-item"><a href="/conduct" class="nav-link d-inline-block px-0 pt-1 pb-2">Code of Conduct</a></li> | ||
|
|
||
| #if(event.event == "KotlinLeeds"): | ||
| <li class="nav-item"><a href="https://swiftleeds.co.uk/" target="_blank" class="nav-link d-inline-block px-0 pt-1 pb-2">SwiftLeeds</a></li> | ||
| #elseif(event.event == "SwiftLeeds"): | ||
| <li class="nav-item"><a href="https://kotlinleeds.co.uk/" target="_blank" class="nav-link d-inline-block px-0 pt-1 pb-2">KotlinLeeds</a></li> | ||
| #endif | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 👌🏼 |
||
|
|
||
| #if(false): | ||
| <li class="nav-item"><a href="/accessibility" class="nav-link d-inline-block px-0 pt-1 pb-2">Accessibility & Inclusivity</a></li> | ||
| #endif | ||
|
|
@@ -62,7 +68,7 @@ | |
| </div> | ||
| </div> | ||
| <p class="nav d-block fs-sm pt-5 mb-0 text-light opacity-60"> | ||
| #copyright(2021, "SwiftLeeds") | ||
| #copyright(2021, event.event) | ||
| </p> | ||
| </div> | ||
| </footer> | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.