MirrorSave
/
budibase
mirror of https://github.com/Budibase/budibase.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
1,599 Commits 130 Branches 2,987 Tags 944 MiB
Commit Graph

910 Commits

Author SHA1 Message Date
Michael Shanks 4677e76f79 merge from master 2020-06-26 15:41:42 +01:00
Joe 9d43d0295b formatting and linting 2020-06-26 14:38:29 +01:00
Joe 4a6c7e5a06 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 5f78d599fc Merge pull request #393 from Budibase/colorpicker/fixing-broken-colorpicker 
Fixing Colorpicker Duplication Issues
 2020-06-26 12:03:09 +01:00
Conor_Mack 1c1dfb1dfe Fixing Colorpicker Duplication Issues 2020-06-26 11:53:08 +01:00
kevmodrome 1d9a0b9b0d sets up frontend side of updating users 2020-06-26 11:04:50 +02:00
Martin McKeaveney a597232814 adding renaming test 2020-06-26 09:55:15 +01:00
kevmodrome 42e23b05e6 add back settingslink that was accidently removed 2020-06-26 09:19:37 +02:00
kevmodrome bacc525596 Merge branch 'master' of github.com:Budibase/budibase into feature/settings-modal 2020-06-26 09:02:16 +02:00
Martin McKeaveney dd0b66be69 lint ✨ 2020-06-25 22:43:10 +01:00
Martin McKeaveney 5b1b6382c6 tidy up 2020-06-25 22:35:52 +01:00
Martin McKeaveney 28b951e993 data model rewrite 2020-06-25 22:34:38 +01:00
Martin McKeaveney 28c5756047 record keys as names 2020-06-25 20:04:58 +01:00
Martin McKeaveney 92beb8ffa4 merge 2020-06-25 18:32:51 +01:00
Michael Shanks 51229f14c4 Merge branch 'master' of github.com:Budibase/budibase into bugfixes 2020-06-25 17:48:24 +01:00
Michael Shanks 3eedff15a6 bugfix: margin-bottom not set correctly 2020-06-25 17:24:31 +01:00
Michael Shanks 3dfcf56a14 bugfix: duplicate controls inside colorpicker 2020-06-25 16:58:53 +01:00
Joe 2a5d8cebd0 Merge pull request #389 from Budibase/Backend-UI-update 
General UI fixing previous styling issues
 2020-06-25 16:07:36 +01:00
Joe 919412df8c Formatting 2020-06-25 16:02:30 +01:00
Joe 7c98a466e4 General UI fixing previous styling issues 2020-06-25 15:49:56 +01:00
Martin McKeaveney 4300a311f4 date field 2020-06-25 14:36:27 +01:00
kevmodrome 5fe8b523bf adds functionality to check list of users and add users in settings modal 2020-06-25 14:25:17 +02:00
kevmodrome c4cbfd0c0c bump bbui 2020-06-25 12:41:27 +02:00
kevmodrome dbbed0c079 change spacing var to be hardcoded 2020-06-25 12:41:22 +02:00
Michael Shanks 4315d25d66 bugfix: duplicate model created when we click save twice 2020-06-25 10:41:00 +01:00
Michael Shanks ef94892a1b merge from master 2020-06-24 18:05:49 +01:00
Michael Shanks 9cbda3a748 removed console log 2020-06-24 17:47:44 +01:00
Michael Shanks 9fc870d9b9 updated bbui version 2020-06-24 17:45:23 +01:00
Martin McKeaveney ba74c0981e Merge pull request #367 from Budibase/backend-ui-update 
Backend ui update
 2020-06-24 17:33:22 +01:00
Michael Shanks 7f1f702cc4 Merge branch 'master' of github.com:Budibase/budibase into bugfixes 2020-06-24 17:19:29 +01:00
Martin McKeaveney d32df44ae0 tidy up 2020-06-24 17:19:12 +01:00
Martin McKeaveney 9d829b2a8e renamed colours 2020-06-24 17:13:16 +01:00
Conor_Mack 7f543bdf26 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 13a2accda2 Remove Comments 2020-06-24 17:05:49 +01:00
Martin McKeaveney 835b21e387 merge 2020-06-24 17:02:38 +01:00
Conor_Mack ff3e922e22 Cypress Tests - Use Get Timeouts 2020-06-24 16:58:30 +01:00
Martin McKeaveney 35a1b1c03e update when linked field added 2020-06-24 16:56:13 +01:00
Michael Shanks 59afd2c572 Merge branch 'master' of github.com:Budibase/budibase 2020-06-24 16:42:41 +01:00
Conor_Mack df5a9ee87a Lint fixes 2020-06-24 16:20:58 +01:00
Joe 942af74bbd Formatting and linting 2020-06-24 16:20:15 +01:00
Conor_Mack 306c733094 Cypress Tests and Discussion Resolves 2020-06-24 16:16:06 +01:00
Michael Shanks 8b3d637292 bugfix: cannot change container type 2020-06-24 16:16:01 +01:00
Martin McKeaveney c46ccd05f9 lint ✨ 2020-06-24 16:12:55 +01:00
Martin McKeaveney 31e89e77e5 custom notifications solution 2020-06-24 16:10:54 +01:00
Michael Shanks c8c50d1ee3 #381: Events: param input not displaying value 2020-06-24 15:55:40 +01:00
Joe 7ea1eaed06 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 ff8ec8e033 formatting and linting 2020-06-24 15:41:33 +01:00
Joe 0cf410b253 Merge branch 'master' into Css-update-to-reflect-BBUI 2020-06-24 15:35:40 +01:00
Joe 85b0d790a6 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 1c63a93234 more work on settings modal 2020-06-24 15:04:01 +02:00
Martin McKeaveney cde00356b3 custom notifications, models + fields keyed by ID 2020-06-24 12:41:26 +01:00
Michael Shanks 1f89dd4b36 loading worklows into state along with appPackage 2020-06-24 11:59:07 +01:00
Michael Shanks 6041003115 event > workflow ..added default blank option to workflow dropdown 2020-06-24 11:58:46 +01:00
Michael Shanks 393c63485f #381 Save Workflow button in worflow setup 2020-06-24 11:26:46 +01:00
Michael Shanks 83b640286d workflow: admin & p_user always have access 2020-06-24 11:22:18 +01:00
Martin McKeaveney e1b88e6620 enable renaming of records by using IDs 2020-06-23 23:26:54 +01:00
Joe d95c4c7a54 Selected pseudo class removed, workflow panels updated 2020-06-23 21:29:18 +01:00
Martin McKeaveney 83da838fcd lint ✨ 2020-06-23 16:20:06 +01:00
Martin McKeaveney 8ab2e0b6aa improvements to linked records 2020-06-23 13:50:45 +01:00
Conor_Mack 50ecfd1e25 Merge branch 'master' into builder/consolidating-missing-code 2020-06-23 11:21:31 +01:00
Joe 28fadac7f7 CSS update UI refresh 
Font changed to Inter
Colors reflect BBUI
Panel background removed
 2020-06-23 08:19:16 +01:00
