You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@skywalking.apache.org by ha...@apache.org on 2018/03/06 08:39:23 UTC
[incubator-skywalking-ui] branch fix/license created (now a330c29)
This is an automated email from the ASF dual-hosted git repository.
hanahmily pushed a change to branch fix/license
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking-ui.git.
at a330c29 Merge branch 'master' into fix/license
This branch includes the following new commits:
new 58330da Update license file
new a330c29 Merge branch 'master' into fix/license
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
--
To stop receiving notification emails like this one, please contact
hanahmily@apache.org.
[incubator-skywalking-ui] 01/02: Update license file
Posted by ha...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hanahmily pushed a commit to branch fix/license
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking-ui.git
commit 58330da77a43307965a990eca7fedbe5f4eeafc8
Author: hanahmily <ha...@gmail.com>
AuthorDate: Tue Mar 6 16:32:44 2018 +0800
Update license file
---
public/css/iconfont.css | 16 +++++++++-------
src/components/Trend/index.d.ts | 18 ++++++++++++++++++
src/components/Trend/index.js | 18 ++++++++++++++++++
src/e2e/home.e2e.js | 18 ++++++++++++++++++
src/index.ejs | 16 ++++++++++++++++
src/index.js | 18 ++++++++++++++++++
src/index.less | 17 +++++++++++++++++
src/router.js | 18 ++++++++++++++++++
src/theme.js | 18 ++++++++++++++++++
tests/run-tests.js | 18 ++++++++++++++++++
10 files changed, 168 insertions(+), 7 deletions(-)
diff --git a/public/css/iconfont.css b/public/css/iconfont.css
index 2ca477a..ef9b779 100644
--- a/public/css/iconfont.css
+++ b/public/css/iconfont.css
@@ -1,10 +1,12 @@
-@font-face {font-family: "iconfont";
- src: url('iconfont.eot?t=1516507130714'); /* IE9*/
- src: url('iconfont.eot?t=1516507130714#iefix') format('embedded-opentype'), /* IE6-IE8 */
- url('data:application/x-font-woff;charset=utf-8;base64,d09GRgABAAAAAAyQAAsAAAAAE1QAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAABHU1VCAAABCAAAADMAAABCsP6z7U9TLzIAAAE8AAAARAAAAFZW7k3TY21hcAAAAYAAAACjAAACGEGg6XVnbHlmAAACJAAAB/cAAAwE8ttzW2hlYWQAAAocAAAALwAAADYQM6XyaGhlYQAACkwAAAAcAAAAJAfeA4tobXR4AAAKaAAAABQAAAAoJ+kAAGxvY2EAAAp8AAAAFgAAABYO5ApgbWF4cAAACpQAAAAeAAAAIAEkAS1uYW1lAAAKtAAAAUUAAAJtPlT+fXBvc3QAAAv8AAAAlAAAALLrxH1JeJxjYGRgYOBikGPQYWB0cfMJYeBgYGGAAJAMY05meiJQDMoDyrGAaQ4gZoOIAgCKIwNPAHicY2Bk/sc4gYG [...]
- url('iconfont.ttf?t=1516507130714') format('truetype'), /* chrome, firefox, opera, Safari, Android, iOS 4.2+*/
- url('iconfont.svg?t=1516507130714#iconfont') format('svg'); /* iOS 4.1- */
+@font-face {
+ font-family: "iconfont";
+ src: url('iconfont.eot?t=1516507130714'); /* IE9 */
+ src:
+ url('iconfont.eot?t=1516507130714#iefix') format('embedded-opentype'),
+ url('data:application/x-font-woff;charset=utf-8;base64,d09GRgABAAAAAAyQAAsAAAAAE1QAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAABHU1VCAAABCAAAADMAAABCsP6z7U9TLzIAAAE8AAAARAAAAFZW7k3TY21hcAAAAYAAAACjAAACGEGg6XVnbHlmAAACJAAAB/cAAAwE8ttzW2hlYWQAAAocAAAALwAAADYQM6XyaGhlYQAACkwAAAAcAAAAJAfeA4tobXR4AAAKaAAAABQAAAAoJ+kAAGxvY2EAAAp8AAAAFgAAABYO5ApgbWF4cAAACpQAAAAeAAAAIAEkAS1uYW1lAAAKtAAAAUUAAAJtPlT+fXBvc3QAAAv8AAAAlAAAALLrxH1JeJxjYGRgYOBikGPQYWB0cfMJYeBgYGGAAJAMY05meiJQDMoDyrGAaQ4gZoOIAgCKIwNPAHicY2Bk/sc4g [...]
+ url('iconfont.ttf?t=1516507130714') format('truetype'),
+ url('iconfont.svg?t=1516507130714#iconfont') format('svg'); /* iOS 4.1- */
}
.iconfont {
@@ -51,7 +53,7 @@
.iconfont:before {
display: block;
- font-family: "iconfont" !important;
+ font-family: iconfont, sans-serif !important;
}
.icon-server:before { content: "\ebe2"; }
diff --git a/src/components/Trend/index.d.ts b/src/components/Trend/index.d.ts
index bb2b2a2..43f27fe 100644
--- a/src/components/Trend/index.d.ts
+++ b/src/components/Trend/index.d.ts
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
import * as React from 'react';
export interface TrendProps {
diff --git a/src/components/Trend/index.js b/src/components/Trend/index.js
index 2cbaad4..793ca52 100644
--- a/src/components/Trend/index.js
+++ b/src/components/Trend/index.js
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
import React from 'react';
import { Icon } from 'antd';
import classNames from 'classnames';
diff --git a/src/e2e/home.e2e.js b/src/e2e/home.e2e.js
index 15401f1..125f274 100644
--- a/src/e2e/home.e2e.js
+++ b/src/e2e/home.e2e.js
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
import Nightmare from 'nightmare';
describe('Homepage', () => {
diff --git a/src/index.ejs b/src/index.ejs
index 1f0c7fc..ea9c429 100644
--- a/src/index.ejs
+++ b/src/index.ejs
@@ -1,3 +1,19 @@
+<!--
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements. See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
<!DOCTYPE html>
<html lang="en">
diff --git a/src/index.js b/src/index.js
index 9cc1282..0cee0a3 100644
--- a/src/index.js
+++ b/src/index.js
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
import '@babel/polyfill';
import 'url-polyfill';
import dva from 'dva';
diff --git a/src/index.less b/src/index.less
index 5cfe914..618986a 100644
--- a/src/index.less
+++ b/src/index.less
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
html,
body,
:global(#root) {
diff --git a/src/router.js b/src/router.js
index 0f189f7..3c15d77 100644
--- a/src/router.js
+++ b/src/router.js
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
import React from 'react';
import { routerRedux, Switch } from 'dva/router';
import { LocaleProvider, Spin } from 'antd';
diff --git a/src/theme.js b/src/theme.js
index 9e12511..c4e9f23 100644
--- a/src/theme.js
+++ b/src/theme.js
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
// https://github.com/ant-design/ant-design/blob/master/components/style/themes/default.less
module.exports = {
// 'primary-color': '#10e99b',
diff --git a/tests/run-tests.js b/tests/run-tests.js
index 15c822c..19aee03 100644
--- a/tests/run-tests.js
+++ b/tests/run-tests.js
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
const { spawn } = require('child_process');
const { kill } = require('cross-port-killer');
--
To stop receiving notification emails like this one, please contact
hanahmily@apache.org.
[incubator-skywalking-ui] 02/02: Merge branch 'master' into
fix/license
Posted by ha...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hanahmily pushed a commit to branch fix/license
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking-ui.git
commit a330c29dcb664b196063e91ebbabe4e9cb9c301a
Merge: 58330da e55aadc
Author: hanahmily <ha...@gmail.com>
AuthorDate: Tue Mar 6 16:38:28 2018 +0800
Merge branch 'master' into fix/license
--
To stop receiving notification emails like this one, please contact
hanahmily@apache.org.