Hi all, Yesterday Greg and I sat down and tried to make sense of the remaining 1.2.x conflicts. We got them into a state where they pass unit and harness tests, so I committed them to trunk this morning (11140).
There were conflicts I could not resolve! Specifically, in the following files SolrRequester.java (unsure if I should just use the trunk version, it seemed like anonymous access was now gone?) modules/matterhorn-admin-ui/src/main/resources/ui/js/oc.scheduler.js modules/matterhorn-admin-ui/src/main/resources/ui/js/oc.series.list.js modules/matterhorn-admin-ui/src/main/resources/ui/css/admin.css Any volunteers to take these on? Otherwise I will consider them 1.2.x changes only, no more attempts by me to merge them across. Chris -- Christopher Brooks, BSc, MSc ARIES Laboratory, University of Saskatchewan Web: http://www.cs.usask.ca/~cab938 Phone: 1.306.966.1442 Mail: Advanced Research in Intelligent Educational Systems Laboratory Department of Computer Science University of Saskatchewan 176 Thorvaldson Building 110 Science Place Saskatoon, SK S7N 5C9 _______________________________________________ Matterhorn mailing list [email protected] http://lists.opencastproject.org/mailman/listinfo/matterhorn To unsubscribe please email [email protected] _______________________________________________
