lp:~claydoh/kmymoney/trunk

Created by Clay Weber and last modified
Get this branch:
bzr branch lp:~claydoh/kmymoney/trunk

Related bugs

Related blueprints

Branch information

Owner:
Clay Weber
Project:
KMyMoney
Status:
Development

Import details

Import Status: Failed

This branch is an import of the HEAD branch of the Git repository at git://anongit.kde.org/kmymoney.

The import has been suspended because it failed 5 or more times in succession.

Last successful import was .

Import started on pear and finished taking 25 seconds — see the log
Import started on pear and finished taking 40 seconds — see the log
Import started on pear and finished taking 20 seconds — see the log
Import started on pear and finished taking 20 seconds — see the log

Recent revisions

3540. By Cristian OneČ› <email address hidden>

Port the disabled code from webpricequote to frameworks.

Now at least I can update my prices using the frameworks version.
Though I haven't tested a finance quote source, I guess it should
work.

3539. By Ralf Habacker

Merge remote-tracking branch 'origin/4.8'

# Conflicts:
# kmymoney/kmymoney.cpp

3538. By NSLW

Simplify redefinedlg

1) renamed redefinedlg.cpp to transactiondlg.cpp,
2) merged RedefineDlgDecl and RedefineDlg,
3) initialize transactiondlg only when it's needed,
4) fit size of transactiondlg to content,
5) connected slotAccepted and slotRejected in ui file,
6) removed redundant variables,
7) displayLine doesn't need to know what it displays,
8) add column headers to transactiondlg,
9) it doesn't matter if transaction type is unrecognised or invalid,

REVIEW:129081

3537. By Ralf Habacker

Merge remote-tracking branch 'origin/4.8'

3536. By Ralf Habacker

Compile fix.

3535. By l10n daemon script <email address hidden>

SVN_SILENT made messages (.desktop file) - always resolve ours

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

3534. By Ralf Habacker

Merge remote-tracking branch 'origin/4.8'

3533. By l10n daemon script <email address hidden>

SVN_SILENT made messages (.desktop file) - always resolve ours

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

3532. By Ralf Habacker

Fix merge.

3531. By Ralf Habacker

Merge remote-tracking branch 'origin/4.8'

Merge has been verified by file comparing against origin/master.

Branch metadata

Branch format:
Branch format 7
Repository format:
Bazaar repository format 2a (needs bzr 1.16 or later)
This branch contains Public information 
Everyone can see this information.

Subscribers