From 8ffa5bac956b618c988cbc25cf9749eddc99bc76 Mon Sep 17 00:00:00 2001 From: Didierdeng Date: Mon, 26 Nov 2018 18:10:14 -0500 Subject: [PATCH 1/7] test --- .idea/workspace.xml | 101 +++++++++++++++++++++++++++++++++++ pageContents/activities.html | 2 +- 2 files changed, 102 insertions(+), 1 deletion(-) create mode 100644 .idea/workspace.xml diff --git a/.idea/workspace.xml b/.idea/workspace.xml new file mode 100644 index 0000000..fa80dde --- /dev/null +++ b/.idea/workspace.xml @@ -0,0 +1,101 @@ + + + + + + + + + + + + + + + + + + + + + + + + true + DEFINITION_ORDER + + + + + + + + + + + + + + + + + 1543273608274 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/pageContents/activities.html b/pageContents/activities.html index 64425f8..104ce20 100644 --- a/pageContents/activities.html +++ b/pageContents/activities.html @@ -70,7 +70,7 @@

Upcoming Activities

-

Past CSSA Activities

+

Past CSSA Activities

From b14d245e23205832d23196298a1b63f1df267695 Mon Sep 17 00:00:00 2001 From: Didierdeng Date: Mon, 26 Nov 2018 18:11:20 -0500 Subject: [PATCH 2/7] test back --- pageContents/activities.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pageContents/activities.html b/pageContents/activities.html index 104ce20..64425f8 100644 --- a/pageContents/activities.html +++ b/pageContents/activities.html @@ -70,7 +70,7 @@

Upcoming Activities

-

Past CSSA Activities

+

Past CSSA Activities

From f6f65868e4aaeb80f1f403f227d6c887a54ec2e2 Mon Sep 17 00:00:00 2001 From: Didierdeng Date: Mon, 26 Nov 2018 18:15:46 -0500 Subject: [PATCH 3/7] test acitive - > activity --- .idea/workspace.xml | 81 +++++++++++++++++++++++++++++++++--- pageContents/activities.html | 2 +- 2 files changed, 77 insertions(+), 6 deletions(-) diff --git a/.idea/workspace.xml b/.idea/workspace.xml index fa80dde..d05cd72 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -15,15 +15,63 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -31,11 +79,16 @@ DEFINITION_ORDER - + + + + + + @@ -62,16 +115,15 @@ - - @@ -98,4 +150,23 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/pageContents/activities.html b/pageContents/activities.html index 64425f8..f36bca9 100644 --- a/pageContents/activities.html +++ b/pageContents/activities.html @@ -3,7 +3,7 @@
-
+

Upcoming Activities

From 76e024a1ddb0bc9c819dd3a758098c7fc7a22b02 Mon Sep 17 00:00:00 2001 From: Didierdeng Date: Fri, 15 Feb 2019 18:42:00 -0500 Subject: [PATCH 4/7] Member List Update Commit Update the CSSA member list to Didier2 --- .idea/encodings.xml | 4 ++ pageContents/about.html | 97 +++++++++++++++++++++-------------------- 2 files changed, 53 insertions(+), 48 deletions(-) create mode 100644 .idea/encodings.xml diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 0000000..15a15b2 --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/pageContents/about.html b/pageContents/about.html index 560a7dd..929de71 100644 --- a/pageContents/about.html +++ b/pageContents/about.html @@ -56,54 +56,55 @@

Our Vision

Meet Our Team

-

President

-

Jieyi Ding 19'

- -

Vice Presidents

-

Ying Wu 19'
VP of Event Planning

-

Claire Yang 19'
VP of Public Relations

-

Nicholas Wan 19'
VP of Technology

- - -

Treasurer

-

Wen Ren 20'

-

Jiatong Li 21'

- -

Event Planning Coordinators

-

Zihan Hu 19'
Event Planing Asst

-

Yici Wang 20'
Event Planing Asst

-

Yanbin Zhang 20'
Event Planing Asst

-

Jiayi Du 21'
Event Planing Asst

-