Martin McKeaveney eca7b69949 merge 2020-06-22 22:39:41 +01:00
Martin McKeaveney 430ca37826 bidirectional linked records 2020-06-22 21:30:23 +01:00
kevmodrome dd5ca67dcd Merge branch 'master' of github.com:Budibase/budibase into feature/settings-modal 2020-06-22 17:55:40 +02:00
Conor_Mack 71a2124441 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 897a0a875b Swatch Panel, Logic and UI Updates 2020-06-22 16:32:57 +01:00
kevmodrome 9670a0cb5c remove cookies set up in each test and rely on cookie default added before 2020-06-22 16:39:28 +02:00
Michael Shanks a29f821802 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 a1df978b80 cypress - retain "builder:token" cookie between tests 2020-06-22 10:53:17 +01:00
Michael Shanks d424c3ff52 lint fix 2020-06-21 21:41:10 +01:00
Michael Shanks 8acdda053d cypress tests - run on windows 2020-06-21 21:26:53 +01:00
Michael Shanks bf89f3c403 removed ADMIN_SECRET env var (no longer needed) 2020-06-21 20:54:37 +01:00
Michael Shanks 39f22ff834 Merge branch 'master' into feature/add-e2e-tests 2020-06-21 20:30:44 +01:00
Michael Shanks af0ed48774 bugfix: workflow still passing instanceId to api() 2020-06-20 20:30:00 +01:00
Michael Shanks e41e2c3fad Merge branch 'master' into instanceid-url-removal 2020-06-19 17:22:29 +01:00
Michael Shanks 4ba1329983 instance Id is gone from API module 2020-06-19 17:19:30 +01:00
Conor_Mack bf9b8e49f9 Recent Colors and UI Updates 2020-06-19 17:07:11 +01:00
kevmodrome ed6f7699f0 adds integration design 2020-06-19 15:50:39 +02:00
kevmodrome d0648bd30d bump bbui 2020-06-19 14:32:48 +02:00
kevmodrome e3eb4519cf merge in new bbui css stuff 2020-06-19 13:44:41 +02:00
kevmodrome 06fd91cfab adds bbui.css file 2020-06-19 13:36:03 +02:00
kevmodrome 1c524f1f68 bump bbui and add DangerZone design 2020-06-19 12:51:02 +02:00
kevmodrome dc08455489 bump bbui 2020-06-19 12:20:02 +02:00
kevmodrome be45e180dd adds General tab design and updates bbui 2020-06-19 12:09:27 +02:00
kevmodrome 237165dcd9 Sets up tabbed modal for settings 2020-06-19 09:14:03 +02:00
Martin McKeaveney 2ac15c6b89 lint ✨ 2020-06-18 17:55:46 +01:00
Martin McKeaveney f8c9cc4331 save button 2020-06-18 17:44:42 +01:00
Martin McKeaveney 7428dd40fc backend v1 - styling to do 2020-06-18 17:17:18 +01:00
Michael Shanks bf14aa5ccb instanceid removal 2020-06-18 16:59:31 +01:00
Conor_Mack ad0840545e Updates for Colorpicker Component 2020-06-18 15:54:18 +01:00
Martin McKeaveney cc1cab0e57 Merge branch 'master' of github.com:Budibase/budibase into backend-ui-update 2020-06-18 09:16:43 +01:00
Conor_Mack 06f3c1db77 Removing unused asString 2020-06-17 17:50:23 +01:00
Conor_Mack efb80347c6 Lint and test fixes 2020-06-17 17:44:47 +01:00
Conor_Mack f9448f14a1 Lint fix 2020-06-17 16:57:38 +01:00
Martin McKeaveney 949052c41c add new models and fields, delete models 2020-06-17 16:51:10 +01:00
Conor_Mack 1b313efd98 Merge branch 'master' of https://github.com/Budibase/budibase into property-panel/colorpicker 2020-06-17 16:46:21 +01:00
Conor_Mack 4a00e2257f Integrating Colorpicker with Builder 2020-06-17 16:46:03 +01:00
Martin McKeaveney bda580bc3f new model creation, requires styling and CSS updates 2020-06-16 20:53:13 +01:00
Martin McKeaveney 78ce077846 saving of models and fields 2020-06-16 20:29:18 +01:00
Conor_Mack b95fdd458f Merge branch 'master' into builder/consolidating-missing-code 2020-06-16 12:17:32 +01:00