Commit Graph

1534 Commits

Author SHA1 Message Date
kevmodrome f6f2dfb8e4
dummy methods wired up to return values to the front-end 2020-07-02 18:38:00 +02:00
kevmodrome 03980182d2
fetches keys correctly on the front-end 2020-07-02 17:55:36 +02:00
kevmodrome aabde78c47
sets up dummy back-end 2020-07-02 17:53:09 +02:00
Michael Shanks 4f82b0c0aa
Merge pull request #409 from mjashanks/bugfixes
Some simple fixes
2020-07-02 16:34:19 +01:00
kevmodrome d5b85ba8d7
adds tab to settings modal on front-end to display API Keys 2020-07-02 17:28:33 +02:00
cmack a945a99db7 Merge branch 'colorpicker/swatch-updates' of https://github.com/Budibase/budibase into colorpicker/swatch-updates 2020-07-02 16:27:46 +01:00
cmack 9aaa0f6fee Lint and Cypress Lint Plugin 2020-07-02 16:26:43 +01:00
Conor_Mack fc32bf79f1
Merge branch 'master' into colorpicker/swatch-updates 2020-07-02 16:19:50 +01:00
cmack c2e95a66db Swatch and Title Attributes Updates / Fixes 2020-07-02 16:08:07 +01:00
Conor_Mack 6ffbc5c956
Merge pull request #410 from Budibase/bugfix/select-wrapping-and-close
Close on select and wrap selection
2020-07-02 11:37:30 +01:00
Joe 708ec61d0a Merge branch 'master' of https://github.com/Budibase/budibase into welcome-screen-ui-fix 2020-07-02 11:30:10 +01:00
Conor_Mack 6ad280a423 Close on select and wrap selection 2020-07-02 11:22:30 +01:00
Kevin Åberg Kultalahti b5ae3a280a
Merge pull request #399 from Budibase/features/edit-application-info
Features/edit application info
2020-07-02 12:14:31 +02:00
Joe 34801a33a1 Yarn format and linting fix 2020-07-02 11:03:15 +01:00
Joe 8e8b0c6fb9 Welcome screen fix
Page scroll fix
Card responsiveness fix
Page spacing improved
Button color changed
2020-07-02 11:02:31 +01:00
kevmodrome 69e5086388
remove unneeded appPackage route 2020-07-02 11:30:36 +02:00
Martin McKeaveney 6907f7751f s3 awareness, authentication through API keys 2020-07-01 21:57:35 +01:00
Martin McKeaveney 7f40e89e67 Merge branch 'master' of github.com:Budibase/budibase into deployment 2020-07-01 21:42:47 +01:00
Michael Shanks 7e41b35c93 Merge branch 'master' of github.com:Budibase/budibase into bugfixes 2020-07-01 20:46:50 +01:00
Michael Shanks 7a339a3e05 create workflow button broken 2020-07-01 20:46:28 +01:00
Michael Shanks 5f4747aa25
Merge pull request #404 from mjashanks/bugfixes
Bugfixes from #387 + Record Detail component
2020-07-01 20:44:44 +01:00
Conor_Mack 3969962e86 Lint 2020-07-01 17:29:18 +01:00
Conor_Mack 5834f5aac1 Remove swatch prop test 2020-07-01 17:18:29 +01:00
Conor_Mack 95d17be060 Key Events, Folder Tidyup, Bugs 2020-07-01 17:12:55 +01:00
Michael Shanks fcdcd16116 fix: routing broken when naving to scereen with spaces 2020-07-01 16:44:24 +01:00
Joe 479a39e70d
Update components.json 2020-07-01 15:01:38 +01:00
Joe 9adea44349 formatting and lint 2020-07-01 14:46:22 +01:00
Joe aeeca0293a Table component revised plus minor UI changes
Table redesigned to be more flexible and include setting props for better control
2020-07-01 14:37:57 +01:00
Michael Shanks c5eae1ec2f lint fix 2020-07-01 13:27:12 +01:00
Michael Shanks 81e3184b7c removed unecessar styling from List 2020-07-01 13:20:05 +01:00
Michael Shanks 4b3ceb7f9d Added recordDetail component 2020-07-01 13:19:14 +01:00
Michael Shanks 30f311eaea apply border-box globally 2020-07-01 11:28:41 +01:00
Michael Shanks 63cdbce9b6 nicer screen placeholder in preview 2020-07-01 09:49:09 +01:00
Michael Shanks 343c4e2dd3 blank select option on create record 2020-07-01 09:48:53 +01:00
Michael Shanks 7fe96dff02 some comments.. 2020-06-30 14:18:51 +01:00
Michael Shanks 4df27df9af Merge branch 'master' of github.com:Budibase/budibase into bugfixes 2020-06-30 14:13:27 +01:00
Michael Shanks abb14214db backend - routing based on models 2020-06-30 14:12:37 +01:00
Conor_Mack 5e03e474e9 Colorpicker - Portal and Centering 2020-06-30 13:08:58 +01:00
Michael Shanks 472a25ab7d fix: frontend not loading when naving to component 2020-06-30 10:39:48 +01:00
Michael Shanks 8860c8acb7 bump bbui version 2020-06-30 10:02:27 +01:00
Joe 1cbaf56c24
Merge pull request #400 from Budibase/WIP---Form-Component-Design-Update
Form Component Design Update
2020-06-30 09:57:10 +01:00
Michael Shanks 9e1ae5d9a4 fix: interpolation on property binding 2020-06-30 09:48:48 +01:00
Michael Shanks a93af5e673 some explanation to to confusing code 2020-06-30 06:27:23 +01:00
Michael Shanks a3de20162f when navigating between fronend & backend,
you return to the last url you worked on
2020-06-29 21:26:16 +01:00
Michael Shanks f902414941 fix: changing screen: url gets `undefined` in path 2020-06-29 20:28:53 +01:00
Joe 290b1cce14 Formatting and linting done 2020-06-29 19:55:27 +01:00
Joe 5f7186106e Updated the basic form with boolean and select fix 2020-06-29 19:54:30 +01:00
Martin McKeaveney 59c2f247a7 upload assets to s3 2020-06-29 19:15:43 +01:00
Michael Shanks 91e05f8bf1 rollup: added relative path to bbui
(assumes same root folder as budibase)
2020-06-29 17:22:00 +01:00
Michael Shanks 1e6a329998 bugfix: design category closes as another opens 2020-06-29 17:20:35 +01:00
kevmodrome f50cec4a73
lint fix 2020-06-29 17:49:16 +02:00
Joe 55207c35ca WIP Form Component Design Update
Wide form added
Boolean button fixed
2020-06-29 16:32:51 +01:00
kevmodrome 53d8bc3be7
remove log 2020-06-29 17:21:22 +02:00
kevmodrome 4f6283eef2
adds functionality to update name and description of app 2020-06-29 17:18:43 +02:00
kevmodrome 712e3ffea0
change appname to name in builderStore 2020-06-29 17:01:10 +02:00
Conor_Mack 7e14b7d952
Merge pull request #397 from Budibase/bugfix/select-overflow-clipping
OptionSelect - Fix for Overflow Clipping
2020-06-29 15:38:08 +01:00
Conor_Mack ffa0dcf601 Only mount portal on open 2020-06-29 15:32:37 +01:00
Kevin Åberg Kultalahti 6a9397ab2e
Merge pull request #369 from Budibase/feature/settings-modal
Adds a Settings modal for the BB Apps
2020-06-29 16:01:20 +02:00
kevmodrome b8755e76d7
lint fix 2020-06-29 15:56:41 +02:00
kevmodrome 5e8909cf0e
correct put call to not remove password 😅 2020-06-29 15:55:12 +02:00
Conor_Mack fab2a4d23b Focus menu on open and key events 2020-06-29 13:38:08 +01:00
kevmodrome f25ae8750d
bump bbui version and fix disabled Select component in user row component 2020-06-29 13:31:51 +02:00
kevmodrome 3264441fca
remove console log 2020-06-29 13:24:05 +02:00
kevmodrome 9761ac21e0
fix wrong stuff coming back after updating user 2020-06-29 13:14:15 +02:00
Martin McKeaveney b9d1b52ec7 cleaned up deploy code 2020-06-29 10:27:38 +01:00
Michael Shanks ca66550984 Merge branch 'master' of github.com:Budibase/budibase into bugfixes 2020-06-29 10:16:41 +01:00
Michael Shanks 2e576800c4 bugfix: add inter and roboto mono fonts 2020-06-29 10:16:19 +01:00
Joe bda3dc3f7d
Merge pull request #394 from Budibase/workflow-ui-update
Workflow UI Update
2020-06-29 09:51:46 +01:00
kevmodrome 19981cb223
lint fixes 2020-06-29 10:12:13 +02:00
kevmodrome c144436bb8
adds edit/save mode to update user list 2020-06-29 10:10:41 +02:00
kevmodrome 6ce9cef407
Merge remote-tracking branch 'origin' into feature/settings-modal 2020-06-29 10:08:23 +02:00
Conor_Mack 42530d215e WIP: Select Scroll - Problems on scroll 2020-06-27 16:56:01 +01:00
Michael Shanks 3692b92e5b merge from master 2020-06-26 15:41:42 +01:00
Joe 13ee292417 formatting and linting 2020-06-26 14:38:29 +01:00
Joe 91f562ee8c UI Update
Button color changed
Background color in the settings panel removed
Workflow items font color fixed
Spacing improved
2020-06-26 14:32:45 +01:00
Conor_Mack f6713053e8
Merge pull request #393 from Budibase/colorpicker/fixing-broken-colorpicker
Fixing Colorpicker Duplication Issues
2020-06-26 12:03:09 +01:00
Conor_Mack b7670bcc6a Fixing Colorpicker Duplication Issues 2020-06-26 11:53:08 +01:00
Martin McKeaveney 961226a63f
Merge pull request #391 from Budibase/data-model-redesign
Data model redesign
2020-06-26 10:56:07 +01:00
Conor_Mack 08524ab5d8
Merge pull request #392 from Budibase/bugfix/instance-name-login-template
Add _instanceName to login template
2020-06-26 10:35:42 +01:00
Conor_Mack fcdfddf6da Add _instanceName to login template 2020-06-26 10:31:03 +01:00
kevmodrome e4fc3e57d1 adds update functionality to users 2020-06-26 11:05:09 +02:00
kevmodrome 5c532e1543 sets up frontend side of updating users 2020-06-26 11:04:50 +02:00
Martin McKeaveney e293f3f70a adding renaming test 2020-06-26 09:55:15 +01:00
kevmodrome 46192f6505 add back settingslink that was accidently removed 2020-06-26 09:19:37 +02:00
kevmodrome df1c1463b3 Merge branch 'master' of github.com:Budibase/budibase into feature/settings-modal 2020-06-26 09:02:16 +02:00
Martin McKeaveney fb382329b8 lint 2020-06-25 22:43:10 +01:00
Martin McKeaveney 63fc10e1e0 tidy up 2020-06-25 22:35:52 +01:00
Martin McKeaveney 6ef4ba086c data model rewrite 2020-06-25 22:34:38 +01:00
Martin McKeaveney 66aa2008c9 linked records matched up by name 2020-06-25 20:35:03 +01:00
Martin McKeaveney 48f3392152 record keys as names 2020-06-25 20:04:58 +01:00
Martin McKeaveney b07f608ffe merge 2020-06-25 18:32:51 +01:00
Michael Shanks 6ad45027d5 Merge branch 'master' of github.com:Budibase/budibase into bugfixes 2020-06-25 17:48:24 +01:00
Michael Shanks 8ce26a1e19 bugfix: master screen not styleable 2020-06-25 17:46:43 +01:00
Michael Shanks fc1a81083d bugfix: margin-bottom not set correctly 2020-06-25 17:24:31 +01:00
Michael Shanks 1cfa4d4b22 bugfix: duplicate controls inside colorpicker 2020-06-25 16:58:53 +01:00
Joe a43e0a1131
Merge pull request #389 from Budibase/Backend-UI-update
General UI fixing previous styling issues
2020-06-25 16:07:36 +01:00
Joe dcfa39ef67 Formatting 2020-06-25 16:02:30 +01:00
Joe d9a48e3a51 General UI fixing previous styling issues 2020-06-25 15:49:56 +01:00
Martin McKeaveney 3384a11a06 date field 2020-06-25 14:36:27 +01:00
kevmodrome 68e1441b83 adds functionality to check list of users and add users in settings modal 2020-06-25 14:25:17 +02:00
kevmodrome 69c85ce3d7 bump bbui 2020-06-25 12:41:27 +02:00
kevmodrome 106b28ced6 change spacing var to be hardcoded 2020-06-25 12:41:22 +02:00
Michael Shanks be5f957f2b yarn lock 2020-06-25 10:41:07 +01:00
Michael Shanks 8bc33a6790 bugfix: duplicate model created when we click save twice 2020-06-25 10:41:00 +01:00
Michael Shanks ec1c9c5fb8 merge from master 2020-06-24 18:05:49 +01:00
Michael Shanks 0a58f861e1 removed console log 2020-06-24 17:47:44 +01:00
Michael Shanks 2cca2a3535 updated bbui version 2020-06-24 17:45:23 +01:00
Martin McKeaveney 6cdd933d09
Merge pull request #367 from Budibase/backend-ui-update
Backend ui update
2020-06-24 17:33:22 +01:00
Martin McKeaveney 5a7fa51907 test fix 2020-06-24 17:26:14 +01:00
Michael Shanks ef3e802fad Merge branch 'master' of github.com:Budibase/budibase into bugfixes 2020-06-24 17:19:29 +01:00
Martin McKeaveney e42c807ded tidy up 2020-06-24 17:19:12 +01:00
Martin McKeaveney 69c6a86ccd renamed colours 2020-06-24 17:13:16 +01:00
Conor_Mack 9898ee0b99
Merge pull request #360 from Budibase/builder/consolidating-missing-code
Instance name fix and consolidation of code
2020-06-24 17:11:08 +01:00
Conor_Mack 323256cabf Remove Comments 2020-06-24 17:05:49 +01:00
Martin McKeaveney 65d0454377 merge 2020-06-24 17:02:38 +01:00
Michael Shanks b7de07057f Merge branch 'master' of github.com:Budibase/budibase 2020-06-24 17:02:08 +01:00
Conor_Mack b9d7cfdec1 Cypress Tests - Use Get Timeouts 2020-06-24 16:58:30 +01:00
Michael Shanks 9df4f2aa39 reverting login change from previous commit 2020-06-24 16:57:21 +01:00
Martin McKeaveney ee86d6fb16 update when linked field added 2020-06-24 16:56:13 +01:00
Michael Shanks 8b9c596fdc Merge branch 'master' of github.com:Budibase/budibase 2020-06-24 16:42:41 +01:00
Martin McKeaveney f1795d51ef fix test 2020-06-24 16:32:16 +01:00
Conor_Mack 4c7bdcded1 Lint fixes 2020-06-24 16:20:58 +01:00
Joe 9b8cc2a18f Formatting and linting 2020-06-24 16:20:15 +01:00
Conor_Mack fcff2d928a Cypress Tests and Discussion Resolves 2020-06-24 16:16:06 +01:00
Michael Shanks 14f8f6dcfc bugfix: cannot change container type 2020-06-24 16:16:01 +01:00
Martin McKeaveney 1f2c1a06aa lint 2020-06-24 16:12:55 +01:00
Martin McKeaveney 2c764a787c custom notifications solution 2020-06-24 16:10:54 +01:00
Michael Shanks 02e1898989 #381: Events: param input not displaying value 2020-06-24 15:55:40 +01:00
Joe 6259cdc7e6 Merge branch 'Css-update-to-reflect-BBUI' of https://github.com/Budibase/budibase into Css-update-to-reflect-BBUI 2020-06-24 15:46:30 +01:00
Joe 5b4132a8e6 formatting and linting 2020-06-24 15:41:33 +01:00
Joe 5b600c4f2b
Merge branch 'master' into Css-update-to-reflect-BBUI 2020-06-24 15:35:40 +01:00
Joe 027d81be29 Props panel updated
All design props tested
SImplification of design props completed, with, in some cases, the replacement of units with general terminology.
2020-06-24 15:06:28 +01:00
kevmodrome 5c67285db3 more work on settings modal 2020-06-24 15:04:01 +02:00
Martin McKeaveney 01d7f80e7b custom notifications, models + fields keyed by ID 2020-06-24 12:41:26 +01:00
Michael Shanks e3965f66d4 loading worklows into state along with appPackage 2020-06-24 11:59:07 +01:00
Michael Shanks 32115e784d event > workflow ..added default blank option to workflow dropdown 2020-06-24 11:58:46 +01:00
Michael Shanks 1112073d37 #381 Save Workflow button in worflow setup 2020-06-24 11:26:46 +01:00
Michael Shanks d8508f7e0a workflow: admin & p_user always have access 2020-06-24 11:22:18 +01:00
Michael Shanks 4b801f3f37 screenslot added to Private>Master by default 2020-06-24 11:05:09 +01:00
Martin McKeaveney 3c3104be7b enable renaming of records by using IDs 2020-06-23 23:26:54 +01:00
Joe 8f967116fc Selected pseudo class removed, workflow panels updated 2020-06-23 21:29:18 +01:00
Martin McKeaveney c5bd314931 lint 2020-06-23 16:20:06 +01:00
Martin McKeaveney afcc80ab9d improvements to linked records 2020-06-23 13:50:45 +01:00
Conor_Mack 6eebeb6692
Merge branch 'master' into builder/consolidating-missing-code 2020-06-23 11:21:31 +01:00
Joe a77be47076 CSS update UI refresh
Font changed to Inter
Colors reflect BBUI
Panel background removed
2020-06-23 08:19:16 +01:00
Martin McKeaveney 6adb2a72e0 merge 2020-06-22 22:39:41 +01:00
Michael Shanks 650d9c141e
Merge pull request #376 from mjashanks/master
#363 bugfix: page not built until prop changed
2020-06-22 22:03:31 +01:00
Martin McKeaveney 1b1b804bbd bidirectional linked records 2020-06-22 21:30:23 +01:00
Michael Shanks 763e282997 #363 bugfix: page not built until prop changed 2020-06-22 21:16:51 +01:00
Victoria Sloan 2fd2f1de45 linty 2020-06-22 18:07:52 +01:00
Victoria Sloan 37c47cc124 setting appId on user object when creating the app instance 2020-06-22 17:38:00 +01:00
kevmodrome 823df59e32 Merge branch 'master' of github.com:Budibase/budibase into feature/settings-modal 2020-06-22 17:55:40 +02:00
Conor_Mack 85ccd878ce
Merge pull request #374 from Budibase/property-panel/colorpicker
Colorpicker - Swatch Panel, Logic and UI Updates
2020-06-22 16:43:25 +01:00
Conor_Mack a0416bd067 Swatch Panel, Logic and UI Updates 2020-06-22 16:32:57 +01:00
kevmodrome b7003e9a18 remove cookies set up in each test and rely on cookie default added before 2020-06-22 16:39:28 +02:00
Michael Shanks 243948bc93 cypress - changed background test to font-size
(so i dont have to figure out how to test the colour picker)
2020-06-22 11:29:34 +01:00
Michael Shanks 733dd9753c cypress - retain "builder:token" cookie between tests 2020-06-22 10:53:17 +01:00
Michael Shanks fab5832425 lint fix 2020-06-21 21:41:10 +01:00
Michael Shanks a69fdbfc16 cypress tests - run on windows 2020-06-21 21:26:53 +01:00
Michael Shanks c88f4d2541 removed debug message 2020-06-21 21:21:24 +01:00
Michael Shanks 48d60a7183 removed ADMIN_SECRET env var (no longer needed) 2020-06-21 20:54:37 +01:00
Michael Shanks ede3f7e9aa Merge branch 'master' into feature/add-e2e-tests 2020-06-21 20:30:44 +01:00
Michael Shanks f44f3ec375 bugfix:Dataform throwing error 2020-06-21 06:01:29 +01:00
Michael Shanks e4c19bd9fd bugfix: workflow still passing instanceId to api() 2020-06-20 20:30:00 +01:00
Michael Shanks 44c8ca8b58 Merge branch 'master' into instanceid-url-removal 2020-06-19 17:22:29 +01:00
Michael Shanks 69a36895e7 codereview: looksLikeAppId as variable 2020-06-19 17:21:24 +01:00
Michael Shanks 4dcd482a4f instance Id is gone from API module 2020-06-19 17:19:30 +01:00
Conor_Mack c80f9f8819 Recent Colors and UI Updates 2020-06-19 17:07:11 +01:00
Michael Shanks d7b09f5b65 removed x-user-agent 2020-06-19 16:59:46 +01:00
kevmodrome a50dd46a97 adds integration design 2020-06-19 15:50:39 +02:00
kevmodrome 0e1faab61c bump bbui 2020-06-19 14:32:48 +02:00
kevmodrome 663f90b78d merge in new bbui css stuff 2020-06-19 13:44:41 +02:00
kevmodrome 315f621770 adds bbui.css file 2020-06-19 13:36:03 +02:00
kevmodrome c9a49e4d4b bump bbui and add DangerZone design 2020-06-19 12:51:02 +02:00
kevmodrome 3d6860a79f bump bbui 2020-06-19 12:20:02 +02:00
kevmodrome 310b41c4b3 adds General tab design and updates bbui 2020-06-19 12:09:27 +02:00
kevmodrome 482d791b96 Sets up tabbed modal for settings 2020-06-19 09:14:03 +02:00
Michael Shanks 849fcfe819 client - should recognise new cookie format 2020-06-19 07:04:55 +01:00
Michael Shanks 11e56467b8 fixing broken tests 2020-06-18 20:41:37 +01:00
Martin McKeaveney 099e394270 lint 2020-06-18 17:55:46 +01:00
Martin McKeaveney 9cdb6554a5 typo 2020-06-18 17:49:34 +01:00
Martin McKeaveney d2fbddadd5 save button 2020-06-18 17:44:42 +01:00
Martin McKeaveney 7c4f24c1b4 backend v1 - styling to do 2020-06-18 17:17:18 +01:00
Michael Shanks bf952f8677 instanceid removal 2020-06-18 16:59:31 +01:00
Conor_Mack d8ac7296c3 Updates for Colorpicker Component 2020-06-18 15:54:18 +01:00
Martin McKeaveney 6e187943c4 Merge branch 'master' of github.com:Budibase/budibase into backend-ui-update 2020-06-18 09:16:43 +01:00
Conor_Mack 869c8de816 Removing unused asString 2020-06-17 17:50:23 +01:00
Conor_Mack a7f7d32c06 Lint and test fixes 2020-06-17 17:44:47 +01:00
Conor_Mack 2db5dcfae2 Lint fix 2020-06-17 16:57:38 +01:00
Martin McKeaveney 5f8d6bbfe4 add new models and fields, delete models 2020-06-17 16:51:10 +01:00
Conor_Mack c00b572e22 Merge branch 'master' of https://github.com/Budibase/budibase into property-panel/colorpicker 2020-06-17 16:46:21 +01:00
Conor_Mack ab5b7ccb39 Integrating Colorpicker with Builder 2020-06-17 16:46:03 +01:00
Martin McKeaveney 374a6b4bc6 new model creation, requires styling and CSS updates 2020-06-16 20:53:13 +01:00
Martin McKeaveney 987135f7b4 saving of models and fields 2020-06-16 20:29:18 +01:00
Conor_Mack 37ed95fa96
Merge branch 'master' into builder/consolidating-missing-code 2020-06-16 12:17:32 +01:00
Conor_Mack ab15bd479c Merge branch 'master' of https://github.com/Budibase/budibase into property-panel/colorpicker 2020-06-16 09:58:48 +01:00
Conor_Mack 903e6331a4 Lint fix 2020-06-15 18:39:10 +01:00
Martin McKeaveney 5d46c572b8 lint 2020-06-15 17:08:59 +01:00
Martin McKeaveney f70407b6eb budibase dockerfile 2020-06-15 17:06:54 +01:00
Martin McKeaveney 48f6ac2b98 structuring new backend UI 2020-06-15 16:41:31 +01:00