Skip to content

Commit d015e9b

Browse files
committed
Merge remote-tracking branch 'upstream/homolog' into homolog
2 parents c025f80 + 9ab312c commit d015e9b

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+13457
-32
lines changed

Parse-Dashboard/app.js

+3-1
Original file line numberDiff line numberDiff line change
@@ -180,6 +180,7 @@ module.exports = function(config, options) {
180180
res.send(`<!DOCTYPE html>
181181
<head>
182182
<link rel="shortcut icon" type="image/x-icon" href="${mountPath}favicon.ico" />
183+
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-alpha.6/css/bootstrap.min.css" integrity="sha384-rwoIResjU2yc3z8GV/NPeZWAv56rSmLldC3R/AZzGRnGxQQKnKkoFVhFQhNUwEyJ" crossorigin="anonymous">
183184
<base href="${mountPath}"/>
184185
<script>
185186
PARSE_DASHBOARD_PATH = "${mountPath}";
@@ -205,6 +206,7 @@ module.exports = function(config, options) {
205206
res.send(`<!DOCTYPE html>
206207
<head>
207208
<link rel="shortcut icon" type="image/x-icon" href="${mountPath}favicon.ico" />
209+
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-alpha.6/css/bootstrap.min.css" integrity="sha384-rwoIResjU2yc3z8GV/NPeZWAv56rSmLldC3R/AZzGRnGxQQKnKkoFVhFQhNUwEyJ" crossorigin="anonymous">
208210
<base href="${mountPath}"/>
209211
<script>
210212
PARSE_DASHBOARD_PATH = "${mountPath}";
@@ -222,4 +224,4 @@ module.exports = function(config, options) {
222224
});
223225

224226
return app;
225-
}
227+
}

Parse-Dashboard/index.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@
55
<script>
66
PARSE_DASHBOARD_PATH = "/";
77
</script>
8+
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-alpha.6/css/bootstrap.min.css" integrity="sha384-rwoIResjU2yc3z8GV/NPeZWAv56rSmLldC3R/AZzGRnGxQQKnKkoFVhFQhNUwEyJ" crossorigin="anonymous">
89
</head>
910
<html>
1011
<title>Parse Dashboard</title>
1112
<body>
1213
<div id="browser_mount"></div>
1314
<script src="/bundles/dashboard.bundle.js"></script>
14-
1515
<script type="text/javascript">
1616
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
1717
(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+11-6
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,15 @@
11
{
22
"apps": [{
3-
"serverURL": "",
4-
"appId": "",
5-
"masterKey": "",
6-
"appName": "",
7-
"iconName": ""
3+
"serverURL": "https://parseapi.back4app.com",
4+
"appId": "D4jj50955Pxk161fg1UiOvoLd1IgAN7WxBq5HLT0",
5+
"masterKey": "dL7TbZk56teGrV6siaJOuGZAx3xXozcRP8pEztt6",
6+
"appName": "seiji",
7+
"feedbackEmail": "[email protected]"
88
}],
9-
"iconsFolder": "icons"
9+
"user": {
10+
"email": "[email protected]",
11+
"has_password": false,
12+
"account_keys": [],
13+
"name": "Seiji"
14+
}
1015
}

0 commit comments

Comments
 (0)