Hi Javier: As discussed at a Daily Scrum last week, in order to turn the next branch into master after Invenio 1.1 is out, we have to decide what to do with the synchronisation of jQuery and BibEdit changes in master versus next.
1) jQuery next's jQuery version is 1.5; all the dependencies were put to live in the dedicated /js/jquery/ name space; however, some dependencies (like flot) were left out and need to be completed. master's jQuery version is 1.7, uses the usual /js/ name space, and the list of dependencies is complete. The dotted name space like `jquery.hotkeys.js' seems sufficient to me to single out jQuery dependencies, so I would propose to simply kill next's changes related to jQuery and to replace them fully with master's version, amending the paths and whatnot back to what is used in master. OK with you? If so, we could take care of this here. 2) BibEdit Piotr started re-factoring BibEdit in the next branch many moons ago, including holding pen updates, JS clean up, CSS split up, bibedit cache, and stuff. (See also <http://invenio-software.org/ticket/792>.) Meanwhile, you have introduced many new BibEdit features into master. In order to sync the two versions, dunno how many of Piotr's changes would you like to keep and in what form? Shall we take master's version of BibEdit and put it onto next as part of the jQuery update, overriding next's changes, meaning that you would then have to re-apply some parts from Piotr's work in the future? Or shall we test-merge master's BibEdit onto next's BibEdit, solving any jQuery and other related mega conflicts on the go, as we usually did in the past? Please advise what would you prefer. Here is the list of Piotr's changes in next that may have to be applied on top of master-copied-to-next: $ git log master..next --format=oneline --author=Piotr -- modules/bibedit abdbc6bf33a BibEdit: fix apply all HP changes 4365321dc71 BibEdit: clean JavaScript code 877c7a2853e BibEdit: extract css into a separate file 3d67a78cbef BibEdit: upgrade to jQuery 1.5 Alternatively, here are commits from master to be merged onto next (not counting jQuery related commits): $ git log next..master --format=oneline -- modules/bibedit 02b4b71dc83 Merge branch 'maint-1.0' 4a770d280ca textmarc2xmlmarc: fix handling of BOM ae4af9e8b4d xmlmarclint: 'no valid record detected' error cce9319b168 BibRecord: fix for record_get_field_instances() 0503eaec370 BibEdit: fix undefined dictionary key d84a34f3871 BibEdit: fix crash in Ajax request 862e1a639b9 bibrecord: graceful import of 4suite 3bf892d1e23 BibEdit: use WebDriverWait to wait for JS refresh 7e758a363e1 BibEdit: adapt web tests to the new framework Please tell me which way would you prefer to go. Best regards -- Tibor Simko
