summaryrefslogtreecommitdiff
path: root/src/plugins/git
Commit message (Collapse)AuthorAgeFilesLines
* Fix typos in source stringsJarek Kobus2011-03-311-1/+1
| | | | Reviewed-by: Pawel Polanski
* clean up DEPENDPATH insanityOswald Buddenhagen2011-03-091-1/+0
| | | | | | | | simply add CONFIG += depend_includepath to qtcreator.pri and remove all the manual DEPENDPATHs, as half of them were missing anyway, and i wouldn't expect it to ever change. not touching src/shared/ for syncing reasons.
* Git: Update for git 1.7.4Tobias Hunger2011-03-031-1/+2
| | | | | | | Handle git status output as done by git 1.7.4. Thanks to BogDan Vatra for pointing out this issue. TaskNumber: QTCREATORBUG-3697
* Fixed layout issues in some editor toolbarsThorbjørn Lindeijer2011-02-251-0/+4
| | | | | | Cleaned up some hacky code in the process. Done-with: Tobias Hunger
* texteditor: merge ITextEditable into ITextEditorhjk2011-02-225-35/+35
| | | | | | | | rename BastTextEditor->BaseTextEditorWidget, BaseTextEditorEditable->BaseTextEditor rename BaseTextEditor{,Widget} subclasses rename editableInterface->editorInterface rename createEditableInterface->createEditor minor cleanups after renamings
* Exported header cleanup.Friedemann Kleint2011-01-201-0/+1
|
* 10n: Fix tr() issues.Friedemann Kleint2011-01-191-10/+8
|
* Git: Some whitespace fixesTobias Hunger2011-01-121-5/+5
|
* Fix git show using the default formatTobias Hunger2011-01-121-37/+54
| | | | | | Fix git show using the default format the first time it gets used. Task-number: QTCREATORBUG-3412
* It's 2011 now.con2011-01-1252-52/+52
| | | | Reviewed-by: hjk
* Git: Improve handling of git submodulesTobias Hunger2010-12-202-31/+37
| | | | Task-number: QTCREATORBUG-3390
* Merge branch '2.1'con2010-12-1751-357/+561
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/plugins/coreplugin/basemode.cpp src/plugins/coreplugin/basemode.h src/plugins/coreplugin/scriptmanager/qworkbench_wrapper.cpp src/plugins/coreplugin/scriptmanager/qworkbench_wrapper.h src/plugins/debugger/cdb/cdbsymbolpathlisteditor.cpp src/plugins/debugger/debuggeragents.cpp src/plugins/debugger/debuggeruiswitcher.cpp src/plugins/debugger/debuggeruiswitcher.h src/plugins/projectexplorer/buildconfigdialog.cpp src/plugins/qmldesigner/components/propertyeditor/colorwidget.cpp src/plugins/qmldesigner/components/propertyeditor/colorwidget.h src/plugins/qmldesigner/designercore/include/enumeratormetainfo.h src/plugins/qmldesigner/designercore/include/modelutilities.h src/plugins/qmldesigner/designercore/include/nodeinstance.h src/plugins/qmldesigner/designercore/include/propertymetainfo.h src/plugins/qmldesigner/designercore/instances/graphicsscenenodeinstance.cpp src/plugins/qmldesigner/designercore/instances/graphicsscenenodeinstance.h src/plugins/qmldesigner/designercore/instances/graphicsviewnodeinstance.cpp src/plugins/qmldesigner/designercore/instances/graphicswidgetnodeinstance.cpp src/plugins/qmldesigner/designercore/instances/graphicswidgetnodeinstance.h src/plugins/qmldesigner/designercore/instances/nodeinstance.cpp src/plugins/qmldesigner/designercore/instances/qmlviewnodeinstance.cpp src/plugins/qmldesigner/designercore/instances/widgetnodeinstance.cpp src/plugins/qmldesigner/designercore/instances/widgetnodeinstance.h src/plugins/qmldesigner/designercore/metainfo/enumeratormetainfo.cpp src/plugins/qmldesigner/designercore/metainfo/propertymetainfo.cpp src/plugins/qmldesigner/designercore/model/modelutilities.cpp src/plugins/snippets/inputwidget.cpp src/plugins/snippets/snippetscompletion.cpp src/plugins/snippets/snippetscompletion.h src/plugins/snippets/snippetspec.cpp src/plugins/snippets/snippetsplugin.cpp src/plugins/snippets/snippetswindow.cpp src/plugins/snippets/snippetswindow.h src/plugins/texteditor/snippetsparser.cpp src/tools/qml/qmldom/main.cpp tests/manual/trk/runner.cpp tests/manual/trk/trkolddevice.cpp tests/manual/trk/trkolddevice.h tests/manual/trk/trkserver.cpp
| * License headers.con2010-12-1751-357/+561
| |
| * Version bump.con2010-12-021-5/+5
| |
| * Version bump.con2010-11-021-5/+5
| |
* | Removed stray tokens and fixed warnings/errors when compiling with pedantic ↵Roberto Raggi2010-12-161-1/+1
| | | | | | | | C++ compilers.
* | Git: Have version selection dialog default to HEADTobias Hunger2010-12-161-0/+3
| | | | | | | | ... if a repository is set.
* | Git: Stop debug messageTobias Hunger2010-12-091-4/+0
| |
* | Git: Bring iexisting editors to foregroundTobias Hunger2010-12-091-1/+2
| | | | | | | | | | If we have some git operation in an editor already: Bring that to the foreground.
* | Git: Allow for pretty format selection in git showTobias Hunger2010-12-094-16/+79
| | | | | | | | | | | | | | | | Allow for pretty format selection in git show. Save selected value and default to "email". Task-number: QTCREATORBUG-3341
* | Update the filter matches for the settings dialog.con2010-12-011-5/+13
| | | | | | | | Task-number: QTCREATORBUG-2936
* | Git: Add some tooltipsTobias Hunger2010-11-261-0/+4
| | | | | | | | Add tooltips to the toggles found in the Git Blame and Diff editors.
* | Git: Only enable submit button when a description is availableTobias Hunger2010-11-234-22/+25
| | | | | | | | | | | | | | | | | | Only enable submit button in the git submit editor when a non-empty desciption of the patch is available. Git rejects empty commit messages and old versions fail without even giving an error Qt Creator can detect, so this should make commiting a bit more save. Task-number: QTCREATORBUG-2410
* | Git: Do not accept invalid commitsTobias Hunger2010-11-231-2/+2
| | | | | | | | | | | | Do not offer to commit in the dialog opened when closing the commit editor when the commit is not containing all the required information.
* | Git: Allow . in checkout pathesTobias Hunger2010-11-221-1/+1
| | | | | | | | Task-number: QTCREATORBUG-3141
* | Fix whitespace issueTobias Hunger2010-11-221-1/+1
| |
* | VCS: Handle code folding in diff viewTobias Hunger2010-11-221-1/+1
| | | | | | | | Allow to do codefolding on files and hunks in the diff editor
* | Git: Add options to diff editorTobias Hunger2010-11-229-115/+412
| |
* | overhaul process argument handlingOswald Buddenhagen2010-11-171-1/+2
| | | | | | | | | | | | | | | | | | get away from argument stringlists. instead, use native shell command lines which support quoting/splitting, environment variable expansion and redirections with well-understood semantics. Task-number: QTCREATORBUG-542 Task-number: QTCREATORBUG-1564
* | VCS[git]: Fix change dialog.Friedemann Kleint2010-11-152-3/+4
| |
* | dynamically replace creator version during buildOswald Buddenhagen2010-11-031-5/+5
| | | | | | | | | | ... instead of running a sed script over a lot of files on each version increment.
* | centralize addition of pluginspecs to OTHER_FILESOswald Buddenhagen2010-11-031-1/+0
| |
* | Coreplugin: Header cleanup.Friedemann Kleint2010-11-021-0/+1
| | | | | | | | Clean icore.h.
* | Git: Fix stash namesTobias Hunger2010-10-291-11/+5
| | | | | | | | | | | | Fix detection of stash names. Task-number: QTCREATORBUG-2934
* | Git: Use class instead of structTobias Hunger2010-10-292-2/+3
| |
* | Merge remote branch 'origin/2.1'Friedemann Kleint2010-10-271-7/+0
|\ \ | |/
| * kill dead source stringOswald Buddenhagen2010-10-251-7/+0
| |
* | Merge remote branch 'origin/2.1'Oswald Buddenhagen2010-10-183-6/+6
|\ \ | |/ | | | | | | | | Conflicts: share/qtcreator/templates/qmlapp/app.pro src/libs/utils/filesearch.cpp
| * Git: Rename "reset" back to "undo uncomitted changes"Tobias Hunger2010-10-151-3/+3
| | | | | | | | | | | | | | Rename "Reset..." back to "Undo Uncommitted Changes..." to be more in line with git gui as well as the file-based operations. Reviewed-by: Leena Miettinen
| * Git: Update stringTobias Hunger2010-10-151-2/+2
| | | | | | | | | | | | | | Refer to "blame", not "annotate" since that is what we call the action elsewhere. Reviewed-by: Leena Miettinen
| * Git integration: Disambiguate precedence to silence gcc warningDaniel Molkentin2010-10-151-1/+1
| | | | | | | | Reviewed-by: Tobias Hunger
* | Merge remote branch 'origin/2.1'Christian Kamm2010-10-1110-125/+204
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: README doc/qt-html-templates.qdocconf doc/qtcreator.qdoc doc/qtcreator.qdocconf share/qtcreator/templates/wizards/qtcreatorplugin/MyPlugin.pluginspec src/app/Info.plist src/plugins/bineditor/BinEditor.pluginspec src/plugins/bookmarks/Bookmarks.pluginspec src/plugins/classview/ClassView.pluginspec src/plugins/cmakeprojectmanager/CMakeProjectManager.pluginspec src/plugins/coreplugin/Core.pluginspec src/plugins/coreplugin/coreconstants.h src/plugins/cpaster/CodePaster.pluginspec src/plugins/cppeditor/CppEditor.pluginspec src/plugins/cpptools/CppTools.pluginspec src/plugins/cvs/CVS.pluginspec src/plugins/debugger/Debugger.pluginspec src/plugins/debugger/breakhandler.cpp src/plugins/designer/Designer.pluginspec src/plugins/fakevim/FakeVim.pluginspec src/plugins/find/Find.pluginspec src/plugins/genericprojectmanager/GenericProjectManager.pluginspec src/plugins/git/ScmGit.pluginspec src/plugins/helloworld/HelloWorld.pluginspec src/plugins/help/Help.pluginspec src/plugins/imageviewer/ImageViewer.pluginspec src/plugins/locator/Locator.pluginspec src/plugins/mercurial/Mercurial.pluginspec src/plugins/perforce/Perforce.pluginspec src/plugins/projectexplorer/ProjectExplorer.pluginspec src/plugins/qmldesigner/QmlDesigner.pluginspec src/plugins/qmljseditor/QmlJSEditor.pluginspec src/plugins/qmljsinspector/QmlJSInspector.pluginspec src/plugins/qmlprojectmanager/QmlProjectManager.pluginspec src/plugins/qt4projectmanager/Qt4ProjectManager.pluginspec src/plugins/regexp/RegExp.pluginspec src/plugins/resourceeditor/ResourceEditor.pluginspec src/plugins/snippets/Snippets.pluginspec src/plugins/subversion/Subversion.pluginspec src/plugins/tasklist/TaskList.pluginspec src/plugins/texteditor/TextEditor.pluginspec src/plugins/vcsbase/VCSBase.pluginspec src/plugins/welcome/Welcome.pluginspec tests/auto/cplusplus/codeformatter/tst_codeformatter.cpp tests/manual/fakevim/fakevim.pro tests/manual/ssh/errorhandling/main.cpp
| * VCS: String updateTobias Hunger2010-10-081-1/+1
| | | | | | | | String update as suggested by Leena.
| * Git: Clean up the menu of the git pluginTobias Hunger2010-10-081-83/+112
| |
| * Git: Show native pathes to repositoriesTobias Hunger2010-10-083-3/+4
| |
| * Git: Consider new files a diffTobias Hunger2010-10-081-2/+3
| | | | | | | | | | | | | | | | When checking for a difference and being asked to handle untracked files: Actually consider the presence of untracked files a change. Fixes git commit editor not coming up when there were no changes, only additions of new files.
| * version bump: 2.0.92 -> 2.0.93hjk2010-10-081-5/+5
| |
| * version bump: 2.0.91 -> 2.0.92v2.1.0-betahjk2010-10-071-5/+5
| |
| * Git: Improve handling of author informationTobias Hunger2010-10-051-5/+7
| | | | | | | | | | Task-number: QTCREATORBUG-2610 Reviewed-by: Robert Loehning
| * Git: ignore spaces in diffTobias Hunger2010-10-055-10/+20
| | | | | | | | | | | | | | Ignore spacing changes in diff (based on same setting as used to ignore spacing in git blame). Task-number: QTCREATORBUG-2526
View Lorry Controller Status