Commit Graph

3027 Commits

Author SHA1 Message Date
Michael Shanks 3059c605d1 merge from master 2020-10-11 20:34:13 +01:00
Martin McKeaveney 2585c30022
Merge pull request #679 from Budibase/deployment-api-usage
Deployment api usage
2020-10-09 21:53:01 +01:00
Martin McKeaveney 506779f8cd
Merge branch 'master' into deployment-api-usage 2020-10-09 21:43:28 +01:00
Martin McKeaveney 7b5fa2cc81
Merge pull request #678 from Budibase/api-usage-tracking
Api usage tracking
2020-10-09 21:42:42 +01:00
Martin McKeaveney 3f81757faa deployment API usage complete 2020-10-09 21:42:20 +01:00
mike12345567 73e0e37c66 Fixing some bugs with JWT creation not getting an API key. 2020-10-09 20:44:35 +01:00
mike12345567 4d3308b216 Merge branch 'link-record-performance' of github.com:Budibase/budibase into endpoint-renaming 2020-10-09 20:18:46 +01:00
mike12345567 ec6717468b Major performance boost to attachLinks -> makes CSV upload much more snappy. 2020-10-09 20:06:54 +01:00
mike12345567 4147e8872b Updating tests and re-formatting. 2020-10-09 19:30:50 +01:00
mike12345567 ed778d15e2 Updating ID to use ro rather than re for rows. 2020-10-09 19:16:33 +01:00
mike12345567 d90c1e3dd3 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 bb3370e742 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 75fda94588 Merge branch 'api-usage-tracking' of github.com:Budibase/budibase into deployment-api-usage 2020-10-09 17:42:17 +01:00
mike12345567 86102982a1 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 6f890dbe85 :app to _app : bugfix 2020-10-09 17:14:02 +01:00
Michael Shanks 1758243de9 renaming Record > Row 2020-10-09 17:12:55 +01:00
Martin McKeaveney f75f0f5f28 updated quota fixes 2020-10-09 17:07:46 +01:00
mike12345567 ac9be28064 Merge branch 'master' of github.com:Budibase/budibase into api-usage-tracking 2020-10-09 14:38:11 +01:00
Andrew Kingston a8bef0ccff Merge branch 'master' of github.com:Budibase/budibase into feat/linked-records-data-source 2020-10-09 12:57:10 +01:00
Andrew Kingston 0ee9c67825
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 048021abaa
re-enable event 2020-10-09 13:48:36 +02:00
Andrew Kingston 13506be0fa Fix issue displaying linked records in a table 2020-10-09 12:42:56 +01:00
Andrew Kingston 1091526e1f Merge branch 'master' of github.com:Budibase/budibase into feat/linked-records-data-source 2020-10-09 12:34:25 +01:00
Andrew Kingston d1f367ccff Add relationships as data source 2020-10-09 12:24:18 +01:00
kevmodrome ba1d268639
Merge branch 'master' into feature/add-grid-to-standard-components 2020-10-09 13:08:03 +02:00
Michael Shanks afed7da4fa Merge remote-tracking branch 'origin/master' into screen-templates 2020-10-09 12:05:07 +01:00
Michael Shanks e083d60597 merge from master 2020-10-09 12:01:49 +01:00
Michael Shanks f1eeb17dd3 auto create screens with new table 2020-10-09 11:58:46 +01:00
kevmodrome 2af12c6801
adds editable setting 2020-10-09 12:42:16 +02:00
Martin McKeaveney e7ee1ea12a Merge branch 'api-usage-tracking' of github.com:Budibase/budibase into deployment-api-usage 2020-10-09 11:32:50 +01:00
mike12345567 4ba636897b Adding in default plan if the obj found does not have the required information. 2020-10-09 11:32:25 +01:00
mike12345567 844383631e Merge branch 'master' of github.com:Budibase/budibase into api-usage-tracking 2020-10-09 11:21:26 +01:00
Martin McKeaveney dbd0382d05 Merge branch 'api-usage-tracking' of github.com:Budibase/budibase into deployment-api-usage 2020-10-09 11:21:03 +01:00
Martin McKeaveney 699857266b Merge branch 'deployment-api-usage' of github.com:Budibase/budibase into deployment-api-usage 2020-10-09 10:50:51 +01:00
Martin McKeaveney 4abc54380d use centralised document types and separators 2020-10-09 10:50:44 +01:00
Martin McKeaveney c885382225 code review 2020-10-09 10:46:38 +01:00
kevmodrome 892bac9808
move important stuff up top 2020-10-09 11:43:35 +02:00
kevmodrome 00d5857232
refactor and clean up 2020-10-09 11:35:52 +02:00
mike12345567 34e248cad7 Merge branch 'master' of github.com:Budibase/budibase into deployment-api-usage 2020-10-09 10:35:26 +01:00
kevmodrome 4f3ebb29e9
adds options type support to grid component 2020-10-09 11:23:42 +02:00
Michael Drury 946cceb2be
Merge pull request #680 from Budibase/underscore-ids
Changing ID separator : -> _
2020-10-09 10:10:38 +01:00
mike12345567 ba758905cc Removing sanisation, instead just using it as a central path system. 2020-10-09 10:00:57 +01:00
mike12345567 334b4b1696 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 9f3bc07729 bugfix - appId not recognised in static.js controller 2020-10-08 22:31:27 +01:00
Michael Shanks fcb093699d merge from master 2020-10-08 22:11:45 +01:00
Michael Shanks 58b5502f77 Save Record Action 2020-10-08 22:06:44 +01:00
Martin McKeaveney c9f791f250 remove log 2020-10-08 21:52:26 +01:00
Martin McKeaveney 954f6ad47b use underscores instead of colons, shorten id entity names 2020-10-08 21:50:49 +01:00
Martin McKeaveney 4fa3b9c473 Merge branch 'master' of github.com:Budibase/budibase into deployment-api-usage 2020-10-08 21:16:16 +01:00
Martin McKeaveney 3e0c23549c lint and tidy up 2020-10-08 21:16:06 +01:00