Skip to content

Commit

Permalink
Merge branch '2.8'
Browse files Browse the repository at this point in the history
  • Loading branch information
thorsten committed Jun 23, 2013
2 parents b2ac692 + 2d6d681 commit fd6478a
Show file tree
Hide file tree
Showing 5 changed files with 93 additions and 2,708 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG
Expand Up @@ -14,6 +14,8 @@ Version 2.9.0-dev - 2013-
- dropped support for ext/mysql (Thorsten)

Version 2.8.1 - 2013-06-
- added support for Grunt (Thorsten)
- added minified JavaScript code (Thorsten)
- improved usability for group administration (Thorsten)
- fixed broken updates for MS SQL and SQLite (Thorsten)
- fixed IE8 related JavaScript issues (Thorsten)
Expand Down
86 changes: 86 additions & 0 deletions Gruntfile.js
@@ -0,0 +1,86 @@
/*global module:false*/
module.exports = function(grunt) {

// Project configuration.
grunt.initConfig({
// Metadata.
meta: {
version: '2.8.1'
},
banner: '/*! phpMyFAQ - v2.8.1 - ' +
'* http://www.phpmyfaq.de/\n' +
'* Copyright (c) 2001 - 2013 Thorsten Rinne and phpMyFAQ Team' +
'Licensed MPL 2.0 */\n',
// Task configuration.
bower: {
install: {
// just run 'grunt bower:install' and you'll see files from your Bower packages in lib directory
}
},
concat: {
options: {
banner: '<%= banner %>',
stripBanners: true
},
dist: {
src: ['vendor/twitter/bootstrap/js/*.js', 'phpmyfaq/assets/js/autosave.js', 'phpmyfaq/assets/js/functions.js'],
dest: 'phpmyfaq/assets/js/phpmyfaq.js'
}
},
uglify: {
options: {
banner: '<%= banner %>'
},
dist: {
src: '<%= concat.dist.dest %>',
dest: 'phpmyfaq/assets/js/phpmyfaq.js'
}
},
jshint: {
options: {
curly: true,
eqeqeq: true,
immed: true,
latedef: true,
newcap: true,
noarg: true,
sub: true,
undef: true,
unused: true,
boss: true,
eqnull: true,
browser: true,
globals: {}
},
gruntfile: {
src: 'Gruntfile.js'
}
},
watch: {
gruntfile: {
files: '<%= jshint.gruntfile.src %>',
tasks: ['jshint:gruntfile']
},
lib_test: {
files: '<%= jshint.lib_test.src %>',
tasks: ['jshint:lib_test', 'qunit']
}
}
});

// These plugins provide necessary tasks.
grunt.loadNpmTasks('grunt-bower-task');
grunt.loadNpmTasks('grunt-contrib-concat');
grunt.loadNpmTasks('grunt-contrib-uglify');
grunt.loadNpmTasks('grunt-contrib-jshint');
grunt.loadNpmTasks('grunt-contrib-watch');
grunt.loadNpmTasks('grunt-contrib-less');
grunt.loadNpmTasks('grunt-contrib-cssmin');
grunt.loadNpmTasks('grunt-contrib-copy');
grunt.loadNpmTasks('grunt-contrib-clean');
grunt.loadNpmTasks('grunt-contrib-csslint');

// Default task.
grunt.registerTask('default', ['jshint', 'concat', 'uglify']);

};
1 change: 1 addition & 0 deletions README.md
Expand Up @@ -36,6 +36,7 @@ unzip the package and open http://www.example.org/phpmyfaq/setup/index.php in yo
$ cd phpMyFAQ
$ curl -s https://getcomposer.org/installer | php
$ php composer.phar install
$ npm install

Then just open http://www.example.org/phpmyfaq/setup/index.php in your browser.

Expand Down
19 changes: 0 additions & 19 deletions build.xml
Expand Up @@ -11,25 +11,6 @@
<mkdir dir="${basedir}/build/pdepend"/>
</target>

<target name="mergejs" description="Merges all JavaScript files into one file">
<concat destfile="${basedir}/phpmyfaq/assets/js/phpmyfaq.js" force="yes">
<filelist dir="${basedir}/vendor/twitter/bootstrap/js" files="bootstrap-transition.js" />
<filelist dir="${basedir}/vendor/twitter/bootstrap/js" files="bootstrap-alert.js" />
<filelist dir="${basedir}/vendor/twitter/bootstrap/js" files="bootstrap-button.js" />
<filelist dir="${basedir}/vendor/twitter/bootstrap/js" files="bootstrap-carousel.js" />
<filelist dir="${basedir}/vendor/twitter/bootstrap/js" files="bootstrap-collapse.js" />
<filelist dir="${basedir}/vendor/twitter/bootstrap/js" files="bootstrap-dropdown.js" />
<filelist dir="${basedir}/vendor/twitter/bootstrap/js" files="bootstrap-modal.js" />
<filelist dir="${basedir}/vendor/twitter/bootstrap/js" files="bootstrap-tooltip.js" />
<filelist dir="${basedir}/vendor/twitter/bootstrap/js" files="bootstrap-popover.js" />
<filelist dir="${basedir}/vendor/twitter/bootstrap/js" files="bootstrap-scrollspy.js" />
<filelist dir="${basedir}/vendor/twitter/bootstrap/js" files="bootstrap-tab.js" />
<filelist dir="${basedir}/vendor/twitter/bootstrap/js" files="bootstrap-typeahead.js" />
<filelist dir="${basedir}/phpmyfaq/assets/js" files="autosave.js" />
<filelist dir="${basedir}/phpmyfaq/assets/js" files="functions.js" />
</concat>
</target>

<target name="phpunit" description="Run unit tests and generate junit.xml and clover.xml">
<exec executable="phpunit" failonerror="true">
<arg line="--configuration phpunit.xml --coverage-text" />
Expand Down

0 comments on commit fd6478a

Please sign in to comment.