Commit Graph

587 Commits

Author SHA1 Message Date
kevmodrome 0ebb59dfa4 Merge remote-tracking branch 'origin' into feature/settings-modal 2020-06-29 10:08:23 +02:00
Michael Shanks 4677e76f79 merge from master 2020-06-26 15:41:42 +01:00
Martin McKeaveney 5b7e310ff6 Merge pull request #391 from Budibase/data-model-redesign
Data model redesign
2020-06-26 10:56:07 +01:00
Conor_Mack 4be1cd07b3 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 818ab3b4fc Add _instanceName to login template 2020-06-26 10:31:03 +01:00
kevmodrome 1440ed9fdd adds update functionality to users 2020-06-26 11:05:09 +02:00
Martin McKeaveney a597232814 adding renaming test 2020-06-26 09:55:15 +01: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 a7cd637087 linked records matched up by name 2020-06-25 20:35:03 +01:00
Martin McKeaveney 28c5756047 record keys as names 2020-06-25 20:04:58 +01:00
Michael Shanks 6592157527 bugfix: master screen not styleable 2020-06-25 17:46:43 +01:00
Joe 7c98a466e4 General UI fixing previous styling issues 2020-06-25 15:49:56 +01:00
Michael Shanks 4836092c20 yarn lock 2020-06-25 10:41:07 +01:00
Michael Shanks ef94892a1b merge from master 2020-06-24 18:05:49 +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
Martin McKeaveney 52358e93ad test fix 2020-06-24 17:26:14 +01:00
Michael Shanks 7f1f702cc4 Merge branch 'master' of github.com:Budibase/budibase into bugfixes 2020-06-24 17:19:29 +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
Martin McKeaveney 835b21e387 merge 2020-06-24 17:02:38 +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
Martin McKeaveney db16af3937 fix test 2020-06-24 16:32:16 +01:00
Joe 0cf410b253 Merge branch 'master' into Css-update-to-reflect-BBUI 2020-06-24 15:35:40 +01:00
Michael Shanks 1c958c226a screenslot added to Private>Master by default 2020-06-24 11:05:09 +01:00
Martin McKeaveney e1b88e6620 enable renaming of records by using IDs 2020-06-23 23:26:54 +01:00
Martin McKeaveney 83da838fcd lint 2020-06-23 16:20:06 +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
Michael Shanks c9b35508d9 #363 bugfix: page not built until prop changed 2020-06-22 21:16:51 +01:00
Michael Shanks bf89f3c403 removed ADMIN_SECRET env var (no longer needed) 2020-06-21 20:54:37 +01:00
Michael Shanks e41e2c3fad Merge branch 'master' into instanceid-url-removal 2020-06-19 17:22:29 +01:00
Michael Shanks 31f8d3bee2 codereview: looksLikeAppId as variable 2020-06-19 17:21:24 +01:00
Michael Shanks 4ba1329983 instance Id is gone from API module 2020-06-19 17:19:30 +01:00
Michael Shanks eb2b6ec56f removed x-user-agent 2020-06-19 16:59:46 +01:00
Michael Shanks 2436ea525d fixing broken tests 2020-06-18 20:41:37 +01:00
Martin McKeaveney cada9bdb85 typo 2020-06-18 17:49:34 +01:00
Michael Shanks bf14aa5ccb instanceid removal 2020-06-18 16:59:31 +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
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
Martin McKeaveney 34b27b83bb lint 2020-06-15 17:08:59 +01:00
Martin McKeaveney 594b7c2cce budibase dockerfile 2020-06-15 17:06:54 +01:00
Martin McKeaveney af9038f64f structuring new backend UI 2020-06-15 16:41:31 +01:00
Conor_Mack 3bcd93d490 Lint fixes 2020-06-15 16:02:11 +01:00
Conor_Mack c1e9133424 Instance naming fix for components and screens 2020-06-15 16:01:24 +01:00
Michael Shanks f0ee729376 code review - static controller - test app id with regex 2020-06-14 20:36:51 +01:00
Michael Shanks 5b59a110a6 lint fix 2020-06-12 21:11:39 +01:00
Michael Shanks f956e141b4 fixing tests - not using new auth endpoint 2020-06-12 21:08:00 +01:00
Michael Shanks 19d132c6c2 removal of appRoot - appId comes in cookie 2020-06-12 20:42:55 +01:00
Martin McKeaveney 4ed4866bca update _rev for deleted test model 2020-06-11 18:11:56 +01:00
Martin McKeaveney 2b312d4c1f lint 2020-06-11 17:28:19 +01:00
Martin McKeaveney 3900b216e9 remove other link fields when you delete a model 2020-06-11 17:24:09 +01:00
Martin McKeaveney a49747074a Merge branch 'master' of github.com:Budibase/budibase into linked-records 2020-06-11 16:22:28 +01:00
Martin McKeaveney f8cfc8e7d7 adding record models for brevity 2020-06-11 14:35:45 +01:00
Michael Shanks 108fa4ca13 changed "master" databse to "clientAppLookup" 2020-06-11 10:12:01 +01:00
Michael Shanks 735d9c4475 lint fix 2020-06-10 21:41:55 +01:00
Michael Shanks 71016f5a1d application supports multiple concurrent client DB 2020-06-10 21:39:30 +01:00
Martin McKeaveney d53b0655af Merge pull request #327 from Budibase/fix-email
fix backend workflow
2020-06-04 14:08:11 +01:00
Martin McKeaveney b719880ffc fix backend workflow 2020-06-04 13:55:52 +01:00
Joe d09bbc1551 Welcome screen ui update
UI was not very responsive before and the illustration looked basic.

