Skip to content
Merged
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
ebeb716
Merge pull request #162 from Flow-Launcher/dev
jjw24 Oct 14, 2020
152e32e
Merge pull request #176 from Flow-Launcher/dev
jjw24 Oct 20, 2020
b03dc8a
Merge pull request #191 from Flow-Launcher/dev
jjw24 Nov 14, 2020
8d6915a
Merge pull request #207 from Flow-Launcher/dev
jjw24 Nov 22, 2020
b3eb82a
Merge pull request #218 from Flow-Launcher/dev
jjw24 Dec 31, 2020
1c39377
Merge pull request #260 from Flow-Launcher/dev
jjw24 Feb 3, 2021
2af1f79
Merge pull request #326 from Flow-Launcher/dev
jjw24 Feb 13, 2021
3300523
add taskcanceledexception to updater exception catch
taooceros Feb 21, 2021
409efe4
version bump
jjw24 Feb 21, 2021
f23f3d3
don't remove setting when updating
taooceros Feb 18, 2021
c8f6853
temporary version bump PluginsManager
jjw24 Feb 21, 2021
b2f841e
remove duplicate entry with quick access results
jjw24 Feb 16, 2021
857ff73
Use IReadOnlyCollection to avoid avoid duplicate iteration
taooceros Feb 17, 2021
6543e4f
update
jjw24 Feb 17, 2021
32435bc
Use Hashset and customized equality comparator to filter result
taooceros Feb 17, 2021
a4a824d
Merge branch 'fix_duplicate_entry_quickaccess' of github.com:Flow-Lau…
taooceros Feb 17, 2021
49eb094
Use UnionWith
taooceros Feb 17, 2021
cc48ed5
update
jjw24 Feb 19, 2021
ff5fd57
fix potential uri format issue causing program crash
taooceros Feb 22, 2021
4c2e306
Merge branch 'dev' of github.com:Flow-Launcher/Flow.Launcher into fix…
taooceros Feb 22, 2021
a1e8577
Add api to Http.cs & message shown up when error thrown
taooceros Feb 22, 2021
da59599
add Unit test for Http.cs setting
taooceros Feb 22, 2021
b9c37a1
Migrate UrlPluginTest to Plugins folder
taooceros Feb 22, 2021
0075839
move http proxy initialization earlier than Plugin initialization
taooceros Feb 22, 2021
c8f15f8
fix formatting
jjw24 Feb 22, 2021
ad9b5a4
remove space
jjw24 Feb 22, 2021
7c62a2f
update variable naming convention
jjw24 Feb 22, 2021
11675a9
update test name
jjw24 Feb 22, 2021
65f7745
Merge pull request #359 from Flow-Launcher/hot_fix_release
jjw24 Feb 22, 2021
1f0db76
Merge branch 'master' into resolve_hotfix_merge
jjw24 Feb 22, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view

These merge commits were added into this branch cleanly.

There are no new changes to show.