- Jun 05, 2013
-
-
Petar Perisin authored
However, files need to be part of the current project to be added to the list. Task-number: QTCREATORBUG-9153 Change-Id: Ifb7a4684e85d0ccd688956eeff77b4cc7d807911 Reviewed-by:
Orgad Shaneh <orgads@gmail.com>
-
Orgad Shaneh authored
The message in stashPrompt doesn't make sense with an inner directory Change-Id: Iddbea519915cd22a6882dcafb705d1ed99106db6 Reviewed-by:
Tobias Hunger <tobias.hunger@digia.com>
-
Petar Perisin authored
Change-Id: I44f68ad59d10e9751d09ed6e0f959d2a78d53822 Reviewed-by:
Tobias Hunger <tobias.hunger@digia.com> Reviewed-by:
Orgad Shaneh <orgads@gmail.com>
-
Orgad Shaneh authored
Broken in 92392454 Change-Id: I4e3d3b1c2fbec66c5471baedf1996529b852b868 Reviewed-by:
Petar Perisin <petar.perisin@gmail.com> Reviewed-by:
Tobias Hunger <tobias.hunger@digia.com>
-
Eike Ziller authored
This change * Removes IMode::type, ModeManager::activateModeType, and IEditor::preferredModeType, and adds IEditor::isDesignModePreferred instead * Adapts the mode switching code in EditorManager to handle multiple windows, for example switching to edit mode should only happen if the editor/view is in the main window. Otherwise the editor window should be raised and focused * Renames EditorManager::NoActivate --> DoNotChangeCurrentEditor * Reverts the EditorManager::ModeSwitch logic to switch mode or make the current editor visible by default, introducing DoNotMakeVisible flag instead * Fixes a few instances where EditorManager::ModeSwitch should have been used One non-trivial problem left: If you open a .ui file and switch to an external editor window, edit mode is activated, because the current editor no longer is a .ui file, which means that the design mode gets deactivated. Change-Id: I76c5c2391eb4090143b778fb103acff3a5a1ff41 Reviewed-by:
David Schulz <david.schulz@digia.com>
-
- Jun 04, 2013
-
-
Petar Perisin authored
Change-Id: I106420e8492d64451eee3648800ce57a4de2bfb9 Reviewed-by:
Orgad Shaneh <orgads@gmail.com> Reviewed-by:
Tobias Hunger <tobias.hunger@digia.com>
-
hjk authored
Change-Id: I5ac34d96152d6e4f9abc8f6dd18d1e1eab0bde7f Reviewed-by:
Jarek Kobus <jaroslaw.kobus@digia.com>
-
Petar Perisin authored
Change-Id: I0d5b0eaf562d30f34f01bcf344791a4ce766bdab Reviewed-by:
Orgad Shaneh <orgads@gmail.com> Reviewed-by:
Tobias Hunger <tobias.hunger@digia.com>
-
Petar Perisin authored
Change-Id: Idf770a20db66191b4d7fe3a704d31bdce70505c5 Reviewed-by:
Orgad Shaneh <orgads@gmail.com> Reviewed-by:
Tobias Hunger <tobias.hunger@digia.com>
-
Petar Perisin authored
Change-Id: Ic2243adaa36444099f834676186331927f3f4588 Reviewed-by:
Orgad Shaneh <orgads@gmail.com> Reviewed-by:
Tobias Hunger <tobias.hunger@digia.com>
-
Orgad Shaneh authored
Running interactive rebase and choosing edit for a commit causes stash pop when the commit is expected to be edited Change-Id: I37249e8486b609dedba143bd130059444f882303 Reviewed-by:
Petar Perisin <petar.perisin@gmail.com> Reviewed-by:
Tobias Hunger <tobias.hunger@digia.com>
-
- Jun 03, 2013
-
-
hjk authored
More in line with current naming conventions. Change-Id: I63f6677bd12d82f6749032996585d761f1a74fb7 Reviewed-by:
Jarek Kobus <jaroslaw.kobus@digia.com> Reviewed-by:
Eike Ziller <eike.ziller@digia.com>
-
Orgad Shaneh authored
Change-Id: I13d002773dd81206c70b7eb91727f152d7e84507 Reviewed-by:
Petar Perisin <petar.perisin@gmail.com> Reviewed-by:
Leena Miettinen <riitta-leena.miettinen@digia.com> Reviewed-by:
Tobias Hunger <tobias.hunger@digia.com>
-
Orgad Shaneh authored
Change-Id: I546241fb3531cbc542b97d6d0f53382c9225dcf4 Reviewed-by:
Petar Perisin <petar.perisin@gmail.com> Reviewed-by:
Tobias Hunger <tobias.hunger@digia.com>
-
Petar Perisin authored
Task-number: QTCREATORBUG-9375 Change-Id: I4e18e4c2d4db71392aa305d49ffce924f8451a0b Reviewed-by:
Orgad Shaneh <orgads@gmail.com>
-
- May 31, 2013
-
-
Orgad Shaneh authored
Useful for commit messages with "reverts <hash>" for example. Can later be extended for interactive rebase Change-Id: Ibf77433ecddfacbd8d443636ddbc406bda474aa7 Reviewed-by:
Tobias Hunger <tobias.hunger@digia.com>
-
Petar Perisin authored
Change-Id: I013c116fc7e0ac1571513005b8ea49992e0771a3 Reviewed-by:
Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by:
Orgad Shaneh <orgads@gmail.com> Reviewed-by:
Jarek Kobus <jaroslaw.kobus@digia.com>
-
- May 28, 2013
-
-
Petar Perisin authored
Change-Id: I8462ed07f3d1edce5c7f5ab8c166ce8c68b6d4b3 Reviewed-by:
Orgad Shaneh <orgads@gmail.com>
-
Orgad Shaneh authored
The command is appended anyway, and it usually produces no output to stdout Change-Id: Ie5f685b090ead8a0e888c9c0cfa6db2411e91f33 Reviewed-by:
Tobias Hunger <tobias.hunger@digia.com>
-
- May 27, 2013
-
-
Orgad Shaneh authored
* Replace RebaseManager with ConflictHandler * Store StashGuard in GitClient, allow popping after a whole process is done (e.g. pull with resolved conflicts) Change-Id: I85784f32f515ff896c73f35303c7de26f8006f59 Reviewed-by:
Tobias Hunger <tobias.hunger@digia.com>
-
Orgad Shaneh authored
...even when NoPrompt is specified Change-Id: I735133e390403a0f8f6aa573d6f9c63cf0784187 Reviewed-by:
Tobias Hunger <tobias.hunger@digia.com>
-
Orgad Shaneh authored
Change-Id: Ice9f33e986688e8d2c5250435a30cd7cb1ac3b28 Reviewed-by:
Tobias Hunger <tobias.hunger@digia.com>
-
- May 24, 2013
-
-
jkobus authored
Change-Id: I94d28dbc1cc5f753beda2284244bcd5c2c9df236 Reviewed-by:
Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by:
Tobias Hunger <tobias.hunger@digia.com>
-
jkobus authored
Change-Id: I2a40207ed3c4a5c07ba544d681aed6649a0b1a11 Reviewed-by:
Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by:
Tobias Hunger <tobias.hunger@digia.com>
-
- May 23, 2013
-
-
jkobus authored
Change-Id: I1576c3b8d370fdae660a399654b77af11a5f5d36 Reviewed-by:
Friedemann Kleint <Friedemann.Kleint@digia.com>
-
- May 17, 2013
-
-
Orgad Shaneh authored
Change-Id: I0efb368782ffb66cf6b8d39650fe7840c5ef2501 Reviewed-by:
Tobias Hunger <tobias.hunger@digia.com>
-
- May 16, 2013
-
-
Leena Miettinen authored
Fix capitalization and punctuation and a typo. Change-Id: Ie974594878aad6dec558516b2d31b202e8c732d4 Reviewed-by:
Leena Miettinen <riitta-leena.miettinen@digia.com>
-
- May 15, 2013
-
-
Petar Perisin authored
Change-Id: I024e6905ad9ef246bf30b898c654ba99e73b42e9 Reviewed-by:
Orgad Shaneh <orgads@gmail.com>
-
jkobus authored
Change-Id: I7675fc1d994020f94f42f6bd7b4f75aa29e6edf6 Reviewed-by:
David Schulz <david.schulz@digia.com> Reviewed-by:
Tobias Hunger <tobias.hunger@digia.com>
-
- May 13, 2013
-
-
Petar Perisin authored
Need to use push remote, and not fetch one because of gerrit plugin checks if remote url contains url set in gerritSettings. This needs push and not fetch url. Change-Id: If738e5c46f90ad00dc4616a2d109cab7a193620d Reviewed-by:
Tobias Hunger <tobias.hunger@digia.com>
-
Orgad Shaneh authored
post-commit or commit-msg hook might print useful information even without failing the commit Change-Id: I91b6ccfc43f1d148fb773ae074b2668927815235 Reviewed-by:
Petar Perisin <petar.perisin@gmail.com> Reviewed-by:
Tobias Hunger <tobias.hunger@digia.com>
-
- May 07, 2013
-
-
Orgad Shaneh authored
In case it contains the latest remote commit Change-Id: Id9e4cc40b7d1aa9daac3a9a2cf9ba41f589da7eb Reviewed-by:
Petar Perisin <petar.perisin@gmail.com> Reviewed-by:
Tobias Hunger <tobias.hunger@digia.com>
-
- May 04, 2013
-
-
Orgad Shaneh authored
Change-Id: Ia2584ff975ed0db614dc878a70ce4adbd5c3ba67 Reviewed-by:
Tobias Hunger <tobias.hunger@digia.com>
-
Orgad Shaneh authored
If the rebase succeeds without conflicts, pop Change-Id: I4f0c6ad3061f4f69f7e5c9450f972cce5c15227d Reviewed-by:
Tobias Hunger <tobias.hunger@digia.com>
-
- May 02, 2013
-
-
Orgad Shaneh authored
On Windows it is "Ignore, Merge Tool, Skip, Abort", while on Linux it is "Merge Tool, Ignore, Skip, Abort" That makes Ignore default on Windows, which is confusing Change-Id: Id7e9e8dd6fd5748d518de4d94db47ae075268627 Reviewed-by:
Tobias Hunger <tobias.hunger@digia.com>
-
Orgad Shaneh authored
It is used for both input and output, the pointer is assumed to be valid Change-Id: Iad9a82dfb5ea4850584d4da848076699cddd23c2 Reviewed-by:
Tobias Hunger <tobias.hunger@digia.com>
-
Orgad Shaneh authored
Change-Id: I900f3dd89eeeac61e29604ac459d36ecc6c0aa8f Reviewed-by:
Tobias Hunger <tobias.hunger@digia.com>
-
- Apr 30, 2013
-
-
Orgad Shaneh authored
Change-Id: Ibea0a1f2826c67796a56414326fe6afdee654576 Reviewed-by:
Tobias Hunger <tobias.hunger@digia.com>
-
- Apr 29, 2013
-
-
Orgad Shaneh authored
Replace explicit 'git log' call Change-Id: I7fd3821d9a321d84fa25bad4bd0a4525fee11993 Reviewed-by:
Tobias Hunger <tobias.hunger@digia.com>
-
Orgad Shaneh authored
* Added a Graph toggle button for log editor * Hide diff parameters when Diff is off * Remove GitClient::graphLog Change-Id: Ib87560bc4d6d7dbe866f0e58db8743a95df0622b Reviewed-by:
Tobias Hunger <tobias.hunger@digia.com>
-