Skip to content
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

Master into develop #155

Closed
wants to merge 3 commits into from
Closed

Master into develop #155

wants to merge 3 commits into from

Conversation

Boris van Hoytema and others added 3 commits September 28, 2020 16:50
Release with new introductory line
* first folder restructure, added case for support history to who-we-are/index.md

* now with all the files: 1st folder restructure, add case for support intro

* add redirects /careers files

* add redirects to all /team files

* partially update footer.liquid (unfinished!)

* update footer.liquid

* Add redirects from .jpgs

* remove trailing spaces

* fix broken photo links on careers/index.md

* Update homepage

* Proofreading

* update b0rked link

* Fixed team photograghs

Add team/ to the URI in img tag src property in who-we-are/index.md.

* Fix path in default variables

* Blog CTA update, typo fix

* Replace photo of Ben in hopes of a less fuzzy outcome

* Update intro sentence on who-we-are/careers/index.md

Co-authored-by: lboms <[email protected]>

* Update who-we-are/index.md

Co-authored-by: lboms <[email protected]>

* Add lightbox.css and style_codebases.scss files

* Add files via upload

* delete codebase overview .md files, add images folder

* dummy content to force images folder to show up

* more folders!

* remove space OpenZaak

* Images!

* Signalen images!

* replace codebases/index.md with index.html

* Remove dummy files

* Create dummy-file.md in /assets

* Adding 2 CSS files for Codebases

* delete dummy file

* Delete codebase_openzaak.html

Accidental inclusion. No HTML should be in this commit.

* Delete codebase_signalen.html

Accidental inclusion. No content should be in this commit.

* Delete index.html

Accidental inclusion. No content should be in this commit.

* Revert "Signalen images!"

This reverts commit ea6afcc.

* Revert "Images!"

This reverts commit 665a1e5.

* Revert "delete codebase overview .md files, add images folder"

This reverts commit 53dcbec.

* Fix merge conflict on openzaak product website URL

* Revert "replace codebases/index.md with index.html"

This reverts commit 1f1ceaa.

* Delete codebases.html

This content file should not have been included in this commit.

* Update style_codebases.scss

Adding "---" x2 at start of file in order to enable Jekyll's SCSS->CSS transpiring.

Co-authored-by: ElenaFdR <[email protected]>

* Add coffeescript plugin

To enable compiling of .scss files

* Revert "Add coffeescript plugin"

* Pull careers out into its own file

* updated bio

* Update deborah-meibergen.md

added link to LinkedIn

* Update deborah-meibergen.md

* Update deborah-meibergen.md

* Update index.html

A suggestion how to add the mentioning of the standard on the homepage, under ' what we do'

* fix Standard URL

* Remove Matrix configuration

We've tried using Riot for team and community communications
and have decided against using it.
Thus we don't need these identifiers anymore.

* Break out standard section, add illustration

* Move codebase stewardship quote to index

We've identified that we'd like to have a bit more success up front,
perhaps this can help.

* Add link to careers back to footer

* Proofreading Deborah's updated bio (removing hyphens)

* test escaping line with Twitter link from coding standards

* update footer to correct /who-we-are link

* remove // @codingStandardsIgnoreLine

* Remove all links to Twitter from team bios (plus some delinting)

* Remove all links to Twitter from personal bios, plus some delinting

* manually updating this branch with develop

* HTMLproofer ignore all Twitter links

* HTMLproofer ignore #

* Shorten Standard description text

* Change verb on Standard H2

* Remove first / from Standard URL

* fix duplicate @demkodo profiles from #99

* add newline at end of script/test.sh file

* Adding explicit class in place of complex/unused font-size switches

* standardize periods after hyperlinked sentences on index

* Circleizing the testimonial photo (+ class, + border radius)

* Adding testimonial-attribution class, and forcing blockquote font-size

