pulling from master#1

Open

MXL88 wants to merge 126 commits into

Commits on Apr 21, 2015

Commits on Apr 27, 2015

adding map button in list view
MXL88
committed

Commits on Apr 30, 2015

Commits on May 2, 2015

Commits on May 6, 2015

Commits on May 7, 2015

replaced commons html to 2 separate html pages
MXL88
committed

Commits on May 11, 2015

After pull on Wed at 6pm css is messed up
MXL88
committed

Commits on May 13, 2015

Commits on May 14, 2015

fix mapview geolocation, add link to event page, added stuff for submission
gnn2
committed

Commits on May 15, 2015

mapview, submission form
gnn2
committed

Commits on May 18, 2015

added font fixed padding
chenjen
committed
fonts
chenjen
committed
fixed logo on far left top corner
chenjen
committed
logo changed
chenjen
committed
displaying nav and left sidebar with script
MXL88
committed
changed logo
chenjen
committed
merging Jenny's styles
MXL88
committed
submittion form validation
gnn2
committed

Commits on May 21, 2015

styles
chenjen
committed
Merge remote-tracking branch 'origin/Styling' into mapview
gnn2
committed
javascript for navs
chenjen
committed
small header
chenjen
committed
Added event images.
louisafan
committed
Merge branch 'master' into Styling
chenjen
committed
rso profile builder using a package
MXL88
committed
fixed merge conflicts
chenjen
committed
adding fonts
chenjen
committed
Change to https request
Cloud User
committed

Commits on May 22, 2015

After pull on Wed at 6pm css is messed up

MXL88
authored and
Shengyao Qian
committed
displaying nav and left sidebar with script

MXL88
authored and
Shengyao Qian
committed

Commits on May 23, 2015

Fix merge conflicts 然后谢谢学弟
Shengyao Qian
committed

Commits on May 25, 2015

accordian styled support page and using wizard for profile builder
MXL88
committed

Commits on May 27, 2015

updating form submit
gnn2
committed

Commits on May 28, 2015

merging rsoProfBuilder branch, includes scripted nav and side bars
MXL88
committed
merged Styles
chenjen
committed
marker clusters
chenjen
committed
Merge remote-tracking branch 'origin/master' into mapview
gnn2
committed
submission form tuggle between event and place
gnn2
committed
change urls to https
gnn2
committed
resolved merge conflict
MXL88
committed
resolved merge conflict
MXL88
committed
added sidebar to index
MXL88
committed
https request
gnn2
committed
Merge branch 'mapview'
gnn2
committed
Fix https request.
Shengyao Qian
committed

Commits on May 30, 2015

check css
chenjen
committed
After pull on Wed at 6pm css is messed up

MXL88
authored and
Shengyao Qian
committed
displaying nav and left sidebar with script

MXL88
authored and
Shengyao Qian
committed
Fix merge conflicts 然后谢谢学弟
Shengyao Qian
committed
marker clusters

chenjen
authored and
Shengyao Qian
committed
Fix css
Shengyao Qian
committed
fix merge conflicts
gnn2
committed
fix merge conflicts
chenjen
committed
Revert "Fix css"
chenjen
committed
linking listview to eventview is working
MXL88
committed
listView is now linked to eventView
MXL88
committed
Merge branch 'master' of https://github.com/Track-d/Tracked_Web_Client into mapview
gnn2
committed
Merge branch 'master' of https://github.com/Track-d/Tracked_Web_Client
chenjen
committed
Merge branch 'master' into Styling
chenjen
committed
fix merge conficts
chenjen
committed
fixed margin in index
chenjen
committed

Commits on May 31, 2015

Commits on Jun 2, 2015

Commits on Jun 3, 2015

added new org icon, list view's layout is good, org name is pulled from the database
MXL88
committed
resolved merge conflict
MXL88
committed
styles for support and about
chenjen
committed
pinterest style list view
chenjen
committed
eventView margin
chenjen
committed

Commits on Jun 4, 2015

Merge from Stying
Shengyao Qian
committed
Merge branch 'master' into mapview
gnn2
committed
Delete angular script
Shengyao Qian
committed
fix merge conflicts
MXL88
committed
Fix routing

Shengyao Qian
authored and
MXL88
committed
url routing and mapview to eventview is working
MXL88
committed
list view event pictures link to event and more event pictures are added to listview
MXL88
committed
adding event pictures
MXL88
committed
merge conflict resolved
MXL88
committed
Change to get real data
Shengyao Qian
committed
last changes
gnn2
committed
modify url
gnn2
committed
fix merge conflicts
gnn2
committed
nav bar and css
gnn2
committed
fix time converting issue
Shengyao Qian
committed
temp commit:use fake json data
Shengyao Qian
committed