Skip to content

Conversation

@RamZallan
Copy link
Member

@RamZallan RamZallan commented Aug 7, 2019

🎉 🚢 :shipit: 🚀

View it live at pubsite.a.csh.rit.edu!

Here's a few previews, as well:
image

image

Closes #168
Closes #178
Closes #179
Closes #198

RamZallan added 30 commits May 15, 2019 17:16
@rswiernik
Copy link
Contributor

You might have already thought about this but since this PR is G R A N D E, it's probably worth squashing out commits so this is a nice clean cut over that can be easily tagged.

@RamZallan
Copy link
Member Author

@rswiernik would it make sense to just Squash + Merge? There's a few merge commits in the PR and some history was lost anyways moving between repos (originally on CSHPublicSiteV2, then my fork of this repo).

@rswiernik
Copy link
Contributor

I'm not sure that preserving the history for the dev of new versions of the site is really that important. If really wanted to, you could merge it into a separate historical branch on this repo, then merge that branch to master, squash the master history, then force push the new master history?

eg:

... Do some shit to get the history set up ...
[Reeds-MBP] tmp ❯ git checkout history                               (master|✔)
Switched to branch 'history'
[Reeds-MBP] tmp ❯ tree                                              (history|✔)
.
├── a
├── asdf
├── that
└── this

0 directories, 4 files
[Reeds-MBP] tmp ❯ git checkout master                                                                                         (history|✔)
Switched to branch 'master'
[Reeds-MBP] tmp ❯ git merge --squash history                                                                                   (master|✔)
Updating 72cf0f4..8dff9e0
Fast-forward
Squash commit -- not updating HEAD
 a    | 0
 asdf | 0
 that | 0
 3 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 a
 create mode 100644 asdf
 create mode 100644 that
[Reeds-MBP] tmp ❯ git log                                                                                                     (master|●3)
commit 72cf0f454d727369384043c5073146c6a8b7651d (HEAD -> master)
Author: Reed Swiernik <reed@plum.wine>
Date:   Wed Aug 7 15:36:33 2019 -0700

    first
[Reeds-MBP] tmp ❯ git status                                                                                                  (master|●3)
On branch master
Changes to be committed:
  (use "git reset HEAD <file>..." to unstage)

	new file:   a
	new file:   asdf
	new file:   that

[Reeds-MBP] tmp ❯ git commit -a -m "Update to new version"                                                                    (master|●3)
[master a898d3e] Update to new version
 3 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 a
 create mode 100644 asdf
 create mode 100644 that

@rswiernik
Copy link
Contributor

All that said, I would definitely prioritize having a single clean commit on master. But that's just me.

@rswiernik
Copy link
Contributor

Also, obligatory mention, this is your time to sneakily change the organization colors back to green/white/black. Just making sure that you have all the information you need before you merge this ;)

@RamZallan
Copy link
Member Author

Fixes #168 #178 #179 #198

Copy link
Member

@devinmatte devinmatte left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm happy to see this merged!

Please make sure that whoever merges this Squash and Merge when clicking.
After merged @RamZallan please switch the openshift project and webhooks to track from this project instead of your fork.

Also please tag the new commit with a version tag 😄

@devinmatte devinmatte merged commit d215a75 into ComputerScienceHouse:develop Aug 15, 2019
devinmatte pushed a commit that referenced this pull request Aug 15, 2019
* Transfer code from CSHPublicSiteV2 repo

* Remove local CSH Boostrap

* Update footer with social media links + how to apply

* Update sponsor image order, display, and alt text

* Update and add alumni company logos, tweak descriptive text

* Update eboard member names, update some images

* Fix nav condensing, update welcome back photo, fix some wording

* Add donation link to nav, update camping & holiday dinner pics

* Tweak footer, put nav in .contaner, remove accidental file

* Remove unused eboard photo js

* Update eboard photos

* Add Blog page, a few posts, and unique coloring for posts w/ no images

* Update tour slideshow images

* Update formatting, add Recent Posts section to homepage

* Update footer and nav content, tweak slider styles

* Update copy, replace some placeholder images

* Position footer absolutely at bottom of content

* Update copy, add images

* Update README, add GPLv3.0 license

* Update Jenkinsfile and config for staging URL

* Update footer spacing

* Add meta tags, remove placeholders, add links to Membership

* Fix nav links, remove unused directory

* Add WEBP files, functionality for many large images

* Add more alumni companies to list, update old logos

* Add page detailing the introductory process

* Tweak various styles

* Update nav, accessbility, copy

* Remove old files

* Update copy, html formatting

* Update arcade machine photos

* Update image for Collin's blog post

* Add FAQ page

* Move all images to S3

* Set max-height on homepage slider

* Bold Computer Science House in homepage about text

* Tweak slider CSS

* Move Tour page to About section

* Adding Firebase CI (#1)

* Fix minor readme typo
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.

Contact form broken Independent "How to Apply" Page Update Photos/Show More Photos Add FAQ Page

3 participants