Commit Graph

810 Commits

Author SHA1 Message Date
Michael Shanks 3059c605d1 merge from master 2020-10-11 20:34:13 +01:00
Martin McKeaveney 506779f8cd
Merge branch 'master' into deployment-api-usage 2020-10-09 21:43:28 +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
Martin McKeaveney f75f0f5f28 updated quota fixes 2020-10-09 17:07:46 +01:00
Michael Shanks e083d60597 merge from master 2020-10-09 12:01:49 +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 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 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
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 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
Martin McKeaveney 3f4fa0674d update deployment quota after deploy 2020-10-08 15:06:27 +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
Martin McKeaveney 212a24348a hitting deployment success endpoint 2020-10-08 10:56:32 +01:00
Andrew Kingston 4efd38bd2b Merge branch 'linked-records' of github.com:Budibase/budibase into linked-records 2020-10-08 10:43:09 +01:00
Andrew Kingston 36cb7eaee6 Fix crashing on creating a record with fields of type link or options due to coercing values 2020-10-08 10:42:14 +01:00
Andrew Kingston 356acc919d Bump electron to v10 2020-10-08 09:34:45 +01:00
Martin McKeaveney a482d0a23e check that deployment is possible using lambda API 2020-10-07 20:37:55 +01:00
mike12345567 f2b7d85b6e Fixing up middleware to handle uploads, views, records, automation runs and users. 2020-10-07 17:56:47 +01:00
mike12345567 3a6a03403f Merge branch 'linked-records' of github.com:Budibase/budibase into api-usage-tracking 2020-10-07 15:41:39 +01:00
Michael Shanks 6625cb691a Merge branch 'master' of github.com:Budibase/budibase into master 2020-10-07 15:40:24 +01:00
Michael Shanks cdbd70c218 Screen templates - initial commit 2020-10-07 15:40:06 +01:00
mike12345567 17a4b058b5 Merge branch 'master' of github.com:Budibase/budibase into linked-records 2020-10-07 14:48:20 +01:00
mike12345567 a25c1d8618 Removing .orig file created by merge. 2020-10-07 13:33:21 +01:00
mike12345567 1f8f0a0444 Sanitising the paths to the couchDB data directories. 2020-10-07 11:42:28 +01:00
mike12345567 1d99cc654a Adding a regex to allow certain paths with : on windows. 2020-10-07 11:04:36 +01:00
Andrew Kingston fd02f361f1 Merge branch 'master' of github.com:Budibase/budibase into linked-records 2020-10-07 10:45:26 +01:00
mike12345567 a6e409a062 Quick change after diffing and looking through everything. 2020-10-07 09:58:32 +01:00
mike12345567 691ea16998 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 d9e53143d8 merge conflicts - from master 2020-10-06 21:43:54 +01:00