summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* 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
| * | reordered action variables to match the order in the context menu, added a fe...isanae2019-05-252-10/+12
| * | ExploreFile() will select the file in explorer when the path is a fileisanae2019-05-255-21/+55
| * | moved GetFileExecutionContext() out of OrganizerCore, no reason for it to be ...isanae2019-05-253-93/+113
| * | a copy of getBinaryExecuteInfo() and openDataFile() was in both mainwindow an...isanae2019-05-256-165/+139
| |/
* / Add support for new Nexus API game codes to NXM link handlingSilarn2019-05-232-476/+505
|/
* Merge pull request #728 from isanae/DevelopAl2019-05-235-6/+96
|\
| * Merge remote-tracking branch 'remotes/upstream/Develop' into Developisanae2019-05-226-377/+396
| |\ | |/ |/|
* | CI: Update to provisioned final VS 2019 imageJeremy Rimpo2019-05-221-1/+1
* | Set optimization for release buildsSilarn2019-05-221-1/+1
* | Add logs to build artifacts on CI fail, commit translation changesSilarn2019-05-212-37/+37
* | CI: FileName is for the target not the sourceJeremy Rimpo2019-05-211-2/+2
* | CI: Push log files from the main build folderJeremy Rimpo2019-05-211-2/+2
* | Add logs to build artifacts on failureJeremy Rimpo2019-05-211-1/+3
* | Merge pull request #727 from isanae/DevelopAl2019-05-211-2/+6
|\ \
* \ \ Merge pull request #726 from isanae/DevelopAl2019-05-215-61/+337
|\ \ \
* | | | Switch to local build files as appveyor can't use installed filesSilarn2019-05-211-2/+2
* | | | With old mods, only queue the old ones in case of API overflowSilarn2019-05-212-367/+378
* | | | Unify artifacts source path to install pathSilarn2019-05-211-2/+2
* | | | Fix horizontal scrollbar width for dracula themeLostDragonist2019-05-191-1/+7