Image added, button moved, card ui updated with more margin and better sizing,
2020-06-04 11:56:01 +01:00
Michael Shanks 3471afe587 bugfix: data components hitting correct url again 2020-06-03 22:12:09 +01:00
Martin McKeaveney 6452b68a7c fix budibase apps dir 2020-06-03 21:23:56 +01:00
Martin McKeaveney f5bcaa4ba0 fixing tests 2020-06-03 20:54:17 +01:00
Martin McKeaveney 18ad679d21 lint 2020-06-03 20:44:35 +01:00
Martin McKeaveney 2cd309bfdc fix some other auth bugs 2020-06-03 20:35:30 +01:00
Martin McKeaveney 227df203f9 fixing header in tests 2020-06-03 19:39:53 +01:00
Martin McKeaveney 94731e017a use custom user agent header 2020-06-03 19:35:04 +01:00
Michael Shanks 70c24b5b1f test fixes... test didnt have user-agent 2020-06-03 17:21:49 +01:00
Michael Shanks a483004e1d Merge branch 'master' of github.com:Budibase/budibase 2020-06-03 17:05:53 +01:00
Michael Shanks 6c2b72dd27 logic to not use builder:token for apps running in dev 2020-06-03 17:05:36 +01:00
Martin McKeaveney bb9ad9c1c6 Merge pull request #314 from Budibase/fix-dataform
fix dataform
2020-06-03 17:03:51 +01:00
Martin McKeaveney 2f6e0f14ae fix dataform 2020-06-03 16:10:03 +01:00
Michael Shanks 3e9a3ec678 Merge branch 'master' of github.com:Budibase/budibase 2020-06-03 15:43:53 +01:00
Michael Shanks bae6a37b5d autu populated login page 2020-06-03 15:43:37 +01:00
Kevin Åberg Kultalahti f3866a5e0d Merge pull request #309 from Budibase/bugfix/navbar-settings
Bugfix/navbar settings
2020-06-03 14:59:35 +02:00
kevmodrome 4f291e2f73 adds another color to Nav Bar and also adds roboto as default font in created apps 2020-06-03 14:52:18 +02:00
Martin McKeaveney 7818a2ec57 Merge pull request #307 from Budibase/electron-fix
electron path fix
2020-06-03 12:42:44 +01:00
Michael Shanks bc5240e117 Merge branch 'master' of github.com:Budibase/budibase 2020-06-03 12:30:54 +01:00
Michael Shanks 82d0f1ea86 bugfix: links not respecting appRootPath 2020-06-03 12:30:32 +01:00
Joe 6a3a7c5e87 Removed unused images and added new BB logo 2020-06-03 12:21:26 +01:00
Martin McKeaveney 9b6ea6a5eb electron path fix 2020-06-03 12:05:40 +01:00
Michael Shanks f2d696ce82 bugfix: could not set style on screen root 2020-06-02 16:18:25 +01:00
Michael Shanks 355b1fa702 Merge branch 'master' of github.com:Budibase/budibase 2020-06-02 11:54:46 +01:00
Martin McKeaveney 527a25c794 model bugfixes 2020-06-02 11:40:33 +01:00
Michael Shanks f85bcf0625 yarn lock 2020-06-02 11:26:28 +01:00
Martin McKeaveney 3a983cea8a tidy up, styling 2020-06-02 11:08:53 +01:00
Martin McKeaveney a9e77836cb tests 2020-06-01 22:25:44 +01:00
Martin McKeaveney a6602ba1fc lint + format 2020-06-01 21:31:55 +01:00
Martin McKeaveney b372f6b03d tidy up 2020-06-01 21:26:32 +01:00
Martin McKeaveney fe0b95d627 merge 2020-06-01 16:27:27 +01:00
Martin McKeaveney 176906e766 server side workflows 2020-06-01 16:22:13 +01:00
Martin McKeaveney cb496d1819 workflow DAO tests 2020-06-01 11:52:15 +01:00
Martin McKeaveney 15ba1a5a12 move workflow to array data structure 2020-06-01 10:41:28 +01:00
Michael Shanks 432d528aa6 Merge pull request #266 from mjashanks/model-validation
Model validation
2020-06-01 10:16:33 +01:00
Martin McKeaveney 5c1aa00fd0 server side event emitter 2020-05-31 17:12:52 +01:00
Martin McKeaveney 9a898a8d74 orchestrator refactor, user creation block 2020-05-30 13:41:46 +01:00
Martin McKeaveney e648dc80e8 refactor client library 2020-05-29 14:06:36 +01:00
Michael Shanks cd9f539a09 configurable logLevel - defaults to error 2020-05-29 14:06:25 +01:00
Martin McKeaveney 6f0a84dd38 adding workflow blocks, parameter parsing, templating 2020-05-28 20:20:03 +01:00
Michael Shanks 53ff560e42 server side record validation 2020-05-28 15:39:29 +01:00
Michael Shanks 2abda35443 Merge branch 'workflow-v1' of github.com:Budibase/budibase into workflow-v1 2020-05-28 09:17:49 +01:00
Michael Shanks 5894feaaff removed auth on execute workflow action 2020-05-28 09:17:14 +01:00
Martin McKeaveney ad637348c9 workflow UI, orhestrator for executing workflows 2020-05-27 21:51:32 +01:00
Michael Shanks b3cd17b9a3 bugfix: wrong permissions on worfklow endpoint 2020-05-27 19:18:39 +01:00
Michael Shanks 473468b481 few changes from code review 2020-05-27 17:37:07 +01:00
Michael Shanks 348eaab73c fixing tests after dodgy merge 2020-05-27 17:29:26 +01:00
Michael Shanks fe79f294b4 access levels 2020-05-27 17:23:01 +01:00
kevmodrome 2325291b3e fix another lint error 2020-05-27 13:53:44 +02:00
kevmodrome d237dd9271 fix lint erorrs 2020-05-27 13:51:19 +02:00
Michael Shanks 075b264d21 bugfix: create app not creating dirs 2020-05-27 10:54:34 +01:00
Martin McKeaveney 6829f9ab06 Merge branch 'master' of github.com:Budibase/budibase into workflow-v1 2020-05-27 10:13:42 +01:00
Martin McKeaveney e9fab13750 workflow orchestrator 2020-05-26 21:34:01 +01:00
Michael Shanks 1127e1ef0f server - create app endpoint creates files 2020-05-26 16:29:16 +01:00
Michael Shanks 1c38beaefd Merge branch 'master' of github.com:Budibase/budibase 2020-05-26 11:06:45 +01:00
Joe c8e9178b63 Home page UI design
The majority of HTML and CSS is complete.

