Commit Graph
100 Commits
Author SHA1 Message Date
Danny Brown e830d0f41e Merge pull request #481 from dannyrb/master
Add roadmap, update embedded-viewer recipe
2019-05-22 16:13:58 -04:00
Danny Brown 812c9bdb49 Merge branch 'master' into master 2019-05-22 16:01:44 -04:00
dannyrb b6fedc434a Update embedded viewer docs 2019-05-22 15:57:35 -04:00
dannyrb e5369b995a Roadmap section to readme 2019-05-22 15:24:38 -04:00
dannyrb 5a2eb9dacc Component library link in title bar 2019-05-22 15:22:59 -04:00
dannyrb 4759860c12 canny assets 2019-05-22 15:22:32 -04:00
dannyrb 6b4463b30a Add demo and roadmap to top of readme 2019-05-22 14:52:26 -04:00
Danny Brown 54253e2f84 Merge pull request #479 from OHIF/all-contributors/add-EsrefDurna
docs: add EsrefDurna as a contributor
2019-05-22 06:34:05 -04:00
Danny Brown 29f8496490 Merge pull request #475 from dannyrb/master
Note regarding meteor version branch location
2019-05-21 15:49:47 -04:00
dannyrb 5aa5b51f7d Note regarding meteor version branch location 2019-05-21 15:49:09 -04:00
Danny Brown 26f536e3fd Merge pull request #474 from dannyrb/master
Missing bracket
2019-05-21 15:13:46 -04:00
dannyrb a87f8326b1 Missing bracket 2019-05-21 15:13:23 -04:00
Danny Brown 7aaf7e8178 Merge pull request #473 from dannyrb/master
add docker badge to readme
2019-05-21 15:12:41 -04:00
dannyrb 125fe5afe5 add docker badge to readme 2019-05-21 15:11:35 -04:00
Danny Brown 567807c148 Merge pull request #472 from dannyrb/master
fix: Tag multiple docker images; push multiple docker images
2019-05-21 14:57:25 -04:00
dannyrb 14d99f1922 fix: Tag multiple docker images; push multiple docker images 2019-05-21 14:51:57 -04:00
Danny Brown d601c881f0 Merge pull request #471 from dannyrb/master
fix: Remove npmrc file if it exists
2019-05-21 14:43:24 -04:00
dannyrb 2a83318cd7 fix: Remove npmrc file if it exists 2019-05-21 14:42:47 -04:00
Danny Brown 6ac48f6c44 Merge pull request #470 from dannyrb/master
fix: push docker image with full version tag
2019-05-21 14:33:31 -04:00
dannyrb c2358c5059 fix: push docker image with full version tag 2019-05-21 14:33:04 -04:00
Danny Brown e950391d40 Merge pull request #469 from dannyrb/master
fix: Now that we can access our new version, lets see if we can use i…
2019-05-21 14:25:17 -04:00
dannyrb 762aee9efa fix: Now that we can access our new version, lets see if we can use it correctly in our docker tag 2019-05-21 14:24:47 -04:00
Danny Brown 4b1969da8a Merge pull request #468 from dannyrb/master
fix: Drop the tilde; may not be part of the workspace we're preserving
2019-05-21 14:13:17 -04:00
dannyrb a02a41f706 fix: Drop the tilde; may not be part of the workspace we're preserving 2019-05-21 14:12:47 -04:00
Danny Brown df4e3ce0c3 Merge pull request #466 from dannyrb/master
fix: Make sure we persist our npm_publish changes so docker_publish c…
2019-05-21 14:02:53 -04:00
dannyrb caf989f77c fix: Make sure we persist our npm_publish changes so docker_publish can access new version number 2019-05-21 14:01:14 -04:00
Danny Brown d96b8329cc Merge pull request #465 from dannyrb/master
fix: Create our tmp directory before we try to create a file in it
2019-05-21 13:50:10 -04:00
dannyrb 50a188a5f1 fix: Create our tmp directory before we try to create a file in it 2019-05-21 13:49:21 -04:00
Danny Brown 95629cfe12 Merge pull request #464 from dannyrb/master
fix: explicit txt extension for tmp version file
2019-05-21 13:43:13 -04:00
dannyrb ca881f207a fix: explicit txt extension for tmp version file 2019-05-21 13:41:42 -04:00
Danny Brown e3fdbc4f2a Merge pull request #463 from dannyrb/master
fix: Try to tag docker image w/ correct/new version number
2019-05-21 13:34:52 -04:00
dannyrb 0fc22f97dd fix: Try to tag docker image w/ correct/new version number 2019-05-21 13:33:50 -04:00
Danny Brown 14a19ca192 Merge pull request #462 from dannyrb/master
Add semantic-release/exec extension
2019-05-21 13:07:09 -04:00
dannyrb 768ac472f9 Add semantic-release/exec extension 2019-05-21 13:05:58 -04:00
Danny Brown 87cf8c210c Merge pull request #461 from dannyrb/master
Test improved docker image tagging
2019-05-21 13:01:48 -04:00
dannyrb e94a01a3e9 formatting 2019-05-21 13:00:03 -04:00
dannyrb 8cc9e5b485 Expand to multiple lines 2019-05-21 12:59:25 -04:00
dannyrb fdd74421cc Push latest tag as well 2019-05-21 12:55:50 -04:00
dannyrb 5feb29422c Try using latest version to bump docker image tag 2019-05-21 12:53:15 -04:00
Danny Brown e848cedbaf Merge pull request #460 from dannyrb/chore/create-tagged-docker-image
Chore/create tagged docker image
2019-05-20 21:32:18 -04:00
Danny Brown 21278c4405 Merge branch 'master' into chore/create-tagged-docker-image 2019-05-20 21:29:27 -04:00
dannyrb d9e9fc45a1 Add docker_publish to master merge 2019-05-20 21:27:47 -04:00
dannyrb 5e81fe8336 Add a default nginx config to use for our published image 2019-05-20 21:27:04 -04:00
dannyrb 851ec0be6a Add a docker_publish job 2019-05-20 21:26:39 -04:00
dannyrb c9630c6a8b Rename dockerfile-web --> dockerfile 2019-05-20 21:26:18 -04:00
dannyrb dea917bea4 Fix cpx command on linux? 2019-05-20 21:25:44 -04:00
Danny Brown c8270b29bf Merge pull request #458 from OHIF/all-contributors/add-allcontributors
docs: add allcontributors as a contributor
2019-05-20 12:04:55 -04:00
Danny Brown 89c0adeefe Merge pull request #457 from OHIF/all-contributors/add-dannyrb
docs: add dannyrb as a contributor
2019-05-20 12:04:19 -04:00
Danny Brown 392c865503 Merge pull request #456 from OHIF/all-contributors/add-galelis
docs: add galelis as a contributor
2019-05-20 12:03:52 -04:00
Danny Brown 75f7214512 Merge pull request #455 from OHIF/all-contributors/add-evren217
docs: add evren217 as a contributor
2019-05-20 12:03:20 -04:00
Danny Brown dc2975cca0 Merge pull request #454 from dannyrb/master
Shift/re-order contributors
2019-05-20 11:32:00 -04:00
dannyrb 749bb294f1 Shift/re-order contributors 2019-05-20 11:31:05 -04:00
Danny Brown f1ae712e0c Merge pull request #453 from OHIF/all-contributors/add-swederik
docs: add swederik as a contributor
2019-05-20 11:29:20 -04:00
Danny Brown 1f6e855e38 Merge branch 'master' into all-contributors/add-swederik 2019-05-20 11:29:15 -04:00
Danny Brown 1f104c7b29 Merge pull request #452 from dannyrb/master
Bump to latest versions (fixes some misc. icon issues)
2019-05-20 11:29:01 -04:00
Danny Brown 7c4fe9f306 Merge branch 'master' into master 2019-05-20 11:25:57 -04:00
Danny Brown 5e12182901 Merge pull request #451 from dannyrb/docs/yalc-docs
Docs/yalc docs
2019-05-20 11:25:44 -04:00
dannyrb ed80dd003f Bump to latest versions (fixes some misc. icon issues) 2019-05-20 11:24:26 -04:00
dannyrb c4c5e731c4 More context 2019-05-20 11:11:11 -04:00
dannyrb 7550cb5fd5 yalc usage instructions 2019-05-20 11:10:30 -04:00
Danny Brown e3d5a3392a Merge pull request #447 from dannyrb/fix/missing-roboto-font
Fix/missing roboto font
2019-05-19 20:20:59 -04:00
Danny Brown 7f8f84fefd Merge branch 'master' into fix/missing-roboto-font 2019-05-19 20:15:44 -04:00
dannyrb a45eb42e6b Add note regarding preference for SVG over entire font for logo text 2019-05-19 20:15:07 -04:00
dannyrb 05c0e1418c fix(index.html): Add Roboto Google Font dependency 2019-05-19 20:14:39 -04:00
dannyrb bb58a5f9f7 Docs for missing roboto font 2019-05-19 20:13:44 -04:00
Danny Brown 6fa65fa39b Merge pull request #446 from dannyrb/chore/remove-v1-config-files
Remove old configuration files
2019-05-19 15:40:12 -04:00
Danny Brown 3811293f36 Merge branch 'master' into chore/remove-v1-config-files 2019-05-19 15:37:49 -04:00
dannyrb b7a0440109 Remove old configuration files 2019-05-19 15:36:14 -04:00
Danny Brown 8978611869 Merge pull request #444 from dannyrb/fix/icons
Fix/icons
2019-05-17 16:20:25 -04:00
dannyrb 0cb179158e fix(icons): Fix icon path finding 2019-05-17 16:15:41 -04:00
dannyrb a03a3f7e29 sneak in remaining icon fix 2019-05-17 16:14:56 -04:00
dannyrb aa34839bf8 Remove unused setup buttons 2019-05-17 16:14:33 -04:00
dannyrb 4cd1763ab7 Fix // issue with icon path resolution 2019-05-17 16:00:37 -04:00
Danny Brown ab929c2827 Merge pull request #443 from OHIF/readme-fixes
docs(README): Fix URL in README, fix typo in docs
2019-05-17 14:44:30 -04:00
Danny Brown 4220419cfa Merge pull request #442 from OHIF/readme-fixes
docs(README.md): Updated README to fix URLs
2019-05-17 10:22:00 -04:00
Danny Brown e24f718081 Merge pull request #441 from dannyrb/fix/docs-deploy
Add .nojekyll file
2019-05-17 09:43:36 -04:00
Danny Brown 2f1b05c095 Merge branch 'master' into fix/docs-deploy 2019-05-17 09:43:30 -04:00
dannyrb c5faa1704d Add .nojekyll file 2019-05-17 09:42:38 -04:00
Danny Brown 83c062df31 Merge pull request #440 from OHIF/publish-docs
fix(publishStaticSite): Set publishStaticSite.sh to executable
2019-05-17 09:34:16 -04:00
Danny Brown 149ea452ad Merge pull request #437 from dannyrb/fix/docs-deploy
Try shelling out to use our GITHUB_TOKEN env variable
2019-05-16 01:17:48 -04:00
dannyrb c0d6e4cee9 Try shelling out to use our GITHUB_TOKEN env variable 2019-05-16 01:17:09 -04:00
Danny Brown c9db6e2a26 Merge pull request #436 from dannyrb/fix/docs-deploy
Try stubbed git user info
2019-05-16 00:38:13 -04:00
dannyrb 1c0b064d9b Try stubbed git user info 2019-05-16 00:37:12 -04:00
Danny Brown 9dd2177fa4 Merge pull request #434 from dannyrb/fix/docs-deploy
Trust unknown hosts in docs:publish step
2019-05-16 00:06:11 -04:00
dannyrb 39112c211d Employ same trick for publishing docs "trust" github host 2019-05-16 00:05:19 -04:00
Danny Brown c1c3241be4 Merge pull request #433 from dannyrb/fix/docs-deploy
Rename command to publish
2019-05-15 23:55:56 -04:00
dannyrb 462d4b5f10 Rename command to publish 2019-05-15 23:54:47 -04:00
Danny Brown d09abfd0e8 Merge pull request #432 from dannyrb/fix/docs-deploy
Publish docs to gh-pages on merge to master
2019-05-15 23:16:21 -04:00
dannyrb c90c3e2f98 Publish docs to gh-pages on merge to master 2019-05-15 23:12:46 -04:00
Danny Brown 6f4f098671 Merge pull request #431 from dannyrb/react
🎉 Let there be React 🎉
2019-05-15 22:00:53 -04:00
dannyrb f1b1c83751 Update circleci and semantic-release to handle master merges 2019-05-15 21:55:03 -04:00
dannyrb d69b014721 Merge branch 'master' into react
We're shifting master to a new branch named v1.x. Any changes made since the react branch were forked are not applicable to v2.x development. We'll recursively merge using the "ours" strategy, and then pull this into master to effectively make our "react" version (v2.x) the new master.
2019-05-15 21:47:18 -04:00
Danny Brown be8c243bf8 Merge pull request #427 from dannyrb/react
Set and use enabled element
2019-05-15 15:50:27 -04:00
dannyrb 776f5b0e8c No need to produce a warning here 2019-05-15 15:45:42 -04:00
dannyrb f925c8a380 bumpity bump bump 2019-05-15 15:09:48 -04:00
dannyrb 3d1a43f52d bump own version 2019-05-15 15:05:32 -04:00
dannyrb 36daa8afe2 bump react-cornerstone-viewport dependency version 2019-05-15 15:05:03 -04:00
dannyrb 49d574d8ac Position this absolutely near the top left of our page 2019-05-15 14:24:04 -04:00
dannyrb f1df6ebba5 bump 2019-05-15 09:22:48 -04:00
dannyrb 724ba44aee fix grabbing enabled element 2019-05-15 09:17:43 -04:00