Rostlab / JS16_ProjectF

In this project we will build a web portal for our GoT data analysis and visualization system. The website will integrate all the apps created in projects B-D with the help of the integration team assigned to Project E.

GNU General Public License v3.0

10 stars 8 forks source link

Landingpages #384

Closed yashha closed 8 years ago

yashha commented 8 years ago

Changes:

Finished jon snow
Far but not finished with the other both

Important!!: moved marked down to /config/markdown and added html files to static folder Keep that in mind when merging

Somebody needs to continue :)

169

mammuth commented 8 years ago

Dafuq, there were no merge conflicts, when merging locally? :open_mouth: Suspicious....

mammuth commented 8 years ago

Btw, what do our content-markdown files have to do with configs, @yashha ? :confused:

yashha commented 8 years ago

Wait I resolve it I moved the markdown files to a folder in the config

yashha commented 8 years ago

ok ^^

mammuth commented 8 years ago

I moved the markdown files to a folder in the config

Yes. I don't get why this makes sense.

yashha commented 8 years ago

It would serve the md files, too And I thought static are the folders called which are served staticly

yashha commented 8 years ago

you broke it :(

mammuth commented 8 years ago

Seems like images in the markdown files have the wrong references.

yashha commented 8 years ago

They have been right

yashha commented 8 years ago

let me resolve it

mammuth commented 8 years ago

Decide what you want :stuck_out_tongue_winking_eye: For me the build is running fine when correcting the image references in the plod-description.md to /images/xy.png

yashha commented 8 years ago

Do you wanna have a different folder structure?

mammuth commented 8 years ago

Nah, let's leave it like this.

Build is fixed, so I merge now