* Publiccode.net codebases content (#111)

Future improvement for lightbox gallery feature: #140

* Adding the template for individual Codebase pages

* Adding new HTML files for index and individual codebases

* Adding logos and gallery images for new Codebases pages

* Update OpenZaak.org URL

* Fix OpenZaak URL in file deleted from origin?

* Revert "Fix OpenZaak URL in file deleted from origin?"

This reverts commit 246d379.

* Fix broken link to About from codebases/index.html

* fix wrong OZ & Signalen logo links on codebases/index.html

* Update codebase page and project links

* delete openzaak.md

* delete signalen.md

* delete codebases/index.md

* Change layout template

* Change layout to 'codebase'

* Fix image links

* Fixing image URLs

* Add alt tags to gallery images

* Add alt tags to gallery images

* Update codebase.html

refactored to enable nesting into Site template.
attempting new way to include CSS.

* Update index.html

refactored to enable nesting in Site template

* Update openzaak.html

refactored to enable nesting in Site template

* Update signalen.html

refactored to enable nesting in Site template

* Delete old Signalen logo

* Add files via upload

adding Signalen's new logo

* Update index.html

re-updating title to "Codebases we work with"

* Update openzaak.html

re-updating title to "Codebases we work with"

* Update signalen.html

re-updating title to "Codebases we work with"

* Update codebase.html

adding breadcrumb nav (first attempt)

* Update index.html

fixing/adding link URLs

* removing oversized Signalen logo

* resized Signalen logo

* fixing relative URL in gallery

* updating code comment to use proper "Codebases we work with" verbiage

* updating copy and link in top section of page

* Verbiage updates

* Adding img alt tags and attempting to fix Travis error related to lightbox gallery

* adjusting lightbox gallery linkage (#_ to #) in an attempt to satisfy travis error

* proofreading

Co-authored-by: Jan Ainali <[email protected]>

* adding content to the hrefs to satisfy travis

* Update alt text on Signalen screenshot

Co-authored-by: Jan Ainali <[email protected]>

* Update alt text on Signalen screenshot

Co-authored-by: Jan Ainali <[email protected]>

* Update alt text on Signalen screenshot

Co-authored-by: Jan Ainali <[email protected]>

* Update alt text on Signalen product screenshot

Co-authored-by: Jan Ainali <[email protected]>

* more robust handling of lightbox button content

* Standardize references to VNG on Signalen page

* Update English name of VNG on OpenZaak page

* re-applying css button fixes

* Expand acronym for SaaS

Co-authored-by: Jan Ainali <[email protected]>

* remove "logo" from Signalen and OpenZaak logo alt text

* expand 'repo', fix typo

* Update alt text on OpenZaak screenshot

Co-authored-by: Jan Ainali <[email protected]>

* Update alt text on OpenZaak screenshot

Co-authored-by: Jan Ainali <[email protected]>

* expand 'the Foundation' to full name everywhere but job ads

* Add OpenZaak governance as an activity we've worked on

* fix for travis rejecting interal hashes, w/out requiring config change

* Revert "fix for travis rejecting interal hashes, w/out requiring config change"

This reverts commit ea2a233.

* Updating "#" link to more idiosyncratic "#_", and fixing a gallery link

Co-authored-by: ElenaFdR <[email protected]>
Co-authored-by: Jan Ainali <[email protected]>

* add redirects for Alba

* Remove extension from redirect

Tested with both the /team/alba-roza.jpg and /team/alba-roza.html

* remove file extensions from bio redirects

* update redirect from former team/index link

* Update style_codebases.scss

Removing internal monologue comments and commented-out code

Co-authored-by: James Lowry <[email protected]>
Co-authored-by: Boris VAN HOYTEMA <[email protected]>
Co-authored-by: lboms <[email protected]>
Co-authored-by: angelplasma <[email protected]>
Co-authored-by: Deborah Meibergen <[email protected]>
Co-authored-by: Martin Dias d'Ullois <[email protected]>
Co-authored-by: Jan Ainali <[email protected]>
Co-authored-by: Eric Herman <[email protected]>
@ElenaFdR
Copy link
Member Author

ElenaFdR commented Feb 3, 2021

Closed in favor of creating a branch to more easily resolve the merge conflict (#156).

@ElenaFdR ElenaFdR closed this Feb 3, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant