Merge

.eslintrc.json

@@ -1,8 +1,15 @@
 {
-    "env": {
-        "es6": true,
-        "node": true,
-        "browser": true
+  "env": {
+    "es6": true,
+    "node": true,
+    "browser": true
+  },
+  "parser": "babel-eslint",
+  "extends": "eslint:recommended",
+  "parserOptions": {
+    "ecmaFeatures": {
+      "experimentalObjectRestSpread": true,
+      "jsx": true
     },
     "parser": "babel-eslint",
     "extends": "eslint:recommended",
@@ -17,13 +24,15 @@
         "react"
     ],
     "rules": {
-        "react/jsx-uses-vars": 1,
-        "react/jsx-uses-react": 1,
-        "react/react-in-jsx-scope": 1,
-        "no-console": 0,
-        "no-case-declarations": 0
+      "react/jsx-uses-vars": 1,
+      "react/jsx-uses-react": 1,
+      "react/react-in-jsx-scope": 1,
+      "no-console": 0,
+      "no-case-declarations": 0,
+      "quotes": ["error", "single"]
     },
     "globals": {
       "b4aSettings": true
     }
+  }
 }

.github/stale.yml

@@ -4,15 +4,18 @@ daysUntilStale: 45
 daysUntilClose: 7
 # Issues with these labels will never be considered stale
 exemptLabels:
-  - pinned
-  - security
-  - good-first-pr
-  - up-for-grabs
+  - bug
   - enhancement
+  - feature request
+  - good first pr
   - help wanted
-  - bug
+  - pinned
+  - security
+  - up for grabs
 # Label to use when marking an issue as stale
-staleLabel: wontfix
+staleLabel: stale
+# Limit to only `issues` not `pulls`
+only: issues
 # Comment to post when marking an issue as stale. Set to `false` to disable
 markComment: >
   This issue has been automatically marked as stale because it has not had

CHANGELOG.md

@@ -1,9 +1,26 @@
 ## Parse Dashboard Changelog
 
 ### master
