feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
Files
c75ddf6b9346f149d0dece56f712c256a28911f8
qt-creator/src/plugins/vcsbase
History
Andre Hartmann 3a78b610d7 VCS: Colorize unmerged files in submit editor 
So far, conflicted files were displayed like added ones.

Now they are marked obvious, as they disable the commit button.

Task-number: QTCREATORBUG-16297
Change-Id: Iedf834408a747c4fe5f2133790c5fb81e7fea265
Reviewed-by: Hugues Delorme <delorme.hugues@fougue.pro>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2016-05-20 12:15:53 +00:00
..
images
Vcsbase: Moving vcs settings category icon into the vcs plugin
2014-06-03 10:30:19 +02:00
wizard
VcsBase: Modernize headers
2016-02-03 15:53:22 +00:00
baseannotationhighlighter.cpp
VcsBase: Modernize headers
2016-02-03 15:53:22 +00:00
baseannotationhighlighter.h
VcsBase: Modernize headers
2016-02-03 15:53:22 +00:00
basevcseditorfactory.cpp
Update License according to agreement with Free Qt Foundation
2016-01-19 15:57:01 +00:00
basevcseditorfactory.h
VcsBase: Modernize headers
2016-02-03 15:53:22 +00:00
basevcssubmiteditorfactory.cpp
VcsBase: Modernize headers
2016-02-03 15:53:22 +00:00
basevcssubmiteditorfactory.h
VcsBase: Modernize headers
2016-02-03 15:53:22 +00:00
cleandialog.cpp
runAsync: Remove ResultType template parameter.
2016-02-10 10:58:55 +00:00
cleandialog.h
VcsBase: Modernize headers
2016-02-03 15:53:22 +00:00
cleandialog.ui
VCS Clean Dialog: Added "Select All" checkbox
2013-04-02 11:37:02 +02:00
commonsettingspage.cpp
Update License according to agreement with Free Qt Foundation
2016-01-19 15:57:01 +00:00
commonsettingspage.h
VcsBase: Modernize headers
2016-02-03 15:53:22 +00:00
commonsettingspage.ui
VcsBase: Add a button to reset VCS information cache
2015-12-02 14:59:31 +00:00
commonvcssettings.cpp
Update License according to agreement with Free Qt Foundation
2016-01-19 15:57:01 +00:00
commonvcssettings.h
VcsBase: Modernize headers
2016-02-03 15:53:22 +00:00
diffandloghighlighter.cpp
VcsBase: Modernize headers
2016-02-03 15:53:22 +00:00
diffandloghighlighter.h
VcsBase: Modernize headers
2016-02-03 15:53:22 +00:00
nicknamedialog.cpp
Update License according to agreement with Free Qt Foundation
2016-01-19 15:57:01 +00:00
nicknamedialog.h
VcsBase: Modernize headers
2016-02-03 15:53:22 +00:00
nicknamedialog.ui
NickNameDialog: Use Utils::TreeView
2014-04-16 12:59:21 +02:00
README.txt
Initial import
2008-12-02 12:01:29 +01:00
submiteditorfile.cpp
Core: Make IDocument concrete
2016-03-17 07:43:55 +00:00
submiteditorfile.h
Remove unnecessary Q_OBJECT from IDocument subclasses
2016-03-24 10:53:09 +00:00
submiteditorwidget.cpp
Update License according to agreement with Free Qt Foundation
2016-01-19 15:57:01 +00:00
submiteditorwidget.h
VcsBase: Modernize headers
2016-02-03 15:53:22 +00:00
submiteditorwidget.ui
SubmitEditor: Add scrollbars when necessary
2015-03-09 08:39:22 +00:00
submitfieldwidget.cpp
Update License according to agreement with Free Qt Foundation
2016-01-19 15:57:01 +00:00
submitfieldwidget.h
VcsBase: Modernize headers
2016-02-03 15:53:22 +00:00
submitfilemodel.cpp
VCS: Colorize unmerged files in submit editor
2016-05-20 12:15:53 +00:00
submitfilemodel.h
VCS: Colorize unmerged files in submit editor
2016-05-20 12:15:53 +00:00
vcsbase_dependencies.pri
CodePaster: Register type safe service object
2015-07-08 07:41:43 +00:00
vcsbase_global.h
VcsBase: Modernize headers
2016-02-03 15:53:22 +00:00
VcsBase.json.in
Update License according to agreement with Free Qt Foundation
2016-01-19 15:57:01 +00:00
vcsbase.pro
VcsBase: Fix ClearCase plugin unit test
2015-11-30 09:38:25 +00:00
vcsbase.qbs
VcsBase: Fix ClearCase plugin unit test
2015-11-30 09:38:25 +00:00
vcsbase.qrc
Use new mime database
2015-02-17 13:00:07 +00:00
vcsbaseclient.cpp
VcsBaseClient: Make some functions const
2016-05-08 19:03:11 +00:00
vcsbaseclient.h
VcsBaseClient: Make some functions const
2016-05-08 19:03:11 +00:00
vcsbaseclientsettings.cpp
Update License according to agreement with Free Qt Foundation
2016-01-19 15:57:01 +00:00
vcsbaseclientsettings.h
VcsBase: Modernize headers
2016-02-03 15:53:22 +00:00
vcsbaseconstants.h
VcsBase: Modernize headers
2016-02-03 15:53:22 +00:00
vcsbaseeditor.cpp
VCS: Modernize VcsBaseEditorWidgetPrivate initialization
2016-03-29 11:19:49 +00:00
vcsbaseeditor.h
VcsBase: Modernize headers
2016-02-03 15:53:22 +00:00
vcsbaseeditorparameterwidget.cpp
VcsBase: Modernize headers
2016-02-03 15:53:22 +00:00
vcsbaseeditorparameterwidget.h
VcsBase: Modernize headers
2016-02-03 15:53:22 +00:00
vcsbaseoptionspage.cpp
VcsBase: Modernize headers
2016-02-03 15:53:22 +00:00
vcsbaseoptionspage.h
VcsBase: Modernize headers
2016-02-03 15:53:22 +00:00
vcsbaseplugin.cpp
VcsBase: Modernize headers
2016-02-03 15:53:22 +00:00
vcsbaseplugin.h
VcsBase: Modernize headers
2016-02-03 15:53:22 +00:00
vcsbasesubmiteditor.cpp
VCS: Properly support contents() on commit descriptions
2016-01-22 09:51:48 +00:00
vcsbasesubmiteditor.h
VcsBase: Modernize headers
2016-02-03 15:53:22 +00:00
vcscommand.cpp
SynchronousProcess: Change exit code interpreter to function object
2016-04-27 08:48:32 +00:00
vcscommand.h
SynchronousProcess: Change exit code interpreter to function object
2016-04-27 08:48:32 +00:00
vcsoutputwindow.cpp
VCS: Fix find in output pane
2016-02-08 08:03:30 +00:00
vcsoutputwindow.h
VcsBase: Modernize headers
2016-02-03 15:53:22 +00:00
vcsplugin.cpp
Update License according to agreement with Free Qt Foundation
2016-01-19 15:57:01 +00:00
vcsplugin.h
VcsBase: Modernize headers
2016-02-03 15:53:22 +00:00
vcsprojectcache.cpp
Update License according to agreement with Free Qt Foundation
2016-01-19 15:57:01 +00:00
vcsprojectcache.h
VcsBase: Modernize headers
2016-02-03 15:53:22 +00:00

README.txt 

TODO:

When diffing:
- Use code from current editor or
- else from project or
- System codec
View Git Blame Copy Permalink