Commit Graph

12 Commits

Author SHA1 Message Date
kostas
fab3c0bf42 Ported new features to QT4
FossilOrigin-Name: 28087b899e38a3881855cf1e7272da3fb13b3462
2015-05-29 20:23:48 +00:00
kostas
8c020c7502 Fixed incorrect remote search key
FossilOrigin-Name: 1f10dd85e5d7e95539baaea140623673b19f12f2
2015-05-29 19:11:10 +00:00
kostas
422bbafdf6 Fixed workspace remote storage
Added Delete Remote action
Double-cliking a remote triggers a remote editing


FossilOrigin-Name: 6c042af93ec30f09386497c176b9c0736ac47690
2015-05-29 18:45:44 +00:00
kostas
06695db9fe Initial work on multiple remotes
FossilOrigin-Name: 9674708cb5f2e8543e01d64211b6768d2cb726d6
2015-05-28 19:29:09 +00:00
kostas
894f980a7c Commits are now allowed when a merge integration has occured even when no files are modified
Support for forced merges
Context menus are offset by a pixel to prevent unintended clicks


FossilOrigin-Name: b0f81bc9c4d226d8406f65d9ad02099205d7e067
2015-05-03 12:27:11 +00:00
kostas
cdba8c05f6 Added merge support
FossilOrigin-Name: ac65fbf8d33a9e64fb97bd8652a43b4d11c8e538
2015-05-03 11:44:04 +00:00
kostas
9777e1e2da Support for deleting tags
When parsing tags, also keep track of the checkin uuid
Fixed key-value parsing
Prevent apply stash when nothing is selected

FossilOrigin-Name: 72ac541c4c28f83c94c371f2d81e116b8f3cf261
2015-05-03 10:05:46 +00:00
kostas
729caef32e Added tag and branch list to workspace view
FossilOrigin-Name: 304f9bd6c61babe7abc522c1a1301fe3f1887505
2015-05-02 12:44:09 +00:00
kostas
2bf3de6c2b Initial work on new workspace view
FossilOrigin-Name: 64386745ebf2d2fa921a51383bd76241947b879c
2015-05-01 19:04:02 +00:00
kostas
b796cde81b Merged refactor
Added missing status UPDATED_BY_MERGE 
Fixed parsing of file status

FossilOrigin-Name: f82fab41453e6ccf28c60e89ce567635ffab25a3
2015-04-30 17:43:40 +00:00
kostas
dbfc4f10da Moved UICallback and ScopedCallback to Utils
FossilOrigin-Name: 717fb7a390f81af33ad40913960a30ff9c1c7a75
2015-04-30 11:43:31 +00:00
kostas
9dff9370ce Added missing Workspace.cpp/h
FossilOrigin-Name: 2e7553cddf1db1c9e22e883276829a8032dc9afb
2015-04-30 11:37:04 +00:00