github.com/techx/old-techfair-website commits

Merge branch 'master' of github.com:techfair/techfair

f123fcbb87f9fdba9db03c2050f9da3d312d82dd authored almost 12 years ago by Joshua Ma <[email protected]>

clear right for mugs

8eba730cc18f5008e2c7fcd3c01c1ef378d536aa authored almost 12 years ago by Joshua Ma <[email protected]>

Merge branch 'master' of github.com:techfair/techfair

bf534985c04368e6cdf78e64fb74f9031491d148 authored almost 12 years ago by Joshua Ma <[email protected]>

fix up lineup

677d1822fceb86a9ba70ba2051cded30952fc9df authored almost 12 years ago by Joshua Ma <[email protected]>

Merge branch 'master' of github.com:techfair/techfair

cd6c04dd8a08e786acf29ed4961f330b00f4f8c0 authored almost 12 years ago by Joshua Ma <[email protected]>

add techtalks info

328f345ef3cd6a1b93c8e9613ac3bde351a8d6a4 authored almost 12 years ago by Joshua Ma <[email protected]>

remove sr applications

7d0d84a1db0363434973ba418e5badbdcbd491e1 authored almost 12 years ago by Joshua Ma <[email protected]>

add eventbrite link

bd9233953cc11c89f55396e44aefcdfbe12b4bff authored almost 12 years ago by Joshua Ma <[email protected]>

added student exhibitors 2013

a9a1c7f75f4adb8ed58343b6e3a4163e8a7fd462 authored almost 12 years ago by Ben Frank <[email protected]>

exec team tweak

40d942f5775caef5e391e4007500d30cc673d6cd authored almost 12 years ago by Joshua Ma <[email protected]>

a bunch of minor tweaks based on feedback

fb3697ccc6c3a35885ec8cd6e70389c66ebc8fc8 authored almost 12 years ago by Joshua Ma <[email protected]>

Merge branch 'master', remote-tracking branch 'origin' into newfrontpage

a863e5be288dafa3e043fe7ccc9ddfd5f888d5c0 authored almost 12 years ago by Joshua Ma <[email protected]>

remove techtalks lineup for now

d08ade63222d740fd994a4731426b7d63e93d5b7 authored almost 12 years ago by Joshua Ma <[email protected]>

footer indentation, packages all sold out

b9e25d068f7aa6ea4ffc7bc1226ecffa2f24fa46 authored almost 12 years ago by Joshua Ma <[email protected]>

Clean up exhibitorlist, comment out students. Start adding footer nav.

93f27e1f00bda258400d18e550b11cf4fbc13f86 authored almost 12 years ago by Joshua Ma <[email protected]>

conflict resolution from pull

99bb8b3d4f0d0617dd124ac4fdc045b88f996132 authored almost 12 years ago by Ben Frank <[email protected]>

backed up exhibitorlist

94289dd60ad58366efeb477df77750410bd3a431 authored almost 12 years ago by Ben Frank <[email protected]>

updated exhibitor list

6f3241dc1d240fcde22680a52985cd4faafcd564 authored almost 12 years ago by Ben Frank <[email protected]>

uncommented out old sponsors, might as well

9e743faaa24effa434b0411f2ee19d050a6c89c5 authored almost 12 years ago by Joshua Ma <[email protected]>

took down 2012 list, put up temporary 2013 page

88f08a0775003690757c63e1b017c1522033a490 authored almost 12 years ago by Joshua Ma <[email protected]>

merge hackathon page

a341058dba5df89b6af81c0836bdea7681a9fed2 authored almost 12 years ago by Joshua Ma <[email protected]>

tentative talks, afterparty

279d3508d472a7638579490ef393ccfda0f55311 authored almost 12 years ago by Joshua Ma <[email protected]>

work on banquet, fair, and talks pages

8ba6e4abb06b37f639b86d51686361d3abfa1c32 authored almost 12 years ago by Joshua Ma <[email protected]>

massive reorg of pages for 2013, started work on tt and hackathon

193808088d37ee514a718ee7484b87e6ad0e80d0 authored almost 12 years ago by Joshua Ma <[email protected]>

change banquet time and hide speakers

