Jonathan Warren a49ab786bb resolve merge conflict

2014-04-30 18:48:00 -04:00

..

__init__.py

resolve merge conflict

2014-04-30 18:48:00 -04:00

about.py

changed 2013 to 2014 in copyright notices

2014-01-21 22:41:48 -05:00

about.ui

changed 2013 to 2014 in copyright notices

2014-01-21 22:41:48 -05:00

addaddressdialog.py

added option to show recent broadcasts when subscribing

2013-11-30 23:15:18 -05:00

addaddressdialog.ui

added option to show recent broadcasts when subscribing

2013-11-30 23:15:18 -05:00

addpeer.ui

Moved UI related files all into the bitmessageqt folder

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

bitmessage_icons_rc.py

- GUI settings done

2013-09-21 14:31:47 +02:00

bitmessage_icons.qrc

nonfunctional identicon settings-GUI

2013-09-18 17:39:45 +02:00

bitmessageui.py

revert main window to previous size

2013-11-02 18:01:36 -04:00

bitmessageui.ui

revert main window to previous size

2013-11-02 18:01:36 -04: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

more v4 address work. Should be done.

2013-09-18 00:04:01 -04:00

newaddressdialog.ui

more v4 address work. Should be done.

2013-09-18 00:04:01 -04:00

newchandialog.py

Added option in settings menu to allow sending to mobile

2013-08-08 15:37:48 -04:00

newchandialog.ui

Added option in settings menu to allow sending to mobile

2013-08-08 15:37:48 -04:00

newsubscriptiondialog.py

added option to show recent broadcasts when subscribing

2013-11-30 23:15:18 -05:00

newsubscriptiondialog.ui

added option to show recent broadcasts when subscribing

2013-11-30 23:15:18 -05:00

regenerateaddresses.py

more v4 address work. Should be done.

2013-09-18 00:04:01 -04:00

regenerateaddresses.ui

more v4 address work. Should be done.

2013-09-18 00:04:01 -04:00

settings.py

resolve merge conflict

2014-04-30 18:48:00 -04:00

settings.ui

resolve merge conflict

2014-04-30 18:48:00 -04: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