Somehow, the GWT calltime page for individual resources got reverted back to JSF pages. Need to bring back the GWT calltime page.
(02:13:19 PM) mazz: here's the history that I think is relevent - all of this was last year (2012). On October 10, I committed the JSF-to-GWT conversion (commit 22f0140f). This introduces the calltime GWT stuff. (02:13:19 PM) mazz: On December 6, this merge commit happened (9091567) and the interesting thing is the commit message is "Failed merge on new as7 master merging in d3-charts2. fails to startup." (02:13:41 PM) mazz: so something went wrong with that merge commit. however, I don't see any "conflict" messages in the comment message (02:13:58 PM) mazz: but! if you compare ResourceDetailView between those two commits, you will see the line differences (02:14:15 PM) mazz: but I looked in gitk and those lines according to gitk weren't touched. (02:14:30 PM) mazz: something happened in the merge of the two parents that "wiped" my change without any record of it (02:15:01 PM) mazz: between my change, and your merge, only two other commits happened between them (02:15:33 PM) mazz: but the commits happened on another branch. its when that branch and my branch were merged into this third branch is when the change "went away" (02:16:44 PM) mazz: my commit: 22f0140fa571031807ea35da2f104431459f4e79 (02:16:44 PM) mazz: your commit on other branch: 257c9b234442a8ced5d28c397af948584951569e (02:16:44 PM) mazz: your 2nd commit on other branch: c2166dcb74ccd24b99615f9c94cd063c36441825 (02:16:44 PM) mazz: your merge (notice my change to the CallTime view is reverted): 9091567f602e4775caab936731650b740b39fbbe (02:16:54 PM) mazz: I don't know what happened (02:19:34 PM) mazz: in any event, I'm gonna put that line back in that re-introduces the GWT page (02:20:17 PM) mazz: I think that merge commit did it, even though there is no record of that line being changed. and it was only this file listed for that commit, so I don't think anything else was affected (to answer ccrouch's concern of anything else being missed)
git commit to master: 82a86c9
Bulk closing of old issues now that HRQ 4.9 is in front of the door. If you think the issue has not been solved, then please open a new bug and mention this one in the description.