Skip to content

Spac2020 #18

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.

Sign up for GitHub

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

Jump to bottom
Open
wants to merge 114 commits into
base: master
Choose a base branch
from
Open

Spac2020 #18

wants to merge 114 commits into from

Conversation

@flora8984461
Copy link

@flora8984461 flora8984461 commented Oct 14, 2019

SPAC2020

surveshS and others added 30 commits October 18, 2017 20:17
@surveshS
Removed slideshow, and replaced with Coming soon text
1a56846
@dynamic11
Update CNAME
0e8685c
@surveshS
Added new website template for SPAC 2018
01ec409
@surveshS
Dummy
4914365 
Dummy
@surveshS
Adding Website Template for Spac 2018
af178f3
@irushavm
Removed old SPAC 2017 files
bd36909
@irushavm
Moved SPAC2018 files to root directory
930f82e
@irushavm
Merge pull request #1 from CarletonSLAM/migrate-to-spac-2018
969e71c 
Migrate to spac 2018
@irushavm
Fixed header menu and image url
3566f94
@surveshS
Merge pull request #2 from CarletonSLAM/minor-fixes
9da2ed4 
Fixed header menu and image url
@surveshS
Fixed resizing issues for google form and slideshow, and compressed i…
0d85934 
…mages.
@surveshS
Merge branch 'fix-sizingOnDiffMedia'
d348976
@irushavm
Remove unnecessary photos and compress slideshow images
46233e7
@surveshS
Merge pull request #3 from CarletonSLAM/image-compress
b9eb049 
Remove unnecessary photos and compress slideshow images
@surveshS
Removed commented out code, fixed google form, removed patronage images.
b56a2cc
@surveshS
Fixed Google form sizing.
50f92f0
@surveshS
Added the patron logos.
c8c0f92
@surveshS
Removed all patron logos and replaced with text
c5e5533
@surveshS
Merge branch 'fix-Logos' of github.com:CarletonSLAM/SPAC into fix-Logos
36e61a1
@surveshS
Added ticketing form and contact us form.
48f50c3
@surveshS
fixed contact us form
5ce8595
@surveshS
removed extra headers for ticketing and contact us
7a08472
@surveshS
Repositioned forms, corrected spelling mistakes, fixed headers.
e3aee5f
@surveshS
Changed form colors, refactored some form code, to separate files.
c743335
@surveshS
Removed arrow near venue heading.
b1b4430
@surveshS
form edits
653d031
@surveshS
Updated Patrons and corresponding logos and hyperlinks.
ef869c1
@surveshS
fixed conflicts
942b375
@surveshS
Fixed patron logo sizes and postioning.
3f49025
@surveshS
Updated new jotform from Heemel's account.
30b60a4
flora8984461 and others added 30 commits October 13, 2019 23:45
@flora8984461
Update README.md
b15625f
@flora8984461
Update LICENSE.txt
b30afa1
@flora8984461
Merge branch 'SPAC2020' of https://github.com/CarletonSLAM/SPAC into …
4f2cfe6 
…SPAC2020
@flora8984461
compress the bg and venu img
0243746
@webmaster-ieeecarleton
Merge pull request #6 from CarletonSLAM/SPAC2020
763be05 
SPAC2020
@flora8984461
updated as request
435ffc1 
1)  remove the interactive lines background when mobile view

2) changed some animation to fix the white space on the right on mobile view

3) improved the views of gallery on mobile view

4) improve the view for videos and its introduction text, moved them to center

5) compressed the gallery imgs again

6) changed the img on right bottom corner for gallery
@flora8984461
Updated
5527de4 
1) Added Copywrite and MIT at footer
2) improve agenda view on smaller mobile
3) updated Counter timing
4) changed the "Become a patron today" button to hook to download patronage package at the patron section
@webmaster-ieeecarleton
Merge pull request #9 from CarletonSLAM/SPAC2020
ad465ed 
updated as request
@flora8984461
update
9ecf5b8 
Add contact us form;
Add ticket form;
Add tickets menu;
Add contact us menu;
Changed the words at "Join Us" on the two buttons as request.
@flora8984461 @ahmedsakr
Add contact form and update CSS (#10)
7cc40a4
@flora8984461
Done by Guy:Removed duplicate pics and fixed over-compressed gallery …
52455f4 
…pics
@flora8984461
Done by Guy:FAQ is done, improve loader fade
fcf16f6
@flora8984461
Done by Guy:Removed duplicate pics and fixed over-compressed gallery …
c9b0e30 
…pics
@flora8984461
make ticket form width 1000px max
c121ef0
@flora8984461
Done by Guy: Add event previews in agenda
b2239c1
@flora8984461
Merge branch 'master' into SPAC2020
b8e6335
@flora8984461
changed 'JPG' to 'jpg'
ecd9150
@flora8984461
Merge branch 'SPAC2020' of https://github.com/CarletonSLAM/SPAC into …
7b0681a 
…SPAC2020
@flora8984461
fixed FAQ for mobile view
4c400ba
@flora8984461
fixed menu updates, removed useless code
1e4c704
@flora8984461
add FAQ in menu
fcd0bc9
@flora8984461
Updated logos 2020 (CISCO has not yet)
b1ba5cc 
Updated logos 2020 (CISCO has not yet)
@flora8984461
Added CISCO and CU-DOE logo
f362af0
@flora8984461
Added logos for WIE and Sys&Comp Dept CU
2117a70 
Added logos for WIE and Sys&Comp Dept CU
@flora8984461
Change the schedule from 6:45 to 7:00 and 7:00-7:45
47a8cf9
@flora8984461
Updated WIE website
e5a40a1 
Updated WIE website to https://wie.ieeeottawa.ca/
@flora8984461
updated one speaker, uo-eng and algonquin logo
686488a
@flora8984461
Added speaker img
490a197
@flora8984461
Updated one speaker in agenda
7870f5e
@flora8984461
Updated 2nd speaker
b10931c
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@flora8984461 @surveshS @dynamic11 @irushavm @webmaster-ieeecarleton