Diffusion Calligra 299aa3294920

Merge branch 'master' into formulashape-matlab_tool-cyrille_berger
299aa3294920
Actions

Authored by cyrille on Feb 27 2012, 8:53 PM.

Description

Merge branch 'master' into formulashape-matlab_tool-cyrille_berger

Details

Committed
cyrilleFeb 27 2012, 8:53 PM
Parents
R8:2785b659c42f: the line edit is sometime created after the call to activate, in which case…
R8:233c55331b95: Merge branch 'master' of ssh://git.kde.org/calligra
Branches
Unknown
Tags
Unknown

Merged Changes

This commit merges a very large number of changes. Only the first 50 are shown.
CommitAuthorDetailsCommitted
233c55331b95Thorsten Zachmann
Merge branch 'master' of ssh://git.kde.org/calligra 
Feb 27 2012
596056775c4fThorsten Zachmann
Fix off by one access of the array 
Feb 27 2012
40a692001e5aDag Andersen
Do not execute code inside Q_ASSERT 
Feb 27 2012
7db07ed769a2Dag Andersen
Close any editor before adding a new object 
Feb 27 2012
59f2ceac5855Boudewijn Rempt
Run the file format tests in batch mode 
Feb 27 2012
59bcfb82981fDmitry Kazakov
Added support for checking the type of newly added dummy 
Feb 27 2012
a8a99c4dc5f6Jaroslaw Staniek
Fixed misbehaving encoding selection when importing a CSV file 
Feb 27 2012
a99283dd1e30Jaroslaw Staniek
Fix crash while importing CSV rows that start with empty cells 
Feb 27 2012
1e9be96a9e43Jaroslaw Staniek
KexiDB SQLite Driver: fixed crash when inserting incomplete rows 
Feb 27 2012
648c29d205b4C. Boemann
More workaround for the Qt 4.8 bug 
Feb 26 2012
5291fb02547dBoudewijn Rempt
keep the top layer's name, for animtim 
Feb 26 2012
d53f25c8d728C. Boemann
This qDebug should not have been committed 
Feb 26 2012
7a0de0b73e72C. Boemann
Disable the undo recording during load so the kotexteditor is in sync with the… 
Feb 26 2012
975115703a31Boudewijn Rempt
Add an erase composite op for the ctlcs-based colorspaces 
Feb 26 2012
4593402919c9C. Boemann
Merge branch 'text-undo-munichsprint' 
Feb 26 2012
b25884e32912Adam Pigg
Fixed capitalisation 
Feb 25 2012
12fdc19ad54dAdam Pigg
If no driver for the selected source is found, display a message and do no… 
Feb 25 2012
ade9ae718877Dmitry Kazakov
Merge remote-tracking branch 'origin/deselected-selections-kazakov' 
Feb 25 2012
d1603c9de428C. Boemann
might as well remove it from the class completely 
Feb 25 2012
ca50ed3d28bfC. Boemann
Now that the shapedelete commands are child commands we shouldn't handle them… 
Feb 25 2012
a75a0d1fdbbfBoudewijn Rempt
don't even try to merge if there's nothing to merge 
Feb 25 2012
d406fb7209d1Dmitry Kazakov
Fixed Deselect/Reselect to work in a "classic" way 
Feb 25 2012
ef6638a2758fC. Boemann
Fix that inserting a table would create an extra spurious undocommand during… 
Feb 24 2012
75a32b19bc54C. Boemann
forgot this file when renaming variable 
Feb 24 2012
5506e45189b5Jaroslaw Staniek
Skip koabstraction build when user excluded one or more depending apps BUG… 
Feb 24 2012
6e0fc6a70f01Jaroslaw Staniek
CSV import options: cosmetic change: do not display , in 2,008 -use 2008 
Feb 24 2012
54db2e48a855C. Boemann
Try a bit harder to have a undostack, and don't crash if we don't 
Feb 24 2012
d09e90b5163aElvis Stansvik
Fix update of block formats after paragraph style change. 
Feb 24 2012
7880328e2881Boudewijn Rempt
Fix spelling error in comment 
Feb 24 2012
f88be7d66aa3Boudewijn Rempt
Revert "fix spello" 
Feb 24 2012
d057cd1b22d0Boudewijn Rempt
fix spello 
Feb 24 2012
3a32f5a9a7d2C. Boemann
Implement review comment suggestions 
Feb 24 2012
b753d8f276dfBoudewijn Rempt
Fix crash when saving a modified document on closing the last window 
Feb 24 2012
507960560befBoudewijn Rempt
this is exr, not tiff 
Feb 24 2012
c851340dc8c3Script Kiddy
SVN_SILENT made messages (.desktop file) 
Feb 24 2012
c3e72c4b6e7dBoudewijn Rempt
Merge layer: only ask for the metadata merge strategy if there is metadata 
Feb 23 2012
19aed36109e4Boudewijn Rempt
create merged layer opaque with composite_over 
Feb 23 2012
41cb5af15b9bBoudewijn Rempt
Make krita build on windows 
Feb 23 2012
47f3a5716d87Boudewijn Rempt
Only translate this after the release 
Feb 23 2012
a79babb9a0abBoudewijn Rempt
implement replace-current-document drop action 
Feb 23 2012
3f2ec0d23809Boudewijn Rempt
fix dox layout 
Feb 23 2012
553438db11e3Boudewijn Rempt
fix double defintion 
Feb 23 2012
364e686c9282Boudewijn Rempt
Fix compilation (if we use headers from komain, we should include komain) 
Feb 23 2012
1dfec3c60478Boudewijn Rempt
Correctly merge two layers 
Feb 23 2012
9d80ca7c0fa5Dmitry Kazakov
Fixed if-space-bracket problems in the changed files 
Feb 23 2012
68e8323b2a5eDmitry Kazakov
Revert to an ugly 5 line construction doing the work of one-liner 
Feb 23 2012
aa38fbf1d36cDmitry Kazakov
Fixed deselected selections 
Feb 23 2012
7db763d3f4b0Jaroslaw Staniek
SVN_SILENT update 
Feb 23 2012
dbe96b46f55cJaroslaw Staniek
Welcome status bar: fetch the GUI updates from the server if available 
Feb 23 2012
7191c44ceb47Jaroslaw Staniek
Improve context message position and size on parent resizes 
Feb 23 2012

Very Large Commit

This commit is very large, and affects more than 1000 files. Changes are not shown.