b98171621b5fbfff9e912ddecdb10c93147fac7e authored almost 12 years ago by Joshua Ma <[email protected]>

Merge branch 'master' of github.com:techfair/techfair

40de79085d5409060a1aca68f824dd87b4fd35fe authored almost 12 years ago by Joshua Ma <[email protected]>

fix typo

2accea05b13dc3ceb4d29e4835ff29bb7f0b7e88 authored almost 12 years ago by Joshua Ma <[email protected]>

Increase events to 3500

3490c347a7359f4db8d14e883c4efd8580c2a7ca authored almost 12 years ago by Joshua Ma <[email protected]>

increase tt budget

2c4345a0bd096107a15062dc63943da02c10aaf0 authored almost 12 years ago by Joshua Ma <[email protected]>

link to events

5ead1c40495967da0624bdf50ed314e5bbbfdf4e authored almost 12 years ago by Joshua Ma <[email protected]>

tech talk details

ae334f9e22b64f0e088441ad09e200876fa430ce authored almost 12 years ago by Joshua Ma <[email protected]>

no yellow bg

d180b91dae9cfadac330213136f1454b7e160bb7 authored almost 12 years ago by Joshua Ma <[email protected]>

awesome map

28417b4113d516b84b557b88efddd8a099c0e0b0 authored almost 12 years ago by Joshua Ma <[email protected]>

made afterparty image relative

41201fb2ae37ac931ca7d9ed935c1e57d577cd56 authored almost 12 years ago by Joshua Ma <[email protected]>

more information on the front page

798bac65046be10254d083c6548f4c9ea97ae883 authored almost 12 years ago by Joshua Ma <[email protected]>

snapshot frontpage work in progress

ed85db2c2ef545b34202502bf354606ad7235411 authored almost 12 years ago by Joshua Ma <[email protected]>

initial work with homepage, new slider banner and some intro details

5118c94ce9ccdf5e32b7804cbd995b5ae42645bd authored almost 12 years ago by Joshua Ma <[email protected]>

2013 hackathon page update

cf61d0a3a7ac8de9d40114eaf06154caf9713f3c authored almost 12 years ago by Max Kolysh <[email protected]>

clean up css and home

ea73e81d2e69ee9be62b588c6d87205ff826cfe2 authored almost 12 years ago by Joshua Ma <[email protected]>

Merge branch 'master' of github.com:techfair/techfair

bf5f2f248076ecf3ffcd8bf5e1d4b1b71b574136 authored about 12 years ago by Joshua Ma <[email protected]>

more nav fix, for firefox

cde615200868808377941cc0abd2bedc3e69486e authored about 12 years ago by Joshua Ma <[email protected]>

Merge branch 'master' of github.com:techfair/techfair

01b16241eee228ad8ea869903a5d004c0ab7fa62 authored about 12 years ago by Joshua Ma <[email protected]>

spacing fix on intro page

101e97b1c1954f79fb2789e313f6c606f319fb37 authored about 12 years ago by Joshua Ma <[email protected]>

Merge branch 'master' of github.com:techfair/techfair

2d3575c38c1cbd51581d0be5ae8cc9b58d0dbfdf authored about 12 years ago by Joshua Ma <[email protected]>

fancy navigation for info page

5a860b8f83b87dcfdb43fb78ddc83580698a38a7 authored about 12 years ago by Joshua Ma <[email protected]>

Merge branch 'master' of github.com:techfair/techfair

343ae33075d7ae05b05eb2b663746802329b2644 authored about 12 years ago by Joshua Ma <[email protected]>

fix typos, bold some things

c3ae7f8a4015b806227500c07444a400fe021198 authored about 12 years ago by Joshua Ma <[email protected]>

Merge branch 'master' of github.com:techfair/techfair

70b42e1257dbe09e202470fe6990c1d0d61ade49 authored about 12 years ago by Joshua Ma <[email protected]>

add bold portal information

9c10957968d9722e52e9f17b4c6880fe0f9ed13b authored about 12 years ago by Joshua Ma <[email protected]>

Merge branch 'master' of github.com:techfair/techfair

66f02d625ab261cfa1cc8ce288b47770f099b295 authored about 12 years ago by Joshua Ma <[email protected]>

update info page with latest details

