index
:
ariadne.git
master
Linux port of mod organizer
summary
refs
log
tree
commit
diff
log msg
author
committer
range
path:
root
/
src
/
modinfodialogconflicts.cpp
Commit message (
Expand
)
Author
Age
Files
Lines
*
Starfield: Updated blueprint / blueprint prefix support (#2368)
Jeremy Rimpo
2026-04-16
1
-1
/
+1
*
Ignore conflicts between hidden files (#2148)
Jonathan Feenstra
2025-05-23
1
-48
/
+74
*
Apply clang-format.
Mikaël Capelle
2023-07-09
1
-234
/
+227
*
First pass for Qt6 compatibility
Jeremy Rimpo
2022-04-19
1
-1
/
+1
*
Remove unused variables.
Mikaël Capelle
2021-01-21
1
-3
/
+0
*
removed setUpdateDelay(false) calls, it's the default
isanae
2020-12-26
1
-5
/
+1
*
fixes after rebasing
isanae
2020-11-03
1
-7
/
+7
*
Convert FileAlternative and DataArchiveOrigin to classes
AL
2020-11-02
1
-10
/
+10
*
Change Alternatives vector to use a struct
AL
2020-11-02
1
-12
/
+12
*
Print the name, not the origin object
AL
2020-10-31
1
-1
/
+1
*
Merge pull request #1274 from ModOrganizer2/conflicts_conter_tooltip
Al
2020-10-31
1
-11
/
+108
|
\
|
*
handle case of find_if failing
AL
2020-10-31
1
-0
/
+6
|
*
prefer if over ternary op
AL
2020-10-31
1
-4
/
+20
|
*
Cleanup clear()
AL
2020-10-31
1
-1
/
+2
|
*
Add advanced counters as tooltip to general conflicts tab.
AL
2020-10-30
1
-11
/
+85
*
|
stack overflow when searching text files/ini lists because they reported chil...
isanae
2020-10-31
1
-1
/
+8
*
|
Prefer early return in case of error.
AL
2020-10-31
1
-49
/
+47
*
|
Fix typos in comments
AL
2020-10-31
1
-3
/
+3
*
|
use alternatives.back() instead of iterator shenanigans.
AL
2020-10-31
1
-1
/
+1
*
|
Make advanced conflicts tab use italic if current mod file is from archive, i...
AL
2020-10-30
1
-1
/
+3
*
|
Fix advanced conflicts tab archive orders.
AL
2020-10-28
1
-52
/
+81
|
/
*
fixed warnings about Q_OBJECT and thousand separators
isanae
2020-04-18
1
-331
/
+1
*
split directoryentry
isanae
2020-02-18
1
-9
/
+12
*
Renamed underscores function name to pascal case
Al
2020-01-21
1
-7
/
+7
*
Removed missed line
Al
2020-01-21
1
-2
/
+0
*
Fixed missing context menu on general conflicts tab.
Al
2020-01-21
1
-31
/
+72
*
Added text filters for general conflicts lists
Al
2020-01-15
1
-0
/
+9
*
removed dead setDefaultActivationActionForFile()
isanae
2019-12-09
1
-4
/
+0
*
conflicts tab: run exes unhooked by default
isanae
2019-12-08
1
-32
/
+40
*
implemented previews on double-click for the data and conflicts tabs
isanae
2019-12-04
1
-14
/
+43
*
double-click now opens files for the data tab, filetree and conflict lists
isanae
2019-12-02
1
-2
/
+14
*
added "open with vfs" to the data tab
isanae
2019-12-02
1
-23
/
+25
*
added "open with vfs" option to conflicts tab
isanae
2019-12-02
1
-2
/
+37
*
added a ForceWait flag to bypass disabled locking
isanae
2019-11-06
1
-1
/
+1
*
explicit refresh parameter for setWaitForCompletion(), some parts of the ui w...
isanae
2019-11-06
1
-1
/
+5
*
split to processrunner
isanae
2019-11-06
1
-1
/
+1
*
renamed runExecutable() to runExecutablefile()
isanae
2019-11-06
1
-1
/
+1
*
added error messages to FileRenamer and a few more
isanae
2019-10-04
1
-1
/
+1
*
split settings into a bunch of classes
isanae
2019-09-02
1
-8
/
+8
*
added settings for QTabWidget, checkable QAbstractButton and ExpanderWidget
isanae
2019-08-24
1
-80
/
+22
*
Merge pull request #807 from isanae/logging-rework
Jeremy Rimpo
2019-08-02
1
-11
/
+19
|
\
|
*
changed qDebug() to log::debug()
isanae
2019-07-22
1
-8
/
+16
|
*
changed qCritical() to log::error()
isanae
2019-07-22
1
-3
/
+3
*
|
More refactoring
Silarn
2019-07-03
1
-1
/
+1
*
|
Refactor obsolete methods
Silarn
2019-07-03
1
-5
/
+4
|
/
*
added a ModInfoDialogTabContext to avoid passing too many things to tab const...
isanae
2019-07-02
1
-7
/
+5
*
added explore menu item to conflict lists and filetree
isanae
2019-07-02
1
-5
/
+38
*
filterwidget now support automatically installing a proxy on lists
isanae
2019-07-02
1
-2
/
+2
*
added path and explore button to images tab
isanae
2019-07-02
1
-14
/
+4
*
various optimizations and caching
isanae
2019-07-02
1
-79
/
+107
[next]