Merge branch 'upstream' into batchTransaction

Author: davimacedo

README.md

@@ -32,6 +32,7 @@ The full documentation for Parse Server is available in the [wiki](https://githu
         - [Basic Options](#basic-options)
         - [Client Key Options](#client-key-options)
         - [Email Verification & Password Reset](#email-verification-and-password-reset)
+        - [Custom Pages](#custom-pages)
         - [Using Environment Variables](#using-environment-variables-to-configure-parse-server)
         - [Available Adapters](#available-adapters)
         - [Configuring File Adapters](#configuring-file-adapters)
@@ -288,6 +289,7 @@ var server = ParseServer({
 ```
 
 You can also use other email adapters contributed by the community such as:
+- [parse-smtp-template (Multi Language and Multi Template)](https://www.npmjs.com/package/parse-smtp-template)
 - [parse-server-postmark-adapter](https://www.npmjs.com/package/parse-server-postmark-adapter)
 - [parse-server-sendgrid-adapter](https://www.npmjs.com/package/parse-server-sendgrid-adapter)
 - [parse-server-mandrill-adapter](https://www.npmjs.com/package/parse-server-mandrill-adapter)
@@ -298,6 +300,27 @@ You can also use other email adapters contributed by the community such as:
 - [simple-parse-smtp-adapter](https://www.npmjs.com/package/simple-parse-smtp-adapter)
 - [parse-server-generic-email-adapter](https://www.npmjs.com/package/parse-server-generic-email-adapter)
 
+### Custom Pages
+
+It’s possible to change the default pages of the app and redirect the user to another path or domain.
+
+```js
+var server = ParseServer({
+  ...otherOptions,
+  
+  customPages {
+    passwordResetSuccess: "http://yourapp.com/passwordResetSuccess",
+    verifyEmailSuccess: "http://yourapp.com/verifyEmailSuccess",
+    parseFrameURL: "http://yourapp.com/parseFrameURL",
+    linkSendSuccess: "http://yourapp.com/linkSendSuccess",
+    linkSendFail: "http://yourapp.com/linkSendFail",
+    invalidLink: "http://yourapp.com/invalidLink",
+    invalidVerificationLink: "http://yourapp.com/invalidVerificationLink",
+    choosePassword: "http://yourapp.com/choosePassword"
+  }
+})
+```
+
 ### Using environment variables to configure Parse Server
 
 You may configure the Parse Server using environment variables:

spec/ParseGraphQLServer.spec.js

@@ -1523,6 +1523,44 @@ describe('ParseGraphQLServer', () => {
             ).toEqual(['someValue1', 'someValue3']);
           });
 
+          it('should support _or operation', async () => {
+            await prepareData();
+
+            await parseGraphQLServer.parseGraphQLSchema.databaseController.schemaCache.clear();
+
+            const result = await apolloClient.query({
+              query: gql`
+                query {
+                  objects {
+                    findGraphQLClass(
+                      where: {
+                        _or: [
+                          { someField: { _eq: "someValue1" } }
+                          { someField: { _eq: "someValue2" } }
+                        ]
+                      }
+                    ) {
+                      results {
+                        someField
+                      }
+                    }
+                  }
+                }
+              `,
+              context: {
+                headers: {
+                  'X-Parse-Master-Key': 'test',
+                },
+              },
+            });
+
+            expect(
+              result.data.objects.findGraphQLClass.results
+                .map(object => object.someField)
+                .sort()
+            ).toEqual(['someValue1', 'someValue2']);
+          });
+
           it('should support order, skip and limit arguments', async () => {
             const promises = [];
             for (let i = 0; i < 100; i++) {