84ba76fb0f1e5545cfca0d8a995729a7817a8166 authored about 12 years ago by Joshua Ma <[email protected]>

bronze sold out

e6a390fd954ccc6ba79de250af0d207549d3ee82 authored about 12 years ago by Benjamin S Frank <[email protected]>

changed silver to sold out

0997535d1332a339f4cc4cb5a42e2fe694be5c9e authored about 12 years ago by Benjamin S Frank <[email protected]>

fixed exec layout bugs with clearfix

949614aed7f16914ba5ee8f53fc0c4a054857543 authored about 12 years ago by Benjamin S Frank <[email protected]>

update intro page

79f1fba731ae13665af215f12a67922a84a808f4 authored about 12 years ago by Joshua Ma <[email protected]>

change drop to point to new umeqo event

28d26b1321a476cefa363bd82456dcac4fa7de80 authored about 12 years ago by Joshua Ma <[email protected]>

fixed resume drop years

7006be8f24e4942a7d8f2293d60ce498a693653e authored about 12 years ago by Maksim Kolysh <[email protected]>

add style for em

8f710a93250605dcb9813f88751d27bcdc468856 authored about 12 years ago by Joshua Ma <[email protected]>

fix addresses

27f3f4d80ee2413bc4e36925b313c2285546a74d authored about 12 years ago by Joshua Ma <[email protected]>

fix li typo

e6fd10b51ae32d6277220f3ab3a89b3562902980 authored about 12 years ago by Joshua Ma <[email protected]>

html intro

e27371fd4594fff0238622ba604c9ee2e6de8925 authored about 12 years ago by Joshua Ma <[email protected]>

add dummy intro page

9b7de3b0716a5d751b5494a769b115e4ab371b71 authored about 12 years ago by Joshua Ma <[email protected]>

gold packages sold out

9db42796a005c814f31b51252fad5b3a469ac58d authored about 12 years ago by Benjamin S Frank <[email protected]>

added sr form

5447602629df5e1ef30d5257d708b8919efbc30a authored about 12 years ago by Benjamin S Frank <[email protected]>

added emily+anvisha's pics

082b54df7a5b51427f1cceacc6e34d1bdb4e913a authored about 12 years ago by Merry <[email protected]>

small visual changes to finance site -mkolysh

d9bbc59c472eff7241a4f33e536959ecfadaf12c authored about 12 years ago by Maksim Kolysh <[email protected]>

Merge branch 'master' of github.com:techfair/techfair

a414b3f9446534a2a4e75ecf8711cc2f0d23a66e authored about 12 years ago by Joshua Ma <[email protected]>

move A/V support up

1110aaf9cf258f0f81505520f20bdc2cdbbabd7b authored about 12 years ago by Joshua Ma <[email protected]>

Merge branch 'master' of github.com:techfair/techfair

20aeb0dda4a84af6e5cb647f47e9f9f34240110e authored about 12 years ago by Joshua Ma <[email protected]>

added please.

788265ae62cae006298017882acd563e7efa6be8 authored about 12 years ago by Joshua Ma <[email protected]>

Merge branch 'master' of github.com:techfair/techfair

9f48e8959cd7134c79a004f5b9d82e7cb0d1cbe0 authored about 12 years ago by Joshua Ma <[email protected]>

updated cr packages

7293f818e2ab82c1f57dd4d707a292d0c847e858 authored about 12 years ago by Joshua Ma <[email protected]>

updated finance site for 2013 - mkolysh

d3c67bea28942e14887f0b81d0aa44011f22c4f3 authored about 12 years ago by Maksim Kolysh <[email protected]>

fixed julie's broken silly pic

240345792e79cee97acc51ad179bab01f78ef35b authored about 12 years ago by Merry <[email protected]>

added silly pics to exec, added 2012 sponsors to past sponsors

e9f92c17a64b9248b1eff78c192610da82d4e4c1 authored about 12 years ago by Merry <[email protected]>

deleted old sponsors from footer

29d750ae29184776b9d4d82b88bba97cda8d38ec authored about 12 years ago by Merry Mou <[email protected]>

replaced exec pictures

77c7afb8d0cefb772444ab13ba77e1cf23e36cf7 authored about 12 years ago by Benjamin S Frank <[email protected]>

