1
0
Fork 0
mirror of synced 2024-10-03 19:43:32 +13:00
Commit graph

2639 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
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
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
Andrew Kingston
13506be0fa Fix issue displaying linked records in a table 2020-10-09 12:42:56 +01: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
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
mike12345567
34e248cad7 Merge branch 'master' of github.com:Budibase/budibase into deployment-api-usage 2020-10-09 10:35:26 +01: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
Martin McKeaveney
b21cc23b3b removing retry param 2020-10-08 21:11:10 +01:00
Martin McKeaveney
fed836140c v0.2.0 2020-10-08 20:32:50 +01:00
Martin McKeaveney
f595392843 fixing optional chaining operator in standard components 2020-10-08 20:31:13 +01:00
Martin McKeaveney
8880e7574b tidy up 2020-10-08 20:23:58 +01:00
mike12345567
275bd64b1b Fixing linting issue. 2020-10-08 18:36:31 +01:00
mike12345567
b400a06027 Updates for API usage after testing against local Dynamo. 2020-10-08 17:34:41 +01:00
Michael Shanks
eaa8d91392 merge from master - including fixes 2020-10-08 16:15:12 +01:00
Michael Shanks
df4243abfa screen templates - backup before merge from master 2020-10-08 15:46:29 +01:00
Martin McKeaveney
3f4fa0674d update deployment quota after deploy 2020-10-08 15:06:27 +01:00
Michael Shanks
85d2ff3e83 Screen Template - pre merge 2020-10-08 14:53:39 +01:00
Andrew Kingston
f3d0104f41
Merge pull request #677 from Budibase/linked-records
Linked records
2020-10-08 13:33:56 +01:00
mike12345567
d2ae589151 Merge branch 'linked-records' of github.com:Budibase/budibase into api-usage-tracking 2020-10-08 13:30:18 +01:00
mike12345567
0e3bb46ca5 Merge branch 'linked-records' of github.com:Budibase/budibase into linked-records 2020-10-08 12:29:09 +01:00
mike12345567
93281e2adc Using array de-structuring as per review. 2020-10-08 12:28:59 +01:00
Andrew Kingston
06eea7ba30 Update linked record selector to handle errors and remove loading state flashing 2020-10-08 12:21:05 +01:00