| Thu, 10 Mar 2011 15:33:02 +0000 |
Chris Cannam |
* Trivial change, just checkpointing
filelist_right_button_menu
|
| Wed, 02 Mar 2011 16:29:17 +0000 |
Chris Cannam |
Remove message about updating to bring changes into the working copy: it isn't always true (e.g. if you have to do a merge next)
|
| Wed, 02 Mar 2011 16:28:03 +0000 |
Chris Cannam |
* We should have a 64-bit Python module now: no longer force to 32
|
| Wed, 02 Mar 2011 13:27:32 +0000 |
Chris Cannam |
Added tag easyhg_v0.4 for changeset 124a3ea9fafb
|
| Wed, 02 Mar 2011 13:25:49 +0000 |
Chris Cannam |
Add comment listing which menu functions are desired where
filelist_right_button_menu
|
| Wed, 02 Mar 2011 12:38:17 +0000 |
Chris Cannam |
Merge, and add a helpful warning when you try to push before committing your merge (I just did this and the ensuing warning was misleading)
easyhg_v0.4
|
| Wed, 02 Mar 2011 12:32:50 +0000 |
Chris Cannam |
Fix screwed-up translations caused by accidentally running Qt3 versions of translation tools
|
| Wed, 02 Mar 2011 12:29:45 +0000 |
Chris Cannam |
* Fix up framework paths regardless of their initial values
|
| Tue, 01 Mar 2011 16:50:06 +0000 |
Chris Cannam |
More Mac build material
|
| Tue, 01 Mar 2011 15:51:41 +0000 |
Chris Cannam |
Added tag easyhg_v0.4 for changeset 4b9656471303
|
| Tue, 01 Mar 2011 15:51:28 +0000 |
Chris Cannam |
Update version number to 0.4; another minor textual fix
|
| Tue, 01 Mar 2011 14:22:53 +0000 |
Chris Cannam |
Merge from branch "new-branches-with-status-outside-tabs"
|
| Tue, 01 Mar 2011 14:22:29 +0000 |
Chris Cannam |
Add Start New Branch and Cancel New Branch to uncommitted item menu; add branch name to Commit dialog
new-branches-with-status-outside-tabs
|
| Mon, 28 Feb 2011 17:35:55 +0000 |
Chris Cannam |
Minor textual fix
|
| Mon, 28 Feb 2011 14:31:57 +0000 |
Chris Cannam |
Make a further couple of dialogs use MoreInformationDialog
|
| Mon, 28 Feb 2011 14:24:14 +0000 |
Chris Cannam |
With status outside tabs, no need to switch to Work tab when new branch is introduced
new-branches-with-status-outside-tabs
|
| Mon, 28 Feb 2011 13:09:37 +0000 |
Chris Cannam |
Merge branch status_outside_tabs into branch new-branches, and make a new branch
new-branches-with-status-outside-tabs
|
| Sat, 26 Feb 2011 23:04:18 +0000 |
Chris Cannam |
Merge from the default branch
status_outside_tabs
|
| Sat, 26 Feb 2011 23:04:05 +0000 |
Chris Cannam |
Avoid exception when incremental log is called for in a situation where the heads have not actually been determined yet -- we could end up adding all existing history as an incremental update and getting a duplicate changeset error
|
| Tue, 22 Feb 2011 15:57:09 +0000 |
Chris Cannam |
Merge from the default branch
status_outside_tabs
|
| Tue, 22 Feb 2011 15:55:13 +0000 |
Chris Cannam |
And another tweak to pull-successful dialog.
|
| Tue, 22 Feb 2011 15:53:49 +0000 |
Chris Cannam |
Another tweak to merge-successful dialog texts
|
| Tue, 22 Feb 2011 15:52:22 +0000 |
Chris Cannam |
Merge from the default branch
status_outside_tabs
|
| Tue, 22 Feb 2011 15:51:47 +0000 |
Chris Cannam |
Minor layout & text changes
|
| Tue, 22 Feb 2011 15:32:00 +0000 |
Chris Cannam |
Font adjustment for pull/push confirm dialogs. Better, though the extra text will still be too small on OS/X
|
| Tue, 22 Feb 2011 15:12:56 +0000 |
Chris Cannam |
* Make "More Details" button non-auto-default in more-info dialog
|
| Tue, 22 Feb 2011 13:12:16 +0000 |
Chris Cannam |
Minor layout updates
status_outside_tabs
|
| Tue, 22 Feb 2011 13:03:03 +0000 |
Chris Cannam |
Merge from the default branch
status_outside_tabs
|
| Mon, 21 Feb 2011 19:22:29 +0000 |
Chris Cannam |
Small fix to clone successful dialog wording
|
| Mon, 21 Feb 2011 18:20:29 +0000 |
Chris Cannam |
Fix some breakages from prior merge commit (oops); make merge result use more-information dialog
|
| Mon, 21 Feb 2011 18:17:18 +0000 |
Chris Cannam |
Merge from branch "more_information_dialog"
|
| Mon, 21 Feb 2011 18:16:15 +0000 |
Chris Cannam |
Return success if the external diff/merge _is_ found, not if it isn't!
|
| Mon, 21 Feb 2011 15:55:39 +0000 |
Chris Cannam |
Make several operations use the new more-information dialog
more_information_dialog
|
| Mon, 21 Feb 2011 14:23:02 +0000 |
Chris Cannam |
Make our own message box with a more useful "more information" section than the Qt one
more_information_dialog
|
| Mon, 21 Feb 2011 12:15:04 +0000 |
Chris Cannam |
We can provide a better interface for most common cases by essentially showing a formatted log for the summary rather than a diff only
|
| Mon, 21 Feb 2011 11:37:58 +0000 |
Chris Cannam |
Add "Summarise changes" options to changeset item right-button menu (already existed for uncommitted item)
|
| Mon, 21 Feb 2011 11:07:21 +0000 |
Chris Cannam |
Move work-folder state area outside tabs widget
status_outside_tabs
|
| Mon, 21 Feb 2011 09:13:33 +0000 |
Chris Cannam |
Merge from branch "mainwindow_member_tidy"
status_outside_tabs
|
| Mon, 21 Feb 2011 09:13:22 +0000 |
Chris Cannam |
Merge from branch "mainwindow_member_tidy"
|
| Mon, 21 Feb 2011 09:08:55 +0000 |
Chris Cannam |
Make MainWindow members private and m_prefixed
mainwindow_member_tidy
|
| Mon, 21 Feb 2011 08:48:31 +0000 |
Chris Cannam |
Separate out work-status code from the file status widget
status_outside_tabs
|
| Fri, 18 Feb 2011 13:39:16 +0000 |
Chris Cannam |
Merge
|
| Fri, 18 Feb 2011 13:38:31 +0000 |
Chris Cannam |
* Change "diff to parent <id>" menu entries in changeset item right-button menu to "diff to left parent" and "diff to right parent"
|
| Thu, 17 Feb 2011 12:10:09 +0000 |
Chris Cannam |
* Avoid reporting failure when hg incoming shows a warning (as is the case when site cert could not be verified)
|
| Thu, 10 Feb 2011 18:49:47 +0000 |
Chris Cannam |
Merge
|
| Wed, 09 Feb 2011 12:03:15 +0000 |
Chris Cannam |
Add "Start new branch" function. I'm not quite satisfied with the location of this one
new-branches
|
| Wed, 09 Feb 2011 12:02:53 +0000 |
Chris Cannam |
Remove no-longer-used icon files
|
| Tue, 01 Feb 2011 12:40:40 +0000 |
Chris Cannam |
Added tag easyhg_v0.3.2 for changeset cc95394e2392
|
| Mon, 31 Jan 2011 17:23:10 +0000 |
Chris Cannam |
* Some work on separating out the "more information" component from dialog messages. Will need work on layouts
more_information_dialog
|
| Thu, 10 Feb 2011 18:49:01 +0000 |
Chris Cannam |
* Use kdiff3 from path if present; return sensible return code
|
| Tue, 25 Jan 2011 16:41:40 +0000 |
Chris Cannam |
* Add warning dialog for "restore default settings"; add option for dates or ages in history list
easyhg_v0.3.2
|
| Tue, 25 Jan 2011 16:12:23 +0000 |
Chris Cannam |
* Add easyhg-merge.bat and use it. (This isn't necessary if hg has been properly configured, as the Tortoise distribution has)
|
| Thu, 20 Jan 2011 13:56:01 +0000 |
Chris Cannam |
* Bump version to 0.3.2
|
| Thu, 20 Jan 2011 13:55:33 +0000 |
Chris Cannam |
* Update deployment so as to adjust kdiff3 if bundled as well
|
| Thu, 20 Jan 2011 13:37:00 +0000 |
Chris Cannam |
* Rename the -osx.sh files to plain .sh, since we could use them elsewhere too. Rely on bundled kdiff3 if it exists.
|
| Mon, 17 Jan 2011 11:44:17 +0000 |
Chris Cannam |
* Revert the grapher change from revision ec2baee80833 on Dec 19th 2010. The change definitely performed worse than the original (now reinstated) logic in the real-world soundsoftware-site case, with far more connection overlaps and ambiguous placements.
|
| Wed, 12 Jan 2011 16:38:13 +0000 |
Chris Cannam |
* Correct version number
|
| Wed, 12 Jan 2011 16:31:28 +0000 |
Chris Cannam |
Merge
|
| Wed, 12 Jan 2011 16:30:46 +0000 |
Chris Cannam |
* Add InstallJammer definition file, update hgignore so as not to ignore it!
|
| Wed, 12 Jan 2011 16:14:43 +0000 |
Chris Cannam |
* Fix typo. Uh
|
