Commit Graph

566 Commits

Author SHA1 Message Date
f0bee8ec7e Finished running jobs 2019-06-19 16:37:45 +02:00
3144bbf2ac More siteinfo.html tests 2019-06-19 11:25:18 +02:00
3e194bf4d5 More siteinfo.html tests 2019-06-19 11:22:23 +02:00
6fd4e584eb Minor fix siteinfo 2019-06-18 20:29:32 +02:00
9a2c15c818 Add link tests to siteinfo.md 2019-06-18 17:16:43 +02:00
67c58d2488 Try escaping broken image link through liquid wrapper 2019-06-18 16:32:28 +02:00
6732d27ec6 Merge branch 'master' of https://git.psi.ch/lsm-hpce/merlin6 2019-06-18 14:54:05 +02:00
af986555a3 Added Running Jobs 2019-06-18 14:53:39 +02:00
e7279d46f6 Adding HPCE logo
- Add logo to index.md
- Add favicon in several sizes
- remove extraneous images
- Add PSI logo to footer
2019-06-18 14:04:19 +02:00
2b901919c8 Added Running Jobs 2019-06-18 14:03:17 +02:00
2b990bfdef Requesting Merlin6 Accounts for Requesting Accounts 2019-06-18 11:07:06 +02:00
2f18499dee Updating 2019-06-18 10:47:52 +02:00
bdda294d64 Updated merlin6 account request 2019-06-18 10:19:16 +02:00
59e528d8d3 Updated merlin6 account request 2019-06-18 09:45:31 +02:00
e8a60c28ff Migration from merlin5 changes 2019-06-17 15:13:27 +02:00
3654238eb0 Also removing relative_url filters to work around incorrect baseurl
This could also be reverted if baseurl is correctly deployed.
2019-06-17 14:23:31 +02:00
6b84e38c6e Removing site.baseurl.
baseurl is important for cross-site theme compatibility.
Unfortunately our gitlab instance provides the incorrect baseurl.

This is a hack. If the configuration gets fixed this commit should
be reverted.
2019-06-17 14:15:11 +02:00
5c04f2167b Minor siteinfo fix 2019-06-17 13:31:24 +02:00
96e41e00b4 Adding siteinfo.html
Some basic debugging info
2019-06-17 13:28:29 +02:00
5132299419 Removing links from top-level folders in merlin6 sidebar 2019-06-17 11:45:38 +02:00
9a7b8710ba Add support for folder urls in the sidebar.
If present, clicking the folder goes to the URL itself. Toggling the folder requires
clicking the toggle arrow precisely. If URL is omitted, the whole folder title
works as a toggle.
2019-06-17 11:40:04 +02:00
c0626c4884 Create chapter division in sidebar 2019-06-14 21:01:13 +02:00
8b176ba65a Switching how baseurl gets encoded
Sometimes it was inserted as a //, which messed up
links.
2019-06-14 16:13:05 +02:00
08c028f3b7 Try another baseurl 2019-06-14 16:04:41 +02:00
45f16e7cfe Fix baseurl 2019-06-14 15:55:30 +02:00
ebff53c62c Migrating merlin6 user guide from jekyll-example1
From lsm-hpce/jekyll-example1 1eada07
2019-06-14 15:38:22 +02:00
7c6f7b177d Merge remote-tracking branch 'origin/master' 2019-06-14 15:03:28 +02:00
4aecacae58 Switch sidebar and topnav to use absolute URLs 2019-06-14 11:58:01 +02:00
52405ea5e6 Replacing default content with HPCE stuff
- Add README.md
- Customize _config.yml
- /merlin6/ pages (moved from merlin6-user-guide)
- remove demo products
- remove update.sh
2019-06-14 11:57:33 +02:00
f644a9b995 Use absolute paths for site-wide resources
Fixes https://github.com/tomjoht/documentation-theme-jekyll/issues/156
2019-06-14 10:26:36 +02:00
caa558a090 Update Mrlin6 documentation with latest changes, added new pages 2019-06-13 08:41:29 +02:00
caa63db616 Update Mrlin6 documentation with latest changes 2019-06-13 08:37:44 +02:00
e5d490759b Add README.md 2019-06-11 09:49:40 +02:00
4f3deaedaf Added Merlin6 user Guide 2019-06-07 19:27:58 +02:00
100eb526b4 not using var/build.sh since it relies on an ubuntu image 2019-05-28 23:53:38 +02:00
a3ebf6974d added new gitlab CI file and saved original one 2019-05-28 23:48:49 +02:00
0cf73259c1 added dependencies and changed jekyll config file for HPCE example 2019-05-28 23:38:28 +02:00
43665be576 updated gemfile; also updated links docs 2019-05-26 00:07:24 -07:00
3f04fb81c3 updates from all the PRs and other issues 2019-05-25 23:44:22 -07:00
fd189d28e2 Merge pull request #155 from alexearnshaw/patch-1
Update mydoc_install_jekyll_on_windows.md
2019-05-25 22:47:20 -07:00
d8861a2527 Merge pull request #152 from marckassay/patch-1
Update mydoc_yaml_tutorial.md
2019-05-25 22:47:01 -07:00
ac9d5df2c0 Merge pull request #151 from digitigrafo/gh-pages
Update of jquery and anchor js
2019-05-25 22:46:22 -07:00
eab1188bd2 Merge pull request #149 from jodumont/gh-pages
add --livereload in Dockerfile for a better workflow
2019-05-25 22:45:44 -07:00
b67cc5f90b Merge pull request #148 from Texterity/patch-1
Google's JSON Style Guide URL has changed
2019-05-25 22:44:48 -07:00
1736362876 Update mydoc_install_jekyll_on_windows.md
I'm trying out this theme and encountered some issues when trying to run the instructions on Windows 10 with Gitbash:
- Firstly the Downloads page for Ruby has changed somewhat and you can now install Ruby and the Ruby dev kit in one step
- Secondly I got an error when running jekyll serve which turned out to be caused by the fact that I had the Gemfile and Gemfile.lock in the wrong directory and Jekyll was trying to use the ones from the zip I downloaded from Github
I've updated the page with some changes to reflect the steps I followed to get the theme working.
Feel free to contact me with any questions and thanks for providing this theme!
2019-05-13 14:26:48 +01:00
8fc8c15a9e Update mydoc_yaml_tutorial.md
Small fixes; updated markdown to match data in `_data/samplelist.yml` and its relative path
2019-03-16 13:43:28 -04:00
a548b58a32 exclude vendor 2019-03-14 15:29:14 +01:00
7940097589 jquery3.3.1 and anchorjs 4.2 2019-03-14 15:28:06 +01:00
cfd67e5b0d update gitignore with .bundle and vendor 2019-03-14 15:26:50 +01:00
cf2d2ed3f5 build without github pages 2019-03-14 15:25:38 +01:00