1
0
Fork 0
mirror of synced 2024-08-03 20:31:50 +12:00
Commit graph

1385 commits

Author SHA1 Message Date
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
Conor_Mack
47d38f2a28 Lint fixes 2020-06-15 16:02:11 +01:00
Conor_Mack
8b99546326 Instance naming fix for components and screens 2020-06-15 16:01:24 +01:00
kevmodrome
318c7ecb3b adds ignore pattern to jest config so that it doesn't try to run cypress tests as unit tests 2020-06-15 10:41:38 +02:00
Michael Shanks
30f054090f code review - static controller - test app id with regex 2020-06-14 20:36:51 +01:00
Michael Shanks
f3ba6552f0 client: fixing broken tests 2020-06-14 20:30:23 +01:00
Michael Shanks
ac00a47d23 build errors from dodgy merge 2020-06-12 21:20:44 +01:00
Michael Shanks
3b506f59cb lint fix 2020-06-12 21:11:39 +01:00
Michael Shanks
6c8a0dc8f2 fixing tests - not using new auth endpoint 2020-06-12 21:08:00 +01:00
Michael Shanks
ad4de714f6 accidentally commited cypress folder 2020-06-12 21:04:30 +01:00
Michael Shanks
237b79e7e7 merge from master 2020-06-12 20:50:17 +01:00
Michael Shanks
bf1da9e94e removal of appRoot - appId comes in cookie 2020-06-12 20:42:55 +01:00
Conor_Mack
2b0436eb99 Merge branch 'master' of https://github.com/Budibase/budibase into builder/consolidating-missing-code 2020-06-12 13:40:27 +01:00
Michael Shanks
2a50d2f3c4 Merge branch 'master' of github.com:Budibase/budibase 2020-06-12 12:15:32 +01:00
Michael Shanks
c5c8309b09 bugfix - screen/page > settings throwing error 2020-06-12 12:15:17 +01:00
Martin McKeaveney
624a5c5d81
Merge pull request #355 from Budibase/linked-records
Linked Records - backend
2020-06-12 10:55:26 +01:00
Conor_Mack
8fd475dec2 Fully functional Colorpicker with Preview 2020-06-12 10:48:20 +01:00
Michael Shanks
2ecb03e7ce changed setup to require CLI modules directly 2020-06-11 20:37:01 +01:00
Martin McKeaveney
6f1ea30fe6 embed component, rename main and login to public and private 2020-06-11 20:18:59 +01:00
Martin McKeaveney
8b3ce41ba7 update _rev for deleted test model 2020-06-11 18:11:56 +01:00
Martin McKeaveney
3f0465a892 lint 2020-06-11 17:28:19 +01:00
Martin McKeaveney
1c1ac8f1a3 remove other link fields when you delete a model 2020-06-11 17:24:09 +01:00
kevmodrome
e68ce5e87e fix linting errors 2020-06-11 18:14:28 +02:00
kevmodrome
7bd45fd683 update script to be sync rather than async 2020-06-11 18:10:53 +02:00
kevmodrome
d0178ed6b5 adds script to run cypress tests 2020-06-11 17:59:11 +02:00
Martin McKeaveney
0634c5718a Merge branch 'master' of github.com:Budibase/budibase into linked-records 2020-06-11 16:22:28 +01:00
Conor_Mack
32ff7a5c89 Instance name for components and screens 2020-06-11 16:15:09 +01:00
kevmodrome
40dfde522b make tests less brittle 2020-06-11 17:10:26 +02:00
kevmodrome
39093f3ce6 Merge branch 'master' into feature/add-e2e-tests 2020-06-11 16:41:14 +02:00
kevmodrome
5640f03fff change package.json script temporarily 2020-06-11 16:40:45 +02:00
kevmodrome
5140069ed6 adds some data-cy properties to a number of elements and starts work on workflow tests 2020-06-11 16:40:07 +02:00
Martin McKeaveney
d2477e1b81 adding record models for brevity 2020-06-11 14:35:45 +01:00
Joe
02469dec2f
Merge pull request #354 from Budibase/Props-update-Shadow-fix,-rotate-improved,-border-updated
Props update, including flex, border, shadow, rotate
2020-06-11 13:26:41 +01:00
Joe
b603e27bc4 formatting and lint update 2020-06-11 13:15:19 +01:00
Joe
3f77e0a0ba Props update, including flex, border, shadow, rotate 2020-06-11 13:07:10 +01:00
kevmodrome
0ab7b99f41 update names for tests 2020-06-11 13:20:13 +02:00
kevmodrome
b473604bc4 adds tests to add components and change props on them 2020-06-11 12:56:16 +02:00
kevmodrome
202abaa13e rework tests to use commands for DRYness 2020-06-11 12:04:31 +02:00
Michael Shanks
6cb7e995a2 changed "master" databse to "clientAppLookup" 2020-06-11 10:12:01 +01:00
Michael Shanks
eddda1d675 lint fix 2020-06-10 21:41:55 +01:00
Michael Shanks
fb1f9af0d3 Merge branch 'master' of github.com:Budibase/budibase 2020-06-10 21:39:46 +01:00
Michael Shanks
2d4321177f application supports multiple concurrent client DB 2020-06-10 21:39:30 +01:00
Joe
9773985008
Merge pull request #346 from Budibase/image-component
Image Component
2020-06-10 16:22:57 +01:00
Conor_Mack
7eca5a501d Merge branch 'master' of https://github.com/Budibase/budibase into property-panel/screen-page-testing 2020-06-10 10:19:58 +01:00
Conor_Mack
96d52bf6e8 Fix - No Page Props on Master Screen Components 2020-06-10 10:16:38 +01:00
Martin McKeaveney
d73d1a4dcb
Merge pull request #349 from Budibase/open-app-in-new-window
preview app in new window when running electron
2020-06-09 19:21:53 +01:00
Martin McKeaveney
eff761053c
Revert "Fixes for Screen and Page Props" 2020-06-09 19:18:45 +01:00
kevmodrome
989b042993 adds missing package.json commands 2020-06-09 15:48:25 +02:00
kevmodrome
0c20d328ae add tests to create model and record 2020-06-09 15:40:14 +02:00
kevmodrome
e4fded7114 update create app test 2020-06-09 15:40:00 +02:00