Commit Graph

3039 Commits

Author SHA1 Message Date
kevmodrome c3a87880c1 Merge branch 'master' into feature/add-grid-to-standard-components 2020-10-07 16:48:59 +02:00
kevmodrome 3225b5bbdc merge master 2020-10-07 16:47:35 +02:00
mike12345567 106badc9c6 Merge branch 'linked-records' of github.com:Budibase/budibase into api-usage-tracking 2020-10-07 15:41:39 +01:00
Michael Shanks 7fbee8b724 Merge branch 'master' of github.com:Budibase/budibase into master 2020-10-07 15:40:24 +01:00
Michael Shanks 77552a0747 Screen templates - initial commit 2020-10-07 15:40:06 +01:00
mike12345567 25cc60aa94 Merge branch 'master' of github.com:Budibase/budibase into linked-records 2020-10-07 14:48:20 +01:00
Michael Drury f9580075e3 Merge pull request #675 from Budibase/filename-fixes
Windows filename fixes
2020-10-07 14:44:13 +01:00
mike12345567 47d3cd3000 Removing .orig file created by merge. 2020-10-07 13:33:21 +01:00
Andrew Kingston fff39f65e5 Change create table popover to modal to better support data import which can be long 2020-10-07 12:40:00 +01:00
Andrew Kingston a24ce26953 Remove padding on top nav bar so that things are properly centered 2020-10-07 12:00:15 +01:00
mike12345567 a72d8e42ad Sanitising the paths to the couchDB data directories. 2020-10-07 11:42:28 +01:00
Andrew Kingston b9c9408c7c Fix create automation modal 2020-10-07 11:38:05 +01:00
Andrew Kingston 4bcc50ee85 Change live animation color from purple to black 2020-10-07 11:37:55 +01:00
Andrew Kingston 97e9883d85 Fix table cypress tests 2020-10-07 11:23:47 +01:00
Andrew Kingston 7c67f18965 Fix cypress automation tests 2020-10-07 11:18:46 +01:00
Andrew Kingston 194d35c005 Update yarn.lock 2020-10-07 11:17:26 +01:00
Andrew Kingston 475d811e5b Fix layout by removing extra columns from grid layout css 2020-10-07 11:17:01 +01:00
Andrew Kingston e38985e111 Remove duplicate select element 2020-10-07 11:16:36 +01:00
Andrew Kingston 8582d63a75 Update styles of data import to match BBUI components 2020-10-07 11:16:06 +01:00
mike12345567 2c3566f686 Adding a regex to allow certain paths with : on windows. 2020-10-07 11:04:36 +01:00
Andrew Kingston 3dc30262d7 Merge branch 'master' of github.com:Budibase/budibase into linked-records 2020-10-07 10:45:26 +01:00
mike12345567 2f58b2b81e Quick change after diffing and looking through everything. 2020-10-07 09:58:32 +01:00
kevmodrome 6c173ac6b3 fixes editable cell bug 2020-10-07 10:06:23 +02:00
mike12345567 13c9be4ea3 Adding a basic sanitise path function and fixing up use cases of appId filesystem paths throughout the system. 2020-10-07 00:24:56 +01:00
Michael Shanks e9ecafb3e1 Merge pull request #665 from mjashanks/fixes
Bugfixes
2020-10-06 21:50:56 +01:00
Michael Shanks 46cd413c58 removed .orig files 2020-10-06 21:45:12 +01:00
Michael Shanks 210062cbac merge conflicts - from master 2020-10-06 21:43:54 +01:00
Michael Shanks ed8371c41f a few changes from code review 2020-10-06 21:37:10 +01:00
Martin McKeaveney f5102d95bb v0.1.25 2020-10-06 21:23:02 +01:00
Martin McKeaveney 7b3ca245cc updating replication stream dependency 2020-10-06 21:10:49 +01:00
Martin McKeaveney 47993f2bd1 v0.1.24 2020-10-06 20:35:11 +01:00
Martin McKeaveney 6e65511613 Merge pull request #664 from Budibase/data-import
Data import
2020-10-06 20:24:34 +01:00
Martin McKeaveney e40cb3ac69 fixing test 2020-10-06 20:18:05 +01:00
mike12345567 72de4dcab4 First work towards implementing Dynamo usage in the server when running in the cloud; this is for tracking usage against API keys. 2020-10-06 19:13:41 +01:00
Andrew Kingston ea7e17ce60 Merge branch 'master' of github.com:Budibase/budibase into linked-records 2020-10-06 18:03:43 +01:00
Andrew Kingston 1fb5804d32 Add support for displaying linked record counts in List and RecordDetail 2020-10-06 18:01:23 +01:00
Andrew Kingston e15e86b9e1 Add linked records to dataforms and use BBUI components and pretty errors 2020-10-06 16:46:23 +01:00
Andrew Kingston 7207bc275e Remove console log statement 2020-10-06 16:40:23 +01:00
Andrew Kingston 63635f3642 Use real schema for datatable rather than first row's keys 2020-10-06 16:39:24 +01:00
Andrew Kingston a12ddaaf08 Add default file prop to AttachmentList to prevent crashing when no files exist 2020-10-06 16:22:11 +01:00
Andrew Kingston 9287b16598 Add support for displaying linked records in DataTable 2020-10-06 16:05:52 +01:00
Andrew Kingston 49875d5c42 Fix a couple of crashes in frontend when doing various actions and fix record detail view 2020-10-06 16:04:58 +01:00
Andrew Kingston 013d812a52 Bump BBUI version 2020-10-06 16:03:49 +01:00
Andrew Kingston 959450d615 Delete old multiselect component 2020-10-06 16:03:17 +01:00
Andrew Kingston 517fb201ec Move multiselect to BBUI 2020-10-06 16:02:48 +01:00
Michael Drury fbfb68d85e Merge pull request #669 from Budibase/moving-sendgrid
Minor patch - moving sendgrid API key to be a input of send email
2020-10-06 14:40:43 +01:00
Michael Shanks b9108f013d missing dependency 2020-10-05 21:21:00 +01:00
Michael Shanks a28a327da7 Merge branch 'master' into fixes 2020-10-05 21:17:01 +01:00
Michael Shanks b51942f0f8 broken test 2020-10-05 21:15:10 +01:00
Michael Shanks c0e008181d broken tests 2020-10-05 20:58:07 +01:00