-[Full Changelog](https://github.com/parse-community/parse-dashboard/compare/2.0.4...master)
+[Full Changelog](https://github.com/parse-community/parse-dashboard/compare/2.1.0...master)
+
+### 2.1.0
+[Full Changelog](https://github.com/parse-community/parse-dashboard/compare/2.0.5...2.1.0)
+
+__New features:__
+* Added JS Console to run custom queries ([#1464](https://github.com/parse-community/parse-dashboard/pull/1464)), thanks to [Pedro Mutter](https://github.com/MutterPedro).
+* View/Edit single row modal ([#1448](https://github.com/parse-community/parse-dashboard/pull/1448)), thanks to [NIno Črljenec](https://github.com/NinoZX).
+* Context menu with quick filters and links to related records in other Parse Objects ([#1431](https://github.com/parse-community/parse-dashboard/pull/1431)), thanks to [404-html](https://github.com/404-html).
+* Add ProtectedFields dialog and enhance Permissions dialogs ([#1478](https://github.com/parse-community/parse-dashboard/pull/1478)), thanks to [Old Grandpa](https://github.com/BufferUnderflower).
+
+__Improvements:__
+* Added config param delete confirmation dialog ([#1443](https://github.com/parse-community/parse-dashboard/pull/1443)), thanks to [Manuel Trezza](https://github.com/mtrezza).
+
+__Fixes:__
+* Inifite scroll not working ([#1432](https://github.com/parse-community/parse-dashboard/pull/1432)), thanks to [Douglas Muraoka](https://github.com/douglasmuraoka).
+* Fix crash in import semver re: npm/node-semver#305 ([#1441](https://github.com/parse-community/parse-dashboard/pull/1441)), thanks to [Ben Petty](https://github.com/benpetty).
+* Taking hidden columns into account when calculating Editor position ([#1438](https://github.com/parse-community/parse-dashboard/pull/1438)), thanks to [404-html](https://github.com/404-html).
+* Fix audience conditions when Installation class does not exist ([#1451](https://github.com/parse-community/parse-dashboard/pull/1451)), thanks to [Antonio Davi Macedo Coelho de Castro](https://github.com/davimacedo).
 
-* _Contributing to this repo? Add info about your change here to be included in next release_
 ### 2.0.5
  [Full Changelog](https://github.com/parse-community/parse-dashboard/compare/2.0.4...2.0.5)
  * Fix: delete and regenerate package-lock to fix broken build

Parse-Dashboard/Authentication.js

@@ -1,4 +1,4 @@
-"use strict";
+'use strict';
 var bcrypt = require('bcryptjs');
 var csrf = require('csurf');
 var passport = require('passport');

Parse-Dashboard/app.js

@@ -30,12 +30,12 @@ function checkIfIconsExistForApps(apps, iconsFolder) {
   for (var i in apps) {
     var currentApp = apps[i];
     var iconName = currentApp.iconName;
-    var path = iconsFolder + "/" + iconName;
+    var path = iconsFolder + '/' + iconName;
 
     fs.stat(path, function(err) {
       if (err) {
-          if ('ENOENT' === err.code) {// file does not exist
-              console.warn("Icon with file name: " + iconName +" couldn't be found in icons folder!");
+          if ('ENOENT' == err.code) {// file does not exist
+              console.warn('Icon with file name: ' + iconName +' couldn\'t be found in icons folder!');
           } else {
             console.log(
               'An error occurd while checking for icons, please check permission!');
@@ -172,8 +172,8 @@ module.exports = function(config, options) {
         }
       } catch (e) {
         // Directory doesn't exist or something.
-        console.warn("Iconsfolder at path: " + config.iconsFolder +
-          " not found!");
+        console.warn('Iconsfolder at path: ' + config.iconsFolder +
+          ' not found!');
       }
     }
 

Parse-Dashboard/index.js

@@ -6,7 +6,7 @@
  * the root directory of this source tree.
  */
 // Command line tool for npm start
-"use strict"
+'use strict'
 const path = require('path');
 const jsonFile = require('json-file-plus');
 const express = require('express');
@@ -40,7 +40,7 @@ const trustProxy = program.trustProxy || process.env.PARSE_DASHBOARD_TRUST_PROXY
 const dev = program.dev;
 
 if (trustProxy && allowInsecureHTTP) {
-  console.log("Set only trustProxy *or* allowInsecureHTTP, not both.  Only one is needed to handle being behind a proxy.");
+  console.log('Set only trustProxy *or* allowInsecureHTTP, not both.  Only one is needed to handle being behind a proxy.');
   process.exit(-1);
 }
 

Parse-Dashboard/parse-dashboard-config.json

@@ -1,11 +1,16 @@
 {
-  "apps": [{
-    "serverURL": "http://localhost:1338/parse",
-    "appId": "APPLICATION_ID",
-    "masterKey": "MASTER_KEY",
-    "appName": "Countries States and Cities",
-    "custom": {
-      "isOwner": true
+  "apps": [
+    {
+      "serverURL": "http://localhost:1338/parse",
+      "appId": "APPLICATION_ID",
+      "masterKey": "MASTER_KEY",
+      "appName": "Countries States and Cities",
+      "iconName": "",
+      "primaryBackgroundColor": "",
+      "secondaryBackgroundColor": "",
+      "custom": {
+        "isOwner": true
+      }
     }
-  }]
+  ]
 }

README.md

@@ -112,6 +112,8 @@ PARSE_DASHBOARD_USER_PASSWORD: "pass"
 PARSE_DASHBOARD_SSL_KEY: "sslKey"
 PARSE_DASHBOARD_SSL_CERT: "sslCert"
 PARSE_DASHBOARD_CONFIG: undefined // Only for reference, it must not exist
+PARSE_DASHBOARD_COOKIE_SESSION_SECRET: undefined // set the cookie session secret, defaults to a random string. Use this option if you want sessions to work across multiple servers, or across restarts
+
 ```
 
 ## Managing Multiple Apps
@@ -154,7 +156,7 @@ HOST: "0.0.0.0"
 PORT: "4040"
 MOUNT_PATH: "/"
 PARSE_DASHBOARD_SERVER_URL: "http://localhost:1337/parse"
-PARSE_DASHBOARD_GRAPHQL_URL: "http://localhost:1337/graphql"
+PARSE_DASHBOARD_GRAPHQL_SERVER_URL: "http://localhost:1337/graphql"
 PARSE_DASHBOARD_MASTER_KEY: "myMasterKey"
 PARSE_DASHBOARD_APP_ID: "myAppId"
 PARSE_DASHBOARD_APP_NAME: "MyApp"