diff -r 03e8815a012d -r 18b9be54174d client/gruntfile.js --- a/client/gruntfile.js Fri May 22 17:50:10 2015 +0200 +++ b/client/gruntfile.js Tue Jun 02 16:42:02 2015 +0200 @@ -7,6 +7,7 @@ var renkan_src = [ 'dist/js/templates.js', 'js/main.js', + 'js/dataloader.js', 'js/models.js', 'js/defaults.js', 'js/i18n.js', @@ -114,8 +115,10 @@ }, renkan_server: { files: [ - {expand: true, cwd: 'dist', src: ['**', '!data/*', '!lib/**'], dest: '../server/python/django/renkanmanager/static/renkanmanager/lib/renkan/', filter: 'isFile'}, - {expand: true, cwd: 'dist/lib', src: ['**'], dest: '../server/python/django/renkanmanager/static/renkanmanager/lib/', filter: 'isFile'} + {expand: true, cwd: 'dist', src: ['**', '!data/*', '!lib/**'], dest: '../server/python/django/renkanmanager/static/renkanmanager/lib/renkan/', filter: 'isFile'}, + {expand: true, cwd: 'dist/lib', src: ['**'], dest: '../server/python/django/renkanmanager/static/renkanmanager/lib/', filter: 'isFile'}, + {expand: true, cwd: 'dist', src: ['**', '!data/*', '!lib/**'], dest: '../server/php/basic/public_html/static/lib/renkan/', filter: 'isFile'}, + {expand: true, cwd: 'dist/lib', src: ['**'], dest: '../server/php/basic/public_html/static/lib/', filter: 'isFile'} ] } }, @@ -147,7 +150,7 @@ watch: { css:{ files: ['css/**/*.css'], - tasks: ['cssmin', 'copy:renkan_css'], + tasks: ['cssmin', 'copy:renkan_css'], }, js:{ files: ['js/**/*.js', 'templates/**/*.html'],