This repository has been archived on 2025-03-01. You can view files and clone it, but cannot push or open issues or pull requests.

Daniel Kraft 665659f214 Merge branch 'master' of https://github.com/Bitmessage/PyBitmessage into namecoin-id ...

Conflicts:
	src/bitmessageqt/bitmessageui.py
	src/helper_startup.py

2013-07-27 08:24:52 +02:00

..

__init__.py

Merge branch 'master' of https://github.com/Bitmessage/PyBitmessage into namecoin-id

2013-07-27 08:24:52 +02:00

about.py

Moved UI related files all into the bitmessageqt folder

2013-06-18 13:59:51 -04:00

about.ui

Moved UI related files all into the bitmessageqt folder

2013-06-18 13:59:51 -04:00

addpeer.ui

Moved UI related files all into the bitmessageqt folder

2013-06-18 13:59:51 -04:00

bitmessage_icons_rc.py

Moved UI related files all into the bitmessageqt folder

2013-06-18 13:59:51 -04:00

bitmessage_icons.qrc

Added some default text to the search textbox, also fixed bitmessage_icons.qrc after file move

2013-07-13 20:35:06 -04:00

bitmessageui.py

Merge branch 'master' of https://github.com/Bitmessage/PyBitmessage into namecoin-id

2013-07-27 08:24:52 +02:00

bitmessageui.ui

Merge branch 'master' of https://github.com/Bitmessage/PyBitmessage into namecoin-id

2013-07-27 08:24:52 +02:00

connect.py

Further work to implement the Connect dialog on startup

2013-07-24 12:43:51 -04:00

connect.ui

Further work to implement the Connect dialog on startup

2013-07-24 12:43:51 -04:00

help.py

Moved UI related files all into the bitmessageqt folder

2013-06-18 13:59:51 -04:00

help.ui

Moved UI related files all into the bitmessageqt folder

2013-06-18 13:59:51 -04:00

iconglossary.py

Moved UI related files all into the bitmessageqt folder

2013-06-18 13:59:51 -04:00

iconglossary.ui

Moved UI related files all into the bitmessageqt folder

2013-06-18 13:59:51 -04:00

newaddressdialog.py

Moved UI related files all into the bitmessageqt folder

2013-06-18 13:59:51 -04:00

newaddressdialog.ui

Moved UI related files all into the bitmessageqt folder

2013-06-18 13:59:51 -04:00

newchandialog.py

Completed chan integration in the GUI

2013-07-22 01:10:22 -04:00

newchandialog.ui

Completed chan integration in the GUI

2013-07-22 01:10:22 -04:00

newsubscriptiondialog.py

Moved UI related files all into the bitmessageqt folder

2013-06-18 13:59:51 -04:00

newsubscriptiondialog.ui

Moved UI related files all into the bitmessageqt folder

2013-06-18 13:59:51 -04:00

regenerateaddresses.py

Moved UI related files all into the bitmessageqt folder

2013-06-18 13:59:51 -04:00

regenerateaddresses.ui

Moved UI related files all into the bitmessageqt folder

2013-06-18 13:59:51 -04:00

settings.py

Merge branch 'master' of https://github.com/Bitmessage/PyBitmessage into namecoin-id

2013-07-17 18:15:45 +02:00

settings.ui

Merge branch 'master' of https://github.com/Bitmessage/PyBitmessage into namecoin-id

2013-07-17 18:15:45 +02:00

specialaddressbehavior.py

Moved UI related files all into the bitmessageqt folder

2013-06-18 13:59:51 -04:00

specialaddressbehavior.ui

Moved UI related files all into the bitmessageqt folder

2013-06-18 13:59:51 -04:00

wanlan.ui

Moved UI related files all into the bitmessageqt folder

2013-06-18 13:59:51 -04:00