summaryrefslogtreecommitdiff
path: root/src/plugins/diffeditor
Commit message (Expand)AuthorAgeFilesLines
* DiffEditor: Add context info to side by side editorOrgad Shaneh2017-06-021-9/+11
* DiffEditor: Remove dead codeEike Ziller2017-05-231-19/+1
* Move Git-specific logic from DiffEditor to GitOrgad Shaneh2017-05-192-36/+2
* DiffEditor: Fix editor actionsEike Ziller2017-05-1810-10/+158
* Reduce usage of qApp in favor of static function callsAlessandro Portale2017-04-241-1/+1
* Use QString::*Ref methodMontel Laurent2017-04-212-2/+2
* Reserve some elementsMontel Laurent2017-04-141-0/+1
* Support diff a file from project explorer against the current fileJarek Kobus2017-03-282-0/+17
* DiffEditor: De-slotOrgad Shaneh2017-03-206-19/+12
* Merge remote-tracking branch 'origin/4.2' into 4.3Orgad Shaneh2017-03-142-0/+2
|\
| * QRegExp include cleanupSamuel Gaist2017-03-132-0/+2
* | DiffEditor: Fix warning about unused constantTobias Hunger2017-01-301-2/+0
* | DiffEditor: drop legacy settingsArnold Dumas2017-01-231-15/+0
* | Utils: Introduce a TemporaryDirectory and TemporaryFile classTobias Hunger2017-01-201-2/+2
* | Prefix editor's uniqueId with plugin nameJarek Kobus2017-01-103-5/+12
* | Display "Waiting for data" properlyJarek Kobus2017-01-098-8/+47
* | Merge remote-tracking branch 'origin/4.2'Eike Ziller2016-11-301-1/+1
|\ \ | |/
| * Git: Replace msysGit with Git for Windows in commentsOrgad Shaneh2016-11-291-1/+1
* | DiffEditor: Initialize pointersTobias Hunger2016-11-291-2/+2
* | Merge remote-tracking branch 'origin/4.2'Orgad Shaneh2016-11-286-12/+18
|\ \ | |/
| * Fix showing/hiding context lines spinbox in diff editorJarek Kobus2016-11-252-10/+9
| * Don't save context chunksJarek Kobus2016-11-241-0/+3
| * Fix SideBySide diff editor iconJarek Kobus2016-11-241-1/+1
| * Clear the uniqueId of diff editor when savingJarek Kobus2016-11-241-0/+1
| * Make skipOpeningBigTextFile() public and use it in Diff EditorJarek Kobus2016-11-231-1/+4
* | Show progress indicator while reloading diffJarek Kobus2016-11-234-0/+67
* | Make some variables constJarek Kobus2016-11-231-10/+10
* | Don't use static variables in differJarek Kobus2016-11-231-3/+3
* | Move diff calculation to the separate threadJarek Kobus2016-11-213-82/+176
|/
* Add some missing constsJarek Kobus2016-11-171-4/+4
* Add missing overridesJarek Kobus2016-11-171-4/+4
* DiffEditor: fix revert chunk for diffs of modified filesJarek Kobus2016-10-215-15/+64
* Reuse the Guard classJarek Kobus2016-10-212-27/+14
* Use namespace Core in diff editor pluginJarek Kobus2016-10-211-37/+39
* Handle "Diff All Modified Files" action enablementJarek Kobus2016-10-212-44/+53
* Implement diff on close, on revert and on external modificationJarek Kobus2016-10-212-0/+92
* Drop unneeded overrideJarek Kobus2016-10-071-1/+0
* DiffEditor: Fix compile with gcc 4.8 / Qt5.6Christian Stenger2016-10-071-1/+1
* Implement diff for unsaved changesJarek Kobus2016-10-062-40/+276
* Move icons to UtilsUlf Hermann2016-08-051-3/+3
* DiffEditor: do not show reload promptNikita Baryshnikov2016-07-251-1/+4
* Show proper diff when one of diff files is missingJarek Kobus2016-07-251-2/+8
* Refactor DiffEditorWidgets, introduce common widget controllerJarek Kobus2016-07-258-441/+407
* Wholesale conversion to #pragma oncehjk2016-03-3014-56/+14
* Update License according to agreement with Free Qt FoundationTobias Hunger2016-01-1926-428/+303
* IDocument: Rename defaultPath and suggestedFileNameEike Ziller2016-01-142-4/+4
* DiffEditor: Sort includesAndre Hartmann2015-12-221-12/+12
* Core: Unify the close iconsAlessandro Portale2015-12-041-1/+1
* Themed Icons: Introduce Utils::IconAlessandro Portale2015-11-256-15/+60
* Git: Scroll to active file on Show invoked from file logOrgad Shaneh2015-11-035-64/+93