Ran Yan 20'
Event Planing Asst

-

Jing Dong 21'
Event Planing Asst

-

Yifei Zhao 21'
Event Planing Asst

-

Yunhao Liu 21'
Event Planing Asst

-

Xuanting Shi 21'
Event Planing Asst

-

Anni Qu 21'
Event Planing Asst

-

Lucy Zhou 21'
Event Planing Asst

-

Cheryl Wen 19'
Event Planing Asst

- -

Public Relations Coordinators

-

Xinyu Chen 21'
Fundraising Coord

-

Yu Zhang 21'
Fundraising Coord

-

Xinxuan Zhang 20'
Fundraising Coord

-

Shujun Wu 19'
Social Media Coord

-

Jiayi Ni 21'
Social Media Coord

-

Zixuan Liu 21'
Social Media Coord

-

Bingjie Liu 21'
Graphical Designer

-

Hangyu Zhong 21'
Social Media Coord

-

Hanchen Liu 21'
Social Media Coord

-

Devin Chen 20'
Social Media Coord

-

Xiaojia Liu 20'
Graphical Designer

-

Guohao Su 19'
Social Media Coord

-

Xinqi Mai 20'
Social Media Coord

- -

Technology Specialists

-

Guanlin He 19'
Web Engineer

-

Bowen Duan 20'
Web Engineer

-

Yuhe Zhu 20'
Web Engineer

-

Hanglin Zhou 20'
Web Engineer

-

Diwen Deng 21'
Web Engineer

+

Executive Board

+

Yanbin Zhang 20'
President

+
+

Hanglin Zhou 20'
CTO - Technology

+

Jing Dong 21'
CMO - Marketing

+

Hanyu Zhong 21'
CFO - Finance

+

Yici Wang 20'
COO - Operation

+ + +

Tech

+

Wallace He 19'
Software Engineer

+

Sherry Zhu 20'
Software Engineer

+

Bowen Duan 20'
Software Engineer

+

Zihan Hu 19'
Software Engineer

+

Wenqi Xiao 22'
Software Engineer

+

Yutong Xin 20'
Software Engineer

+

Didier Deng 21'
Software Engineer

+ +

Marketing

+

Xinyu Chen 21'
Public Relation

+

Ada 22'
Public Relation

+

Jieying Han 22'
Public Relation

+

Hantang Qin 22'
Public Relation

+

Amelie 22'
User Experience Design

+

Shuheng Chen 22'
User Experience Design

+

Ruojia Yang 21'
User Experience Design

+ + +

Finance

+

Jiatong Li 21'
Treasurer

+

Qingyang Dong 22'
Treasurer

+

Shurong Yan 22'
Treasurer

+

Bingjie Liu 21'
Fundraising

+

Shengjie Liu 22'
Fundraising

+

Summer 21'
Fundraising

+

Xiaodi Hu 21'
Fundraising

+ + +

Operations

+

Lucy 21'
Event Planning

+

Annie Qu 21'
Event Planning

+

Yunhao Liu 21'
Event Planning

+

Yifei Zhao 21'
Event Planning

+

Yaxin Xiao 22'
Event Planning

+

Yiwei Sun 21'
Event Planning

+

ZhenZhang 20'
Event Planning

+

Xinxuan Zhang 20'
Media

+

Aijia Liao 20'
Media

+

Du Yi 22'
Media

From 2da5e790fe7230ebecd6080bc595445f2ad1f738 Mon Sep 17 00:00:00 2001 From: hanglinzhou Date: Sun, 17 Feb 2019 14:22:03 -0500 Subject: [PATCH 5/7] A few changes --- .idea/workspace.xml | 202 ++++++++++++++++++++++++++++++++++------ pageContents/about.html | 8 +- 2 files changed, 175 insertions(+), 35 deletions(-) diff --git a/.idea/workspace.xml b/.idea/workspace.xml index d05cd72..d84f4d7 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -1,11 +1,15 @@ - + + + + - - + + - + + + + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -69,6 +117,7 @@ @@ -84,14 +133,49 @@