Skip to content

Commit 8b4b880

Browse files
authored
Merge pull request #1280 from Cycloctane/remove_tags
Remove invalid html tags inside hint.css tooltips
2 parents 2663869 + 319ddf4 commit 8b4b880

File tree

5 files changed

+7
-7
lines changed

5 files changed

+7
-7
lines changed

_licenses/cern-ohl-p-2.0.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ description: A permissive license for hardware designs, with conditions only req
77

88
how: Create a text file (typically named LICENSE or LICENSE.txt) in the root of your source code and copy the text of the license into the file.
99

10-
note: 'CERN <a href="https://ohwr.org/project/cernohl/wikis/uploads/8a6b5d01f71c207c49493e4d114d61e6/cern_ohl_p_v2_howto.pdf">recommends</a> adding the following information in the source files: copyright and license notice, a disclaimer of warranties and a source location. You can also include the source location in a part of the design which will be visible in the end product.'
10+
note: 'CERN <a href="https://gitlab.com/ohwr/project/cernohl/-/wikis/uploads/8a6b5d01f71c207c49493e4d114d61e6/cern_ohl_p_v2_howto.pdf">recommends</a> adding the following information in the source files: copyright and license notice, a disclaimer of warranties and a source location. You can also include the source location in a part of the design which will be visible in the end product.'
1111

1212
using:
1313
tedium: https://github.com/jboone/tedium/blob/master/LICENSE-CERN-OHL-P-v2

_licenses/cern-ohl-s-2.0.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ description: Permissions of this strongly reciprocal license for hardware design
77

88
how: Create a text file (typically named LICENSE or LICENSE.txt) in the root of your source code and copy the text of the license into the file.
99

10-
note: 'CERN <a href="https://ohwr.org/project/cernohl/wikis/uploads/cf37727497ca2b5295a7ab83a40fcf5a/cern_ohl_s_v2_user_guide.pdf">recommends</a> adding the following information in the source files: copyright and license notice, a disclaimer of warranties and a source location. You can also include the source location in a part of the design which will be visible in the end product.'
10+
note: 'CERN <a href="https://gitlab.com/ohwr/project/cernohl/-/wikis/uploads/cf37727497ca2b5295a7ab83a40fcf5a/cern_ohl_s_v2_user_guide.pdf">recommends</a> adding the following information in the source files: copyright and license notice, a disclaimer of warranties and a source location. You can also include the source location in a part of the design which will be visible in the end product.'
1111

1212
using:
1313
USB Armory: https://github.com/f-secure-foundry/usbarmory/blob/master/hardware/mark-two/LICENSE

_licenses/cern-ohl-w-2.0.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ description: Permissions of this weakly-reciprocal license are conditioned on ma
77

88
how: Create a text file (typically named LICENSE or LICENSE.txt) in the root of your source code and copy the text of the license into the file.
99

10-
note: 'CERN <a href="https://ohwr.org/project/cernohl/wikis/uploads/c2e5e9d297949b5c2d324a6cbf6adda0/cern_ohl_w_v2_howto.pdf">recommends</a> adding the following information in the source files: copyright and license notice, a disclaimer of warranties and a source location. You can also include the source location in a part of the design which will be visible in the end product.'
10+
note: 'CERN <a href="https://gitlab.com/ohwr/project/cernohl/-/wikis/uploads/c2e5e9d297949b5c2d324a6cbf6adda0/cern_ohl_w_v2_howto.pdf">recommends</a> adding the following information in the source files: copyright and license notice, a disclaimer of warranties and a source location. You can also include the source location in a part of the design which will be visible in the end product.'
1111

1212
using:
13-
Simple PCIe FMC carrier: https://ohwr.org/project/spec/blob/master/LICENSES/CERN-OHL-W-2.0.txt
13+
Simple PCIe FMC carrier: https://gitlab.com/ohwr/project/spec/blob/master/LICENSES/CERN-OHL-W-2.0.txt
1414
GProcessor8Bits: https://github.com/JonathSpirit/GP8B/blob/master/LICENSE
1515
FPGA Cores: https://github.com/suoto/fpga_cores/blob/master/LICENSE
1616

assets/js/app.coffee

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -144,9 +144,9 @@ class LicenseSuggestion
144144
callback null, info
145145
.fail (e) ->
146146
if e.status == 404
147-
callback new Error "Repository <b>#{repositoryFullName}</b> not found."
147+
callback new Error "Repository #{repositoryFullName} not found."
148148
else
149-
callback new Error "Network error when trying to get information about <b>#{repositoryFullName}</b>."
149+
callback new Error "Network error when trying to get information about #{repositoryFullName}."
150150

151151
# Generates a message showing that a repository is already licensed
152152
repositoryLicense: (repositoryFullName, license) ->

spec/license_meta_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
example_url.gsub!(%r{/tree/}, '/plain/')
5353
elsif example_url.start_with?('https://bitbucket.org/')
5454
example_url.gsub!(%r{/src/}, '/raw/')
55-
elsif example_url.start_with?('https://ohwr.org/')
55+
elsif example_url.start_with?('https://gitlab.com/')
5656
example_url.gsub!(%r{/blob/}, '/raw/')
5757
end
5858

0 commit comments

Comments
 (0)