204 Commits

Author	SHA1	Message	Date
Mirko Golze	19463cd0cf	merge main into proxy branch	2023-10-16 12:08:10 +02:00
Mirko Golze	3fa87fe99a	merge main into proxy branch	2023-10-16 11:37:35 +02:00
Mirko Golze	658a47e03e	Merge branch 'main' into feature/proxy-global-and-collection ... # Conflicts: # packages/bruno-app/src/components/Preferences/General/index.js # packages/bruno-electron/src/ipc/network/index.js # packages/bruno-electron/src/store/preferences.js	2023-10-16 11:24:16 +02:00
Anoop M D	cdfa839cf3	chore: polish request timeout	2023-10-16 03:41:47 +05:30
Anoop M D	4c8ebe7765	Merge pull request #590 from snippetkid/557-configurable-request-timeout ... Configurable request timeout	2023-10-16 03:18:20 +05:30
Anoop M D	1f8c4431e0	feat(#589): polish importing postman env	2023-10-16 03:13:06 +05:30
Anoop M D	6c92ad22ef	Merge branch 'main' of github.com:usebruno/bruno	2023-10-16 02:20:49 +05:30
Anoop M D	4dd17247d1	Merge pull request #589 from premeaswaran/main ... Feature: Support Import postman environment - Fixes issue #193	2023-10-16 02:20:26 +05:30
Anoop M D	58fbe2e64b	chore: cleanup	2023-10-16 02:10:18 +05:30
Anoop M D	faa7cdb1d5	Merge pull request #275 from phoval/feat/mTlsInitialSupport ... feat: client certificate support	2023-10-16 01:15:41 +05:30
Dipin Jagadish	3302e2e910	Merge branch 'main' into 557-configurable-request-timeout	2023-10-15 20:30:01 +01:00
Dipin Jagadish	0e1869139b	fix: fixing merge conflicts	2023-10-15 20:19:08 +01:00
Anoop M D	353be75d9c	fix: fixed bug in loading preferences	2023-10-16 00:45:54 +05:30
Mirko Golze	43c5b4cf53	proxy settings global and collection level	2023-10-15 20:30:13 +02:00
Mirko Golze	6dd6879e8f	proxy settings global and collection level	2023-10-15 20:26:36 +02:00
Dipin Jagadish	955fcb795d	Merge branch 'main' into 557-configurable-request-timeout	2023-10-15 18:34:41 +01:00
Dipin Jagadish	ad3f1b2331	feat: use timeout for axios requests	2023-10-15 18:26:17 +01:00
Mirko Golze	f2bdf2eaf6	Merge branch 'main' into feature/proxy-global-and-collection ... # Conflicts: # packages/bruno-app/src/components/Preferences/General/index.js # packages/bruno-app/src/components/Preferences/index.js # packages/bruno-app/src/providers/App/useIpcEvents.js # packages/bruno-app/src/providers/Preferences/index.js # packages/bruno-electron/src/index.js # packages/bruno-electron/src/ipc/collection.js # packages/bruno-electron/src/store/preferences.js	2023-10-15 17:06:39 +02:00
Mirko Golze	470e9d0442	proxy settings	2023-10-15 16:40:50 +02:00
Anoop M D	7bf049a1f0	feat: use electron-store for saving preferences	2023-10-15 15:59:57 +05:30
Easwaran Prem K	3cc2e3d4fa	Feature: Support Import postman environment - Fixes issue #193	2023-10-14 17:20:31 +05:30
mirkogolze	97a300fbfc	Merge branch 'usebruno:main' into feature/proxy-global-and-collection	2023-10-14 10:26:09 +02:00
nyyu	d6628d960e	feat: support client certificates	2023-10-13 22:30:45 +02:00
Anoop M D	102f7a5ecb	Merge branch 'main' of github.com:usebruno/bruno	2023-10-14 01:01:31 +05:30
Anoop M D	19498363e1	feat(#583): collection level docs	2023-10-14 01:01:11 +05:30
Linhart Lukáš	e90fc466b4	Dont reset timer when switch tabs	2023-10-13 17:27:17 +02:00
mirkogolze	9e4ff465af	Merge branch 'usebruno:main' into feature/proxy-global-and-collection	2023-10-13 11:53:47 +02:00
Anoop M D	ad02ab8f36	Merge pull request #522 from foneazmi/main ... fix(ui): add minHeight & minWidth	2023-10-13 07:17:34 +05:30
Anoop M D	1087cacdb0	Merge pull request #463 from donus3/feature/docs ... Bruno Docs	2023-10-13 04:07:28 +05:30
Brian Rodgers	ba8bfc6d17	Added AWS SigV4 to collection auth	2023-10-11 17:00:47 -07:00
Brian Rodgers	f781bd7d8a	Merge remote-tracking branch 'upstream/main'	2023-10-11 15:54:56 -07:00
Mirko Golze	608d606f64	Merge branch 'main' into feature/proxy-global-and-collection ... # Conflicts: # packages/bruno-app/src/components/ResponsePane/Placeholder/index.js	2023-10-11 08:30:51 +02:00
Donus(ADA)	01c298c58e	feat: support documentation	2023-10-11 09:21:12 +07:00
Farkhan Azmi	21c9fda04f	fix(ui): add minHeight & minWidth	2023-10-11 07:55:46 +07:00
Anoop M D	93f89698fd	chore: json safeStringify	2023-10-11 03:57:19 +05:30
Anoop M D	037793c113	Merge pull request #504 from grubersjoe/gql-collection-auth ... feat(#354): Use collection level auth if available for introspection request	2023-10-11 03:36:39 +05:30
Anoop M D	1979be6c4b	Merge pull request #518 from dozed/fix/error-handling ... Fixed error handling	2023-10-11 03:08:49 +05:30
Stefan Ollinger	bd5bc4acb2	Fixed error handling	2023-10-10 21:51:32 +02:00
Stefan Ollinger	e20dc985ef	Set request data	2023-10-10 21:43:43 +02:00
Jonathan Gruber	12f8ae37a6	feat(#354): Use collection level auth if available for introspection request	2023-10-10 11:26:10 +02:00
Mirko Golze	d64f4d3740	make code runnable	2023-10-10 07:49:22 +02:00
Mirko Golze	99fe4432c4	Merge branch 'main' into feature/proxy-global-and-collection	2023-10-09 21:11:20 +02:00
Mirko Golze	71e8ea457c	try add ca file to global root caas	2023-10-09 21:09:52 +02:00
Jonathan Gruber	0668331822	fix(#222): harden content security policy and allow loading inline images	2023-10-09 15:45:06 +02:00
Mirko Golze	b9291201d9	Merge branch 'main' into feature/proxy-global-and-collection ... # Conflicts: # package-lock.json # packages/bruno-app/src/components/CollectionSettings/ProxySettings/index.js # packages/bruno-electron/src/ipc/network/index.js	2023-10-09 07:21:25 +02:00
Anoop M D	46bc097733	Merge branch 'main' into feat/add-support-for-socks5-proxy	2023-10-09 06:40:12 +05:30
Anoop M D	1ce8d707f1	feat(#334): collection level headers, auth, scripts and tests	2023-10-09 06:18:05 +05:30
Mirko Golze	b854e66a24	#224 refactor preferences store, add global proxy settings	2023-10-08 23:12:03 +02:00
Ricardo Q. Bazan	ce2e997c06	feat: add support for socks5 proxy	2023-10-08 10:04:16 -05:00
Anoop M D	159dd90b03	fix: fixed issue where window width and height were not set for first time users	2023-10-08 05:26:49 +05:30