Still to be done:
- Activate the create new web app button
- Activate the settings nav item
- Date modified
- Ability to rename web app and provide a description (and an auto screenshot is generated down the line)
2020-05-25 16:57:17 +01:00
Martin McKeaveney 0ea48245cf groundwork for pubsub 2020-05-24 22:54:08 +01:00
Joe 97adabcaa8 Top nav redesign
New BB logo added, and sizing changed.
Nav items margin changed to reflect designs
Nav items color changed to reflect new simplified color scheme
Bottom border added
Nav background color changed

*Global styles is a work in progress.
2020-05-23 09:49:25 +01:00
Martin McKeaveney cacee947bf workflow charts 2020-05-22 16:32:23 +01:00
Michael Shanks e9e6cf1dfd merge conflicts 2020-05-21 14:43:49 +01:00
Michael Shanks aa66598e4c auth, first version, needing tested 2020-05-21 14:31:23 +01:00
Martin McKeaveney 2965c2338d workflow CRUD complete 2020-05-20 17:02:46 +01:00
Martin McKeaveney 8c91a083da Update package.json 2020-05-19 14:52:44 +01:00
kevmodrome d65acca512 upgrades routify to latest version 2020-05-19 15:19:32 +02:00
Martin McKeaveney 5c775ecf48 electron asar 2020-05-19 14:03:46 +01:00
Martin McKeaveney 4ac94dbf87 Merge pull request #241 from Budibase/further-tidy-up
Further tidy up
2020-05-18 19:18:44 +01:00
Martin McKeaveney ee139cd137 adding builder route for testing 2020-05-18 18:05:36 +01:00
Martin McKeaveney 3be38109e3 preloading remix, removing unused css 2020-05-18 16:37:19 +01:00
Michael Shanks e3069c6e57 Merge branch 'master' of github.com:Budibase/budibase 2020-05-18 16:34:30 +01:00
Michael Shanks a2f613d855 lint fix 2020-05-18 16:33:41 +01:00
Michael Shanks 068f54be6e Merge branch 'master' of github.com:Budibase/budibase 2020-05-18 16:23:22 +01:00
Michael Shanks c49710c3ff id generation in utilities module 2020-05-18 16:22:09 +01:00
Martin McKeaveney 7f0f8f2d9f lint 2020-05-18 15:46:38 +01:00
Martin McKeaveney c054b3404e electron fixes 2020-05-18 15:44:52 +01:00
Martin McKeaveney 56c492c66d pino logging, electron fixes, running integration tests in band 2020-05-18 15:33:29 +01:00
Martin McKeaveney e21c40e6d0 brotli lint 2020-05-18 14:58:39 +01:00
Martin McKeaveney 0d0d81b5c5 disable brotli 2020-05-18 14:36:42 +01:00
Michael Shanks 1c01014bdc Merge branch 'master' of github.com:Budibase/budibase 2020-05-18 11:53:09 +01:00
Michael Shanks 1ba64e02fe removing Authorization header 2020-05-18 11:53:04 +01:00
Martin McKeaveney 5cd218da02 fixing CI 2020-05-18 11:18:31 +01:00
Martin McKeaveney 3c9af5336e formatting 2020-05-18 11:01:17 +01:00
Martin McKeaveney 33d8f6a7c7 remove debug line 2020-05-18 10:56:11 +01:00
Martin McKeaveney d6b3f9c219 test and couchDB init code 2020-05-18 10:55:35 +01:00
Michael Shanks dffc6df5ea merge conflicts.. 2020-05-18 06:43:05 +01:00
Michael Shanks 1dc32a05e3 removing clientId from frontend, fixing invalid database name 2020-05-18 06:40:29 +01:00
Martin McKeaveney c176510a75 native plist config for code signing and notarization 2020-05-16 18:19:36 +01:00
Martin McKeaveney 64ffd76762 electron script 2020-05-15 18:13:18 +01:00
Martin McKeaveney 34c8b1faf5 notarization and mac code signing through github CI 2020-05-15 16:06:53 +01:00
Martin McKeaveney 014115c573 Making budibase downloadable, configuring CI to build executable bina… (#233)
Making budibase downloadable, configuring CI to build executable bina…
2020-05-14 21:18:36 +01:00
Michael Shanks fc9657f00d bugfix - require order causing env to load to early 2020-05-14 16:26:14 +01:00
Michael Shanks 97db4f1765 server tests in-memory and passing 2020-05-14 15:12:30 +01:00
Martin McKeaveney 4c62f8181e Merge branch 'master' into fix-dev-setup 2020-05-11 16:40:39 +01:00
Michael Shanks 1a1d545178 bugfix - could not create more than one app 2020-05-11 16:14:31 +01:00
Martin McKeaveney 3149b38586 fixed dev setup 2020-05-11 16:01:02 +01:00
Michael Shanks 7d6046d021 allow bb home folder to bem anywhere 2020-05-11 15:42:42 +01:00
Michael Shanks a0f5880d51 server initialisation & run fixed 2020-05-11 14:50:15 +01:00
Martin McKeaveney 16a6680c2e add initialiseClientDB 2020-05-11 10:28:06 +01:00
Martin McKeaveney 2ebe5580d5 fixing tests 2020-05-07 22:25:27 +01:00
Martin McKeaveney db69673a9d data components 2020-05-07 22:15:09 +01:00
Martin McKeaveney a28322f538 further simplification of server code 2020-05-07 14:04:32 +01:00
Martin McKeaveney 87ad6647df further tidy up and removal 2020-05-07 13:52:24 +01:00
Martin McKeaveney 16ec3719ea client lib tests 2020-05-07 13:33:25 +01:00
Martin McKeaveney 0ec47971d0 formatting + fixing builder tests 2020-05-07 10:53:34 +01:00
Martin McKeaveney 0af5f12405 removed core library 2020-05-06 20:49:21 +01:00
Martin McKeaveney 910030e929 Auth working 2020-05-06 20:29:55 +01:00
Martin McKeaveney b6b50182e2 dev setup complete 2020-05-06 12:17:15 +01:00
Martin McKeaveney ddb1880b98 development setup, adding data components 2020-05-06 10:33:30 +01:00
Martin McKeaveney 119bb4ba30 working through auth - adding user instance map 2020-05-04 18:07:03 +01:00
Martin McKeaveney 5648eae275 merge 2020-05-04 17:17:03 +01:00
Martin McKeaveney af9c1adb35 apps being served correctly 2020-05-04 17:13:57 +01:00
Martin McKeaveney 58871883f9 screenslots working again 2020-05-03 11:33:20 +01:00
Martin McKeaveney 5b4bce8b8f component library modules and definitions refactor - moved to backend. More routing and middleware reorganisation 2020-05-02 15:29:10 +01:00
Martin McKeaveney 3564fec064 access levels, actions and triggers removed. Restructuring and refactoring 2020-04-29 20:29:56 +01:00
Conor_Mack b9ac53c6c1 Libraries for Colorpicker 2020-04-29 16:02:17 +01:00
Martin McKeaveney a645df082c clientId fetching before app load, custom views, fixed schema 2020-04-28 14:39:35 +01:00
Michael Shanks 44bba145c7 yarn initialise uses new cli 2020-04-27 08:56:51 +01:00
Michael Shanks c2c4f5b174 cli - new and run handlers 2020-04-26 21:13:14 +01:00
Michael Shanks e2b393a077 Merge branch 'couchdb-api' of github.com:Budibase/budibase into couchdb-api 2020-04-25 08:35:50 +01:00
Michael Shanks 2ab564d224 cli init now working... 2020-04-25 08:35:34 +01:00
Martin McKeaveney 4ca506ebfe tidy up, removing leftover indexeddb files 2020-04-24 18:10:33 +01:00
Martin McKeaveney 749a16e8eb fixing tests 2020-04-24 18:05:29 +01:00
Martin McKeaveney 5385357b9d fixing tests 2020-04-24 18:05:29 +01:00
Michael Shanks b2b94c8ccc remove config - .env added 2020-04-24 17:28:32 +01:00
Michael Shanks e575c0b929 bugfix, create client db not passing config 2020-04-24 10:03:31 +01:00
Michael Shanks c770c8f0ec unsaved file :( 2020-04-24 09:57:16 +01:00
Michael Shanks 8884f532b8 initialise cli started 2020-04-24 09:56:39 +01:00
Michael Shanks 421d822aec couchDb client - accepts couchdb config 2020-04-24 09:54:20 +01:00
Martin McKeaveney 0b7a9b9d0f bug fixes 2020-04-23 17:05:33 +01:00
Martin McKeaveney fdc950d221 tidy up 2020-04-23 14:51:35 +01:00
Martin McKeaveney c315fd3c8d merge 2020-04-23 14:42:26 +01:00
Martin McKeaveney 7e2e4f1e25 tidy up, gitignore node modules in common 2020-04-23 14:39:04 +01:00
Martin McKeaveney c986bba0d8 pouchDB integration, use app id instead of app name for keying app packages 2020-04-23 14:37:08 +01:00
Michael Shanks c8ee32e8e8 validation & persistence 2020-04-22 16:35:20 +01:00
Martin McKeaveney 1381cefc41 backend allowing creation of models, records and databases 2020-04-20 16:17:18 +01:00
Martin McKeaveney 65fd38e205 set up common to use babel, static file serving middleware 2020-04-15 15:25:11 +01:00
Martin McKeaveney 8c922f5d08 integration test setup 2020-04-15 15:25:10 +01:00
Martin McKeaveney 4a77960e76 account for model and view cleanup after model deletion 2020-04-15 15:25:10 +01:00