Commit Graph

2931 Commits

Author SHA1 Message Date
mike12345567 dae40227e4 Quick fix for contributing. 2020-10-12 10:12:23 +01:00
Michael Shanks 52f6c73be8 code review changes 2020-10-12 09:42:48 +01:00
mike12345567 d8f3a2ef17 Merge branch 'master' of github.com:Budibase/budibase into endpoint-renaming 2020-10-12 09:41:42 +01:00
Michael Shanks 0c0887382d fix: no fields required by default 2020-10-11 20:42:30 +01:00
Michael Shanks 7c01959da1 merge from master 2020-10-11 20:34:13 +01:00
Martin McKeaveney 25a91b62f0 Merge pull request #679 from Budibase/deployment-api-usage
Deployment api usage
2020-10-09 21:53:01 +01:00
Martin McKeaveney 979422be52 Merge branch 'master' into deployment-api-usage 2020-10-09 21:43:28 +01:00
Martin McKeaveney dc3c0bd4c3 Merge pull request #678 from Budibase/api-usage-tracking
Api usage tracking
2020-10-09 21:42:42 +01:00
Martin McKeaveney 64b378364a deployment API usage complete 2020-10-09 21:42:20 +01:00
mike12345567 c3380d8ab4 Fixing some bugs with JWT creation not getting an API key. 2020-10-09 20:44:35 +01:00
mike12345567 abbf7fcc02 Merge branch 'link-record-performance' of github.com:Budibase/budibase into endpoint-renaming 2020-10-09 20:18:46 +01:00
mike12345567 efce1c839e Major performance boost to attachLinks -> makes CSV upload much more snappy. 2020-10-09 20:06:54 +01:00
mike12345567 dc9552dbad Updating tests and re-formatting. 2020-10-09 19:30:50 +01:00
mike12345567 763f7b3321 Updating ID to use ro rather than re for rows. 2020-10-09 19:16:33 +01:00
mike12345567 5d49d529e3 Changing record -> row in this update, completing the update of renaming in the builder, this release needs further testing. 2020-10-09 19:10:28 +01:00
mike12345567 fdaa69ee7f Renaming Model -> Table across the entire system, this is an unstable update and has not been tested fully yet. 2020-10-09 18:49:23 +01:00
Martin McKeaveney 4ec6fc4a52 Merge branch 'api-usage-tracking' of github.com:Budibase/budibase into deployment-api-usage 2020-10-09 17:42:17 +01:00
mike12345567 89d02357b8 Making sure any errors that occur in usage quota are thrown up to stop endpoint from functioning. 2020-10-09 17:28:49 +01:00
Michael Shanks 79c890519a :app to _app : bugfix 2020-10-09 17:14:02 +01:00
Michael Shanks 127ce3b59d renaming Record > Row 2020-10-09 17:12:55 +01:00
Martin McKeaveney 055aafa503 updated quota fixes 2020-10-09 17:07:46 +01:00
mike12345567 2811c78d82 Merge branch 'master' of github.com:Budibase/budibase into api-usage-tracking 2020-10-09 14:38:11 +01:00
Andrew Kingston 9a7142ea9a Merge branch 'master' of github.com:Budibase/budibase into feat/linked-records-data-source 2020-10-09 12:57:10 +01:00
Andrew Kingston 384686c8ec Merge pull request #682 from Budibase/fix/table-linked-record-display
Fix issue displaying linked records in a table
2020-10-09 12:51:18 +01:00
kevmodrome ad5103786d re-enable event 2020-10-09 13:48:36 +02:00
Andrew Kingston 4b1549a04e Fix issue displaying linked records in a table 2020-10-09 12:42:56 +01:00
Andrew Kingston 4ef8929462 Merge branch 'master' of github.com:Budibase/budibase into feat/linked-records-data-source 2020-10-09 12:34:25 +01:00
Andrew Kingston 009d04a0a5 Add relationships as data source 2020-10-09 12:24:18 +01:00
kevmodrome 420c94dd00 Merge branch 'master' into feature/add-grid-to-standard-components 2020-10-09 13:08:03 +02:00
Michael Shanks 6ba65f56e5 Merge remote-tracking branch 'origin/master' into screen-templates 2020-10-09 12:05:07 +01:00
Michael Shanks db22d8862a merge from master 2020-10-09 12:01:49 +01:00
Michael Shanks 67845b1c82 auto create screens with new table 2020-10-09 11:58:46 +01:00
kevmodrome a117a18d0f adds editable setting 2020-10-09 12:42:16 +02:00
Martin McKeaveney e1c09e2b6b Merge branch 'api-usage-tracking' of github.com:Budibase/budibase into deployment-api-usage 2020-10-09 11:32:50 +01:00
mike12345567 4584257007 Adding in default plan if the obj found does not have the required information. 2020-10-09 11:32:25 +01:00
mike12345567 c280586b9b Merge branch 'master' of github.com:Budibase/budibase into api-usage-tracking 2020-10-09 11:21:26 +01:00
Martin McKeaveney 05206b6049 Merge branch 'api-usage-tracking' of github.com:Budibase/budibase into deployment-api-usage 2020-10-09 11:21:03 +01:00
Martin McKeaveney 3d38bdb4e8 Merge branch 'deployment-api-usage' of github.com:Budibase/budibase into deployment-api-usage 2020-10-09 10:50:51 +01:00
Martin McKeaveney f54062575b use centralised document types and separators 2020-10-09 10:50:44 +01:00
Martin McKeaveney aef74c937e code review 2020-10-09 10:46:38 +01:00
kevmodrome a061d1d5b1 move important stuff up top 2020-10-09 11:43:35 +02:00
kevmodrome 2e3d8d9c16 refactor and clean up 2020-10-09 11:35:52 +02:00
mike12345567 88f7ea922f Merge branch 'master' of github.com:Budibase/budibase into deployment-api-usage 2020-10-09 10:35:26 +01:00
kevmodrome 9ab83a08a6 adds options type support to grid component 2020-10-09 11:23:42 +02:00
Michael Drury e35112bdb4 Merge pull request #680 from Budibase/underscore-ids
Changing ID separator : -> _
2020-10-09 10:10:38 +01:00
mike12345567 325e291222 Removing sanisation, instead just using it as a central path system. 2020-10-09 10:00:57 +01:00
mike12345567 eea0bc5fb9 Update to IDs as has been discussed, to change them from colons (:) to underscores (_) as this is more URL, S3 and file system safe. Also shortening most prefixes down to two characters. 2020-10-09 09:47:37 +01:00
Michael Shanks a417a4906b bugfix - appId not recognised in static.js controller 2020-10-08 22:31:27 +01:00
Michael Shanks 4a13be8cf8 merge from master 2020-10-08 22:11:45 +01:00
Michael Shanks 2e76e1f0f4 Save Record Action 2020-10-08 22:06:44 +01:00