Fri, 15 Nov 2013 15:54:17 +0100Closing branch to prepare for merge. knockout-templates
Petr Hejl <phejl@netbeans.org> [Fri, 15 Nov 2013 15:54:17 +0100] rev 276183
Closing branch to prepare for merge.

Fri, 15 Nov 2013 14:04:11 +0100Added missing file. knockout-templates
Petr Hejl <phejl@netbeans.org> [Fri, 15 Nov 2013 14:04:11 +0100] rev 276182
Added missing file.

Fri, 15 Nov 2013 13:50:15 +0100Added completion test. knockout-templates
Petr Hejl <phejl@netbeans.org> [Fri, 15 Nov 2013 13:50:15 +0100] rev 276181
Added completion test.

Fri, 15 Nov 2013 13:16:00 +0100Fixing AIOBE. knockout-templates
Petr Hejl <phejl@netbeans.org> [Fri, 15 Nov 2013 13:16:00 +0100] rev 276180
Fixing AIOBE.

Fri, 15 Nov 2013 13:02:17 +0100Try to get template data with lexer. knockout-templates
Petr Hejl <phejl@netbeans.org> [Fri, 15 Nov 2013 13:02:17 +0100] rev 276179
Try to get template data with lexer.

Fri, 15 Nov 2013 14:14:39 +0400Automated merge with http://hg.netbeans.org/web-main
Sergey B. Petrov <sj-nb@netbeans.org> [Fri, 15 Nov 2013 14:14:39 +0400] rev 276178
Automated merge with http://hg.netbeans.org/web-main

Fri, 15 Nov 2013 14:10:28 +0400#199040 decide to enable for 8.0
Sergey B. Petrov <sj-nb@netbeans.org> [Fri, 15 Nov 2013 14:10:28 +0400] rev 276177
#199040 decide to enable for 8.0

Fri, 15 Nov 2013 14:09:38 +0400#199040 almost done, but need to verify how jpql named qeury should work in this case (checkbox isn't visible yet)
Sergey B. Petrov <sj-nb@netbeans.org> [Fri, 15 Nov 2013 14:09:38 +0400] rev 276176
#199040 almost done, but need to verify how jpql named qeury should work in this case (checkbox isn't visible yet)
include cleaup of before jpa related code

Fri, 15 Nov 2013 10:41:53 +0100synched w/ trunk knockout-templates
Petr Hejl <phejl@netbeans.org> [Fri, 15 Nov 2013 10:41:53 +0100] rev 276175
synched w/ trunk

Fri, 15 Nov 2013 10:35:38 +0100Automated merge with https://hg.netbeans.org/web-main
Jan Becicka <jbecicka@netbeans.org> [Fri, 15 Nov 2013 10:35:38 +0100] rev 276174
Automated merge with https://hg.netbeans.org/web-main