{"head":"725ef88c4543cbc1dbbe6f2bb9d9e96cead2cc5c","size":9,"push_id":45481551,"shas":[["f2285953445230532561251a8c7b5f7efd0c79b6","8f9d749bf842bf47f4d7aea9890f24ba0e353187@dimagi.com","Merge branch 'master' into feat-dataview\n\nConflicts:\n\tjs/controller.js\n\tjs/ui.js","Anton de Winter"],["e87a2d88937bf1a3002c97274d564279941b12d5","8f9d749bf842bf47f4d7aea9890f24ba0e353187@dimagi.com","getting everything run post merge","Anton de Winter"],["db51e24a55285eb057d31d53c186486c14bc5c2b","8f9d749bf842bf47f4d7aea9890f24ba0e353187@dimagi.com","Merge succesful, added some streamlining functions w.r.t. getting a ref to the currently visible JS tree","Anton de Winter"],["e8bdc9a837418bb2c209222e7554b0cb7b3fc902","8f9d749bf842bf47f4d7aea9890f24ba0e353187@dimagi.com","Adding a data node question type. Can now succesfully add and remove these types (plus a","Anton de Winter"],["ca06ece8d6e53421982383385ff3da655930e6fc","8f9d749bf842bf47f4d7aea9890f24ba0e353187@dimagi.com","Forgot logging statements that should have been removed in prev commit\n\nSigned-off-by: Anton de Winter <adewinter@dimagi.com>","Anton de Winter"],["3a7228fe475937d7b5d33810eec998e89bede8cc","8f9d749bf842bf47f4d7aea9890f24ba0e353187@dimagi.com","Finished adding 'add data node' feature.  Bug in order that questions are shown in the question tree.  The whole thing is reversed (last question first at the moment)","Anton de Winter"],["49033e774582d9081aae5f685847e2d981209225","8f9d749bf842bf47f4d7aea9890f24ba0e353187@dimagi.com","Reverted behavior in util.js, where getRelativePosition returns \"first\" instead of \"into\" (caused form to load in reverse).   Also set properties for trigger to allow data type (previously not allowed).","Anton de Winter"],["4b74dffc0179137923d5797be2177948760674aa","8f9d749bf842bf47f4d7aea9890f24ba0e353187@dimagi.com","Turned on validation for forms (ajax style)\n\nSigned-off-by: Anton de Winter <adewinter@dimagi.com>","Anton de Winter"],["725ef88c4543cbc1dbbe6f2bb9d9e96cead2cc5c","8f9d749bf842bf47f4d7aea9890f24ba0e353187@dimagi.com","Merge branch 'feat-dataview'","Anton de Winter"]],"ref":"refs/heads/master"}