fixed text colors, backgrounds, exhibitor list syntax problems

29e690d68ad1f2f2ed9a994c7014f1d1687eddb0 authored about 12 years ago by Benjamin S Frank <[email protected]>

SR updated mailing list text

6ba1810921e7d640c553854a9c11e2045cec67dc authored about 12 years ago by Benjamin S Frank <[email protected]>

homepage changes 2

bafd2cb74d0f1d449025cedf7231c60eea72c59c authored about 12 years ago by Benjamin S Frank <[email protected]>

Merge branch 'master' of github.com:techfair/techfair

0ef1954a7fc917a72dd878390e0818d927a999d5 authored about 12 years ago by Benjamin S Frank <[email protected]>

resolved git conflicts from earlier work directly on server

da4f5087c9babacc0df689667d4fef1ba357721b authored about 12 years ago by Benjamin S Frank <[email protected]>

Merge branch 'master' of https://github.com/techfair/techfair

36f97c1f827fd33c5fc3c46dd09db7eafbe9e6a6 authored about 12 years ago by Benjamin S Frank <[email protected]>

homepage updates 1

9838aa3b959d6a59444474d69b668e74bc438bc8 authored about 12 years ago by Benjamin S Frank <[email protected]>

updated about us page (no silly pics yet); fixed board typo; changed 2012 to 2013 on footer

5f656237fc3d4818486847e6fe0be7271ca01d88 authored about 12 years ago by Merry <[email protected]>

Merge branch 'master' of github.com:techfair/techfair

e2eace5749f6b3aa77ef63cc76a0032a7f11726b authored about 12 years ago by Merry Mou <[email protected]>

updated about us description

8adb5d35a33650bd2e3e7ced6d1b59f8c9223913 authored about 12 years ago by mmou <[email protected]>

Merge branch 'master' of github.com:techfair/techfair

e33acae620d2bc84a5ae49f994c5a3c6b9d18ab0 authored about 12 years ago by Benjamin S Frank <[email protected]>

pushed back funding deadlines for sp

1778214c1a09bcc5f77171fd6a108e5efe433b4c authored about 12 years ago by Ben Frank <[email protected]>

updated company package amounts

05ed7a74402eace7907d7c795886696e26a6a217 authored about 12 years ago by Ben Frank <[email protected]>

Merge branch 'master' of github.com:techfair/techfair

77662e4608e82504a0a97191680669ae76587bdb authored about 12 years ago by Merry Mou <[email protected]>

changed more navbar names (not URLs)

de89b42c24a314b2efc39fde80a42cd05f8fa856 authored about 12 years ago by mmou <[email protected]>

Merge branch 'master' of github.com:techfair/techfair

6d5f5400a62f0b8d8436ffc4587b6b527d2ad571 authored about 12 years ago by Merry Mou <[email protected]>

changed to "summary of 2012 events"

ff18f74735595a1f3f8c9a102fb3738e5da9a808 authored about 12 years ago by mmou <[email protected]>

Merge branch 'master' of github.com:techfair/techfair

8107fb0b6b117ba1f43659922bd55497c9dd9c91 authored about 12 years ago by Merry Mou <[email protected]>

Update parts/templates/home.php

commented out video

c188b8b2417d365c955801d84cb9db6eadc780c0 authored about 12 years ago by mmou <[email protected]>

Merge branch 'master' of github.com:techfair/techfair

14ace367993244b0d941339adc2c43036fb6b224 authored about 12 years ago by Merry Mou <[email protected]>

Update js/jquery.prettyPhoto.js

continuing to attempt to comment out stuff to get rid of video

b780cb65bab1f59b7f747174d00d9a3e7ef42a71 authored about 12 years ago by mmou <[email protected]>

Merge branch 'master' of github.com:techfair/techfair

3752a9bea0f76cbe40336949832e6aecf32ea8a1 authored about 12 years ago by Merry Mou <[email protected]>

Update js/jquery.prettyPhoto.js

commented out video code

b8cecb926aaa6d1e2e899e557f1629b12bd52f27 authored about 12 years ago by mmou <[email protected]>

Ecosyste.ms: OpenCollective

github.com/techx/old-techfair-website