Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
114 commits
Select commit Hold shift + click to select a range
1a56846
Removed slideshow, and replaced with Coming soon text
surveshS Oct 19, 2017
0e8685c
Update CNAME
dynamic11 Oct 20, 2017
01ec409
Added new website template for SPAC 2018
surveshS Oct 27, 2017
4914365
Dummy
surveshS Oct 27, 2017
af178f3
Adding Website Template for Spac 2018
surveshS Oct 27, 2017
bd36909
Removed old SPAC 2017 files
irushavm Oct 27, 2017
930f82e
Moved SPAC2018 files to root directory
irushavm Oct 27, 2017
969e71c
Merge pull request #1 from CarletonSLAM/migrate-to-spac-2018
irushavm Oct 27, 2017
3566f94
Fixed header menu and image url
irushavm Oct 27, 2017
9da2ed4
Merge pull request #2 from CarletonSLAM/minor-fixes
surveshS Nov 1, 2017
0d85934
Fixed resizing issues for google form and slideshow, and compressed i…
surveshS Nov 1, 2017
d348976
Merge branch 'fix-sizingOnDiffMedia'
surveshS Nov 1, 2017
46233e7
Remove unnecessary photos and compress slideshow images
irushavm Nov 1, 2017
b9eb049
Merge pull request #3 from CarletonSLAM/image-compress
surveshS Nov 2, 2017
b56a2cc
Removed commented out code, fixed google form, removed patronage images.
surveshS Nov 9, 2017
50f92f0
Fixed Google form sizing.
surveshS Nov 9, 2017
c8c0f92
Added the patron logos.
surveshS Nov 21, 2017
c5e5533
Removed all patron logos and replaced with text
surveshS Nov 22, 2017
36e61a1
Merge branch 'fix-Logos' of github.com:CarletonSLAM/SPAC into fix-Logos
surveshS Nov 22, 2017
48f50c3
Added ticketing form and contact us form.
surveshS Dec 3, 2017
5ce8595
fixed contact us form
surveshS Dec 3, 2017
7a08472
removed extra headers for ticketing and contact us
surveshS Dec 3, 2017
e3aee5f
Repositioned forms, corrected spelling mistakes, fixed headers.
surveshS Dec 3, 2017
c743335
Changed form colors, refactored some form code, to separate files.
surveshS Dec 3, 2017
b1b4430
Removed arrow near venue heading.
surveshS Dec 3, 2017
653d031
form edits
surveshS Dec 3, 2017
ef869c1
Updated Patrons and corresponding logos and hyperlinks.
surveshS Jan 3, 2018
942b375
fixed conflicts
surveshS Jan 3, 2018
3f49025
Fixed patron logo sizes and postioning.
surveshS Jan 4, 2018
30b60a4
Updated new jotform from Heemel's account.
surveshS Jan 5, 2018
325eefb
Fixed the ticketing interface.
surveshS Jan 6, 2018
c27cfe3
Fixed patronage package
irushavm Jan 10, 2018
52665ef
Added Accenture speaker.
surveshS Jan 12, 2018
734bd92
Merge branch 'patronFixes'
surveshS Jan 12, 2018
eb4c103
Updated Patrons
surveshS Jan 12, 2018
059bcff
Merge branch 'patronFixes'
surveshS Jan 12, 2018
34db359
Add Accenture Guest Speaker Image.
surveshS Jan 16, 2018
d31159a
Edited forms, and added volunteering form.
surveshS Jan 16, 2018
bba6d7c
Added Patron Blurbs
surveshS Jan 16, 2018
a2078e5
Added Annoucement Carousel
surveshS Jan 16, 2018
edba5b0
Fixed 1st annoucement text
surveshS Jan 16, 2018
217431d
Fixed Annoucment Text
surveshS Jan 16, 2018
d59b308
Cosmetic changes, fixed some spelling mistakes.
surveshS Jan 17, 2018
f1ae242
Removed Volunteers section.
surveshS Jan 17, 2018
41c4fba
Cosmetic changes within contact us section, just changed backgrond co…
surveshS Jan 17, 2018
0310bae
Fixed blurbs, and fixed Department of Engineering to Department of El…
surveshS Jan 17, 2018
3dc0499
Merge branch 'fix-Patrons'
surveshS Jan 17, 2018
61c2724
Added CSE Speaker
surveshS Jan 20, 2018
4d3e95b
Merge branch 'fix-SpeakerSection'
surveshS Jan 20, 2018
f0884e9
Fixed carousel typo.
surveshS Jan 20, 2018
8f65d91
Added CSE Speaker image.
surveshS Jan 23, 2018
2736417
Cosmetic changes to speaker images and added annoucments.
surveshS Jan 23, 2018
c8b7b34
Fixed typo in carousel.
surveshS Jan 23, 2018
e885f1a
Fixed Carousel.
surveshS Jan 23, 2018
dbeca81
Updated Carousel.
surveshS Jan 24, 2018
e882796
Updated Carousel
surveshS Jan 25, 2018
66cd225
Updated Annoucemnets.
surveshS Jan 25, 2018
e455414
Updated font size.
surveshS Jan 25, 2018
76d1945
Cosmetic changes, removed carousel and added some announcements.
surveshS Feb 3, 2018
59495c5
Added 2018 photos to spac website, removed the old photos.
surveshS Aug 4, 2018
487d6ab
Removed all 2018 references to use 2019.
surveshS Aug 30, 2018
c992546
Removed ticketing section, old footer for 2018, Adding SPAC 2019 is c…
surveshS Sep 23, 2018
b488c99
Added new patronage package and removed old one, added countdown time…
surveshS Oct 31, 2018
90c5287
Removed periods in event date between month and day.
surveshS Oct 31, 2018
caed2c6
Updated patron, ticketing, and speaker information for SPAC 2019
surveshS Nov 25, 2018
ce2cc4c
Removed full screen option on ticketing, also added compressed images…
surveshS Nov 27, 2018
407e4a2
Added Curtiss and CU Com Sci to Patrons Secton
surveshS Dec 2, 2018
952a24e
Added drdc, mindbridge ai, and martello patrons to the page
surveshS Dec 5, 2018
ace50c1
Updated 2019 Patrons.
surveshS Dec 23, 2018
08947c7
Resized patron images
surveshS Dec 23, 2018
6275457
Added missing patrons, and also added annoucement carousel
surveshS Jan 10, 2019
a4913b9
Updated speaker information, agenda, changed join us facebook link, a…
surveshS Jan 11, 2019
7a8fc67
Added patrons
surveshS Jan 13, 2019
0005f8c
Added Bank of Canada Patron.
surveshS Jan 14, 2019
88a2d84
Changed annoucment carousel.
surveshS Jan 14, 2019
2b396dd
Merge commits (bank of canada
surveshS Jan 14, 2019
373461f
Added gsa patron information
surveshS Jan 15, 2019
84488e7
Updated speaker information and new ieee patrons
Jan 19, 2019
c2d2d6b
Changed annoucemenets
Jan 22, 2019
f39f1b8
Added Algonquin patron
Jan 24, 2019
8fb35f5
Open IEEE gallery in a new window, removed the ticketing interface, r…
Jan 26, 2019
b088ffa
added my stuff
flora8984461 Oct 14, 2019
d326ca0
updated
flora8984461 Oct 14, 2019
e11befa
Create README.md
flora8984461 Oct 14, 2019
b15625f
Update README.md
flora8984461 Oct 14, 2019
b30afa1
Update LICENSE.txt
flora8984461 Oct 14, 2019
4f2cfe6
Merge branch 'SPAC2020' of https://github.com/CarletonSLAM/SPAC into …
flora8984461 Oct 14, 2019
0243746
compress the bg and venu img
flora8984461 Oct 14, 2019
763be05
Merge pull request #6 from CarletonSLAM/SPAC2020
webmaster-ieeecarleton Oct 15, 2019
435ffc1
updated as request
flora8984461 Oct 16, 2019
5527de4
Updated
flora8984461 Oct 16, 2019
ad465ed
Merge pull request #9 from CarletonSLAM/SPAC2020
webmaster-ieeecarleton Oct 25, 2019
9ecf5b8
update
flora8984461 Nov 3, 2019
7cc40a4
Add contact form and update CSS (#10)
flora8984461 Nov 4, 2019
52455f4
Done by Guy:Removed duplicate pics and fixed over-compressed gallery …
flora8984461 Nov 24, 2019
fcf16f6
Done by Guy:FAQ is done, improve loader fade
flora8984461 Nov 24, 2019
c9b0e30
Done by Guy:Removed duplicate pics and fixed over-compressed gallery …
flora8984461 Nov 24, 2019
c121ef0
make ticket form width 1000px max
flora8984461 Nov 24, 2019
b2239c1
Done by Guy: Add event previews in agenda
flora8984461 Nov 24, 2019
b8e6335
Merge branch 'master' into SPAC2020
flora8984461 Nov 24, 2019
ecd9150
changed 'JPG' to 'jpg'
flora8984461 Nov 24, 2019
7b0681a
Merge branch 'SPAC2020' of https://github.com/CarletonSLAM/SPAC into …
flora8984461 Nov 24, 2019
4c400ba
fixed FAQ for mobile view
flora8984461 Nov 25, 2019
1e4c704
fixed menu updates, removed useless code
flora8984461 Nov 25, 2019
fcd0bc9
add FAQ in menu
flora8984461 Dec 6, 2019
b1ba5cc
Updated logos 2020 (CISCO has not yet)
flora8984461 Jan 10, 2020
f362af0
Added CISCO and CU-DOE logo
flora8984461 Jan 11, 2020
2117a70
Added logos for WIE and Sys&Comp Dept CU
flora8984461 Jan 13, 2020
47a8cf9
Change the schedule from 6:45 to 7:00 and 7:00-7:45
flora8984461 Jan 14, 2020
e5a40a1
Updated WIE website
flora8984461 Jan 14, 2020
686488a
updated one speaker, uo-eng and algonquin logo
flora8984461 Jan 18, 2020
490a197
Added speaker img
flora8984461 Jan 18, 2020
7870f5e
Updated one speaker in agenda
flora8984461 Jan 18, 2020
b10931c
Updated 2nd speaker
flora8984461 Jan 22, 2020
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
node_modules
bower_components

2 changes: 1 addition & 1 deletion CNAME
Original file line number Diff line number Diff line change
@@ -1 +1 @@
www.ieeespac.ca
ieeespac.ca
56 changes: 56 additions & 0 deletions CREDITS.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
--------------------------------------------
Resources Credits :
--------------------------------------------

Bootstrap :
Website URL : http://getbootstrap.com/
License : The MIT License
License URL : https://github.com/twbs/bootstrap/blob/master/LICENSE

HTML5 Shiv :
Website URL : https://github.com/aFarkas/html5shiv
License : The MIT License
License URL : https://github.com/aFarkas/html5shiv/blob/master/MIT%20and%20GPL2%20licenses.md


Slick SLider :
Website URL : http://kenwheeler.github.io/slick/
License : The MIT License
License URL : https://github.com/kenwheeler/slick/blob/master/LICENSE

Ajax Contact Form :
Website URL : https://github.com/matt-west/ajax-contact-form
License : MIT
License URL : https://github.com/matt-west/ajax-contact-form/blob/master/LICENSE.txt

The Final Countdown :
Website URL : http://hilios.github.io/jQuery.countdown/
License : MIT
License URL : https://github.com/hilios/jQuery.countdown/blob/master/LICENSE.md


Font Awesome :
Website URL : http://fortawesome.github.io/Font-Awesome/
License : MIT
License URL : http://fortawesome.github.io/Font-Awesome/license/


Google Fonts :

Open Sans Font:
Website URL : https://fonts.google.com/specimen/Open+Sans
License : Apache License, version 2.0
License URL : http://www.apache.org/licenses/LICENSE-2.0.html

Montserrat Font:
Website URL : https://fonts.google.com/specimen/Open+Sans
License : SIL Open Font License, Version 1.1.
License URL : http://scripts.sil.org/cms/scripts/page.php?site_id=nrsi&id=OFL








8 changes: 8 additions & 0 deletions LICENSE.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@

Copyright 2019 IEEE Carleton

Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
4 changes: 4 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
# SPAC 2020
SPAC2020 Website Template<br>
Overwrite the old ones<br>
Front-end: HTML, CSS, JQuery
Binary file removed Thumbs.db
Binary file not shown.
11 changes: 11 additions & 0 deletions css/animate.min.css

Large diffs are not rendered by default.

Loading