Commit Graph

1100 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
a9459bc236 chore: bumped version to v0.25.0 2023-10-16 03:43:13 +05:30
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
15f3276663
Merge pull request #591 from oohsai/main
Create PULL_REQUEST_TEMPLATE.md
2023-10-16 03:15:28 +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
333564f687 feat(#275): polish client certificate support 2023-10-16 02:07:15 +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
4230bf8e41 chore: purge pageComponents 2023-10-15 16:03:13 +05:30
Anoop M D
7bf049a1f0 feat: use electron-store for saving preferences 2023-10-15 15:59:57 +05:30
Anoop M D
363cbe75d2
Merge pull request #433 from qweme32/feature/code-font
Added a setting that allows you to change the font of the code
2023-10-15 12:04:30 +05:30
Sai
61b705112e
Create PULL_REQUEST_TEMPLATE.md 2023-10-15 00:52:33 +05:30
Dipin Jagadish
a2b6bc5970 feat: add textbox for request timeout 2023-10-14 15:50:01 +01:00
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
Anoop M D
e898ebdfa9
Merge pull request #478 from survivant/feature/build-on-different-os
Add build support for different OS
2023-10-14 02:43:35 +05:30
nyyu
d6628d960e feat: support client certificates 2023-10-13 22:30:45 +02:00
Sebastien Dionne
e0266f0a69 Push package-lock.json 2023-10-13 16:25:52 -04:00
Sebastien Dionne
ec89acde48
Merge branch 'main' into feature/build-on-different-os 2023-10-13 16:18:57 -04: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
Anoop M D
be857d7812
Merge pull request #570 from Nikhil569/fix538
Fixes colliding method and request name in sidebar
2023-10-14 00:30:18 +05:30
Anoop M D
e95d9fe611
Merge pull request #575 from panda7789/bugfix/switching-tabs-resets-timer
fix: switching tabs resets timer
2023-10-14 00:27:59 +05:30
Anoop M D
e7f130f8a1
Merge pull request #573 from therealrinku/fix
assert operator dropdown bgcolor fix
2023-10-14 00:12:21 +05:30
Anoop M D
d71e69ac3c chore: muted color for collection search close icon 2023-10-14 00:10:16 +05:30
Anoop M D
442e68283d chore: distrowise build scripts 2023-10-13 23:59:30 +05:30
Anoop M D
e218b8276d
Merge pull request #576 from dw-0/feature/clear-search
feat: add button to clear collection search
2023-10-13 23:57:29 +05:30
dw-0
97871c25cf feat: add button to clear collection search
Signed-off-by: Dominik Willner <th33xitus@gmail.com>
2023-10-13 17:53:39 +02:00
Linhart Lukáš
e90fc466b4 Dont reset timer when switch tabs 2023-10-13 17:27:17 +02:00
therealrinku
b11113b529 assert operator dropdown bgcolor fix 2023-10-13 21:05:13 +05:45
Nikhil569
79072785e2
Update index.js 2023-10-13 19:05:13 +05:30
Nikhil569
ce59170752
Update StyledWrapper.js 2023-10-13 19:00:57 +05:30
Nikhil569
60d3d07459
Update index.js 2023-10-13 19:00:26 +05:30
Nikhil569
4eb74c8ed3
Merge branch 'usebruno:main' into fix538 2023-10-13 18:56:23 +05:30
mirkogolze
9e4ff465af
Merge branch 'usebruno:main' into feature/proxy-global-and-collection 2023-10-13 11:53:47 +02:00
Anoop M D
6b668aaebe chore: bumped version to v0.24.0 2023-10-13 07:39:03 +05:30