Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Gh2master #400

Merged
merged 312 commits into from
Aug 21, 2020
Merged

Gh2master #400

merged 312 commits into from
Aug 21, 2020

Conversation

jburel
Copy link
Member

@jburel jburel commented Aug 21, 2020

  • merge gh pages and master. The merge was done using --allow-unrelated-histories
  • move demo files from master under docs/demo

will-moore and others added 30 commits January 18, 2015 01:02
@will-moore
Remove tooltip from github ticker
e6f67f8
@will-moore
New blog post: preparing OMERO.figure releases
f010da2
@will-moore
Add install instructions for Windows
cc5a23d
@will-moore
Tiny docs fix
58c66d1
@will-moore
colorpicker css & js
3aa6c31
@will-moore
Update demo/index.html prior to 1.1 release
a3eff00
@will-moore
Updating demo to 1.1 release candidate
f4393dc
@will-moore
New post: 'customizing-bootstrap-colorpicker'
53065b5
@will-moore
Moving jQuery <script> up to default.html template
dd89aa1
@will-moore
Add panel title to colorpickers in lsat post
ec4ad38
@will-moore
draft_release-1.1.0
6e08b59
@will-moore
Adding 'export as TIFF' and 'set dpi' to draft release post
f59b89e
@will-moore
Update nginx config post
959d896
@will-moore
Updating reportlab url
c351322
@will-moore
Fix broken 'templates.js' link in blog post
e7972c8
@will-moore
Adding 'Figure legend' to draft release post
6c71dd3
@will-moore
Release 1.0.1 blog post
bf1b197
@will-moore
Updating download links to figure-1.0.1.zip
08fc03e
@will-moore
Mentioning new features in index page
a47b654
@will-moore
Add 'python-markdown' to install docs
5a7778e
@will-moore
Adding 'target' and 'title' to top_links
b217f21
@will-moore
Index page tweaks
3cc0fa5
@will-moore
Added 'releases.html' page
1a7c670
@will-moore
Add 'Release History' summary to home page
cac8e80
@will-moore
Releases only within homepage (no releases page)
59bd569
@will-moore
Adding more details to beta releases
6ef3c7f
@will-moore
Remove 'release:true' flag from release blog posts
51de348
Merge pull request ome#70 from will-moore/releases_page
e66a0ce 
Releases summary
@will-moore
Merge remote-tracking branch 'origin/gh-pages' into index_1.1.0
a88f661
@will-moore
Small typo fixes to 1.1.0 draft release post
3b4279c
jburel and others added 28 commits May 21, 2018 11:55
@jburel
Rename files and update text
5e89110
@jburel
minor edit
c248571
@jburel
Add suggestion
4354115
@jburel
Merge pull request ome#293 from jburel/gh-pages-staging
15ac1f6 
Announcement for 4.0.0
@jburel
Merge pull request ome#295 from ome/gh-pages-staging
b07bb93 
Live deployment of figure.openmicroscopy.org
@jburel
New entry for release
bceeb8e
@jburel
Bump version
b7962c3
@jburel
Merge pull request ome#310 from jburel/gh-pages-staging
85d81fd 
4.0.1 announcement
@jburel
Merge pull request ome#311 from ome/gh-pages-staging
795cc39 
Live deployment of figure.openmicroscopy.org
@jburel
Add entry for release
da9f97b
@jburel
Merge pull request ome#313 from jburel/gh-pages-staging
6342a45 
4.0.2 release announcement
@manics
Bump version to 4.0.2
3da42d2
@jburel
Merge pull request ome#320 from manics/patch-1
7ecbcf2 
Bump version to 4.0.2
@will-moore
Fix JCB -> omero.lifesci.dundee.ac.uk links in demo 1.json
933713a
@jburel
Merge pull request ome#327 from will-moore/gh-pages-staging
ce2e70a 
Fix JCB -> omero.lifesci.dundee.ac.uk links in demo 1.json
@jburel
Merge pull request ome#328 from ome/gh-pages-staging
6621fa7 
Live deployment of figure.openmicroscopy.org
@jburel
re-organise before migration
f0afcb8
@jburel
remove file already on master
f4e6a84
@jburel
add redirect plugins
59a7ca8
@jburel
redirect to www.o.org
3d2cb13
@jburel
redirect to www.o.org annoucement or files on gh
a76d679
@jburel
move demo to docs
2436124
@jburel
redirect demo
908bdaf
@jburel
remove demo
33b2075
@jburel
redirect to demo figure
936d5cc
@jburel
Merge pull request ome#399 from jburel/gh-pages-reorganisation
ab4fe84 
Gh pages reorganisation
@jburel
Merge remote-tracking branch 'origin/gh-pages' into gh2master
a6b1b40
@jburel
move demo unders docs
d2aabd6
@will-moore
Copy link
Member

Discussed with @jburel so I understand what's going on.
Looks good, thanks 👍

@jburel jburel merged commit 9fb2e38 into ome:master Aug 21, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@jburel @will-moore @sbesson @joshmoore @manics