Browse Source

Merge pull request #4867 from Budibase/develop

develop -> master
master
Martin McKeaveney 5 years ago
committed by GitHub
parent
commit
4630ec8dd8
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      packages/bbui/src/Stores/notifications.js
  2. 2
      packages/bbui/src/Tabs/Tabs.svelte
  3. 2
      packages/builder/src/pages/builder/portal/manage/users/_components/BasicOnboardingModal.svelte
  4. 2
      packages/builder/src/pages/builder/portal/manage/users/_components/ForceResetPasswordModal.svelte
  5. 2
      packages/server/scripts/docs/toSwagger.js

2
packages/bbui/src/Stores/notifications.js

@ -60,7 +60,7 @@ export const createNotificationStore = () => {
} }
function id() { function id() {
return "_" + Math.random().toString(36).substr(2, 9) return "_" + Math.random().toString(36).slice(2, 9)
} }
export const notifications = createNotificationStore() export const notifications = createNotificationStore()

2
packages/bbui/src/Tabs/Tabs.svelte

@ -68,7 +68,7 @@
}) })
function id() { function id() {
return "_" + Math.random().toString(36).substr(2, 9) return "_" + Math.random().toString(36).slice(2, 9)
} }
</script> </script>

2
packages/builder/src/pages/builder/portal/manage/users/_components/BasicOnboardingModal.svelte

@ -11,7 +11,7 @@
import { users } from "stores/portal" import { users } from "stores/portal"
const [email, error, touched] = createValidationStore("", emailValidator) const [email, error, touched] = createValidationStore("", emailValidator)
const password = Math.random().toString(36).substr(2, 20) const password = Math.random().toString(36).slice(2, 20)
let builder = false, let builder = false,
admin = false admin = false

2
packages/builder/src/pages/builder/portal/manage/users/_components/ForceResetPasswordModal.svelte

@ -7,7 +7,7 @@
export let user export let user
const password = Math.random().toString(36).substr(2, 20) const password = Math.random().toString(36).slice(2, 20)
async function resetPassword() { async function resetPassword() {
try { try {

2
packages/server/scripts/docs/toSwagger.js

@ -51,7 +51,7 @@ function extractPaths(apidocJson) {
// Surrounds URL parameters with curly brackets -> :email with {email} // Surrounds URL parameters with curly brackets -> :email with {email}
let pathKeys = [] let pathKeys = []
for (let j = 1; j < matches.length; j++) { for (let j = 1; j < matches.length; j++) {
let key = matches[j].substr(1) let key = matches[j].slice(1)
url = url.replace(matches[j], "{" + key + "}") url = url.replace(matches[j], "{" + key + "}")
pathKeys.push(key) pathKeys.push(key)
} }

Loading…
Cancel
Save