Merge lp:~pyroom-dev/pyroom/ExperimentalTrunk into lp:pyroom

Proposed by Adam Rooke
Status: Merged
Merge reported by: Adam Rooke
Merged at revision: 63
Proposed branch: lp:~pyroom-dev/pyroom/ExperimentalTrunk
Merge into: lp:pyroom
To merge this branch: bzr merge lp:~pyroom-dev/pyroom/ExperimentalTrunk
To post a comment you must log in.
45. By Adam Rooke <adam@adam-laptop>

Merging

46. By Adam Rooke <adam@adam-laptop>

Merged with Markino's autosave branch

47. By Peter Frost <pete@voyager>

Pass verbose from basic_edit to restore_session

48. By Peter Frost <pete@voyager>

Added traceback module and FILE_UNNAMED constant to top of restore_session

49. By Peter Frost <pete@voyager>

Fixed a scope issue and typo relating to tim(e)out_id in autosave

50. By qoiwejqioejqio

Merged with preferences-ui latest version.

51. By qoiwejqioejqio

Fixed a few stupid bugs, nevermind.

52. By Adam Rooke <adam@adam-laptop>

Removed restore session. Will be implemented at a later point in time

53. By Adam Rooke <adam@adam-laptop>

Fix to the "Two buffers open on start-up bug"

54. By Adam Rooke <adam@adam-laptop>

bad upload - broke it quite badly...fixed by un commenting a line of
code commented for de bugging us.

55. By Peter Frost <pete@voyager>

Added a new exception class and firmed-up error handling. Added GUI element for error reporting.

56. By Peter Frost <pete@voyager>

Erm, woops! Bzr merge flags left in files. Fixed.

57. By Peter Frost <pete@voyager>

Stopped using close_buffer in pyroom.py (was causing an error). Also, set buffer correctly when opening files
on startup.

58. By Peter Frost <pete@voyager>

Fixed regression in pyroom.py (verbose being initialised to True)

59. By Peter Frost <pete@voyager>

Fixed error when opening file (gtk key assignments don't seem to like polymorphic functions)

60. By markino <markino@casseruola>

in Prefernce dialog is now possible display and modify the minutes interval between autosaves

61. By Adam Rooke <adam@adam-laptop>

Bug fix to a regression from pete's code: status bar now shows welcome
on start-up again.

62. By Adam Rooke <adam@adam-laptop>

Tidied up a few bits:
modified help to take into account loss of keyboard short-cuts
on switching to help status changes to inform the user how to exit help.
version is "0.2b"

63. By Adam Rooke <adam@adam-laptop>

Modified the "Check for save" glade so it looks a bit better

Subscribers

People subscribed via source and target branches

to all changes:
to status/vote changes: