summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | | | | Merge pull request #740 from isanae/new-conflict-listAl2019-06-019-355/+1173
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | refresh files in the constructor because the ui is used to determine the tab ...isanae2019-05-311-1/+8
| * | | | | | | | | | | | | conflict lists:isanae2019-05-314-50/+160
| * | | | | | | | | | | | | advanced conflict list tooltipsisanae2019-05-311-0/+9
| * | | | | | | | | | | | | conflict listsisanae2019-05-313-2/+39
| * | | | | | | | | | | | | don't show open menu item if the files are from an archiveisanae2019-05-312-1/+14
| * | | | | | | | | | | | | replaced all the manual UserRole stuff with a few constants and helper functionsisanae2019-05-314-63/+91
| * | | | | | | | | | | | | put back changes from another PR lost because of a bad rebaseisanae2019-05-311-7/+16
| * | | | | | | | | | | | | restore conflicts selected tab and checkboxesisanae2019-05-313-8/+26
| * | | | | | | | | | | | | FilterWidget takes a predicate to match stringsisanae2019-05-313-7/+42
| * | | | | | | | | | | | | removed buddy from FilterWidget, the intention was to hook a ctrl+f shortcut ...isanae2019-05-313-10/+49
| * | | | | | | | | | | | | added new filterwidget, will eventually get the operators functionality from ...isanae2019-05-316-6/+124
| * | | | | | | | | | | | | elide first two columns of the advanced listisanae2019-05-311-0/+25
| * | | | | | | | | | | | | comments, switched some of the ifs for clarityisanae2019-05-311-5/+33
| * | | | | | | | | | | | | added show all/nearest mods radio buttonsisanae2019-05-312-10/+55
| * | | | | | | | | | | | | allow for refreshing individual conflict tabsisanae2019-05-313-30/+116
| * | | | | | | | | | | | | added AlternativesVector typedef to FileEntryisanae2019-05-313-55/+92
| * | | | | | | | | | | | | changed iterator loops to ranged forisanae2019-05-311-14/+28
| * | | | | | | | | | | | | split refreshLists() in twoisanae2019-05-312-10/+21
| * | | | | | | | | | | | | added new tabs in the conflict tabisanae2019-05-311-217/+351
| * | | | | | | | | | | | | moved all widgets in the conflict tab into a parent widget instead of directl...isanae2019-05-311-219/+234
|/ / / / / / / / / / / / /
* | | | | | | | | | | | | Merge pull request #739 from isanae/hide-conflict-itemsAl2019-05-295-159/+184
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | reverted change that showed the conflicted file first in the preview dialogisanae2019-05-281-3/+1
| * | | | | | | | | | | | | also reversed 'hide' parameter to 'visible' for changeFiletreeVisibility()isanae2019-05-281-14/+15
| * | | | | | | | | | | | | reversed 'hide' parameter to 'visible' for changeConflictItemsVisibility()isanae2019-05-281-11/+13
| * | | | | | | | | | | | | added selectedOrigin to previewFileWithAlternatives()isanae2019-05-284-7/+41
| * | | | | | | | | | | | | multiple selection for noconflict and overwritten listsisanae2019-05-273-129/+119
* | | | | | | | | | | | | | Merge pull request #732 from isanae/cmake-changesAl2019-05-284-10/+465
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'cmake-changes' of github_isa:isanae/modorganizer into cmake-cha...isanae2019-05-261-3/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | Update pch.hisanae2019-05-241-3/+0
| * | | | | | | | | | | | | | | set use_folders, puts all cmake generated projects into a folderisanae2019-05-261-0/+1
| |/ / / / / / / / / / / / / /
| * | | | | | | | | | | | | | added precompiled headersisanae2019-05-243-0/+282
| * | | | | | | | | | | | | | using builtin properties for autogen source groups, everything is now in the ...isanae2019-05-241-25/+11
| * | | | | | | | | | | | | | turned autorcc on so no need for qt5_add_resources() anymoreisanae2019-05-242-3/+15
| * | | | | | | | | | | | | | greatly decreased the verbosity of buildsisanae2019-05-242-3/+6
| * | | | | | | | | | | | | | put source files in specific groups so they're organized in the visual studio...isanae2019-05-241-4/+178
* | | | | | | | | | | | | | | Merge pull request #734 from isanae/permissive-flagAl2019-05-288-13/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | fixes for /permissive-:isanae2019-05-267-12/+12
| * | | | | | | | | | | | | | | added /permissive-isanae2019-05-261-1/+1
| |/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | | Merge pull request #738 from isanae/crash-plugin-highlightAl2019-05-281-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | findFile() seems to return null in some cases and crash on the line belowisanae2019-05-271-1/+1
|/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | Merge pull request #735 from isanae/hover-activate-700Al2019-05-261-2/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | don't activate the window when hovering save filesisanae2019-05-261-2/+9
|/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | Merge pull request #733 from isanae/shell-functions-to-uibaseAl2019-05-263-176/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | moved shell functions to uibaseisanae2019-05-263-176/+3
|/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | Merge pull request #731 from isanae/filetree-dds-preview-630Al2019-05-2612-390/+554
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | moved getFileExecutionContext() and its enum into OrganizerCoreisanae2019-05-263-75/+76
| * | | | | | | | | | | | | | changed enum case to follow conventionisanae2019-05-263-10/+10
| * | | | | | | | | | | | | | changed rest of ShellExecuteW() calls to use shell::Execute(), shell::OpenLin...isanae2019-05-269-36/+43
| * | | | | | | | | | | | | | put explore and open functions in namespace shellisanae2019-05-257-185/+311
generated by cgit v1.3.1 (git 2.54.0) at 2026-08-05 15:40:00 +0000