grunt updates, and since @@Version

tripflex · Nov 30, 2014 · e80b77d · e80b77d
1 parent 30daf93
commit e80b77d
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 33 deletions.
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -105,23 +105,17 @@ module.exports = function ( grunt ) {
 							}
 						}
 					},
-					files: {
-						'<%= min.js %>/vendor.min.js': [ '<%= concat.vendorjs.dest %>' ]
-					}
-				},
-				core: {
-					options: {
-						preserveComments: 'none',
-						compress: {
-							drop_console: true,
-							global_defs: {
-								"DEBUG": false
-							}
+					files: [
+						{
+							expand: true,
+							flatten: true,
+							cwd: '<%= build.js %>',
+							src: '**/*.js',
+							dest: '<%= min.js %>',
+							ext: '.min.js',
+							extDot: 'first'
 						}
-					},
-					files: {
-						'<%= min.js %>/<%= pkg.acronym %>.min.js': [ '<%= concat.corejs.dest %>' ]
-					}
+					]
 				}
 			},
 
@@ -233,6 +227,9 @@ module.exports = function ( grunt ) {
 			clean: {
 				deploy: {
 					src: [ '<%= build.dir %>/' ]
+				},
+				dist: {
+					src: [ 'dist/*' ]
 				}
 			},
 
@@ -283,7 +280,14 @@ module.exports = function ( grunt ) {
 						{
 							expand: true,
 							flatten: false,
-							src: [ '*.php', '**/*.php', '!node_modules/**/*.php', '!dist/**/*.php' ]
+							src: [
+								'!node_modules/**/*.php',
+								'!dist/**/*.php',
+								'!.git/**/*.php',
+								'!.tx/**/*.php',
+								'*.php',
+								'**/*.php'
+							]
 						}
 					]
 				}
@@ -317,15 +321,16 @@ module.exports = function ( grunt ) {
 	grunt.registerTask( 'css', [ 'less:core', 'concat:corecss', 'autoprefixer', 'cssmin:core', 'concat:vendorcss', 'cssmin:vendor' ] );
 	grunt.registerTask( 'vendor', [ 'concat:vendorcss', 'concat:vendorjs', 'autoprefixer', 'cssmin:vendor', 'uglify:vendor' ] );
 	grunt.registerTask( 'core', [ 'less:core', 'concat:corecss', 'autoprefixer', 'concat:corejs', 'cssmin:core', 'uglify:core' ] );
+	grunt.registerTask( 'since', [ 'replace:since' ] );
 
 	grunt.registerTask(
 		'deploy', [
+			'clean:dist',
 			'less',
 			'concat',
 			'autoprefixer',
 			'cssmin',
 			'uglify',
-			'clean:deploy',
 			'copy:deploy',
 			'replace:deploy',
 			'addtextdomain',

diff --git a/classes/rewrite.php b/classes/rewrite.php
@@ -26,7 +26,7 @@ function __construct() {
 	 * hard-coded wp-login.php urls.  We use a filter on wp_redirect to redirect
 	 * to a rewrite/permalink if enabled.
 	 *
-	 * @since @@version
+	 * @since 1.0.0
 	 *
 	 * @param $location
 	 * @param $status
@@ -51,7 +51,7 @@ function site_url_redirect( $location, $status ){
 	 * our activate password URL.
 	 *
 	 *
-	 * @since @@version
+	 * @since 1.0.0
 	 *
 	 */
 	function activate_password(){
@@ -75,7 +75,7 @@ function activate_password(){
 	 * Redirect to standard wp-login.php with reset pass details
 	 *
 	 *
-	 * @since @@version
+	 * @since 1.0.0
 	 *
 	 */
 	function activate_rewrite(){
@@ -99,7 +99,7 @@ function activate_cookie(){
 	/**
 	 * Filter the site URL.
 	 *
-	 * @since @@version
+	 * @since 1.0.0
 	 *
 	 * @param string      $url     The complete site URL including scheme and path.
 	 * @param string      $path    Path relative to the site URL. Blank string if no path is specified.
@@ -154,7 +154,7 @@ function site_url( $url, $path, $scheme, $blog_id ){
 	 *
 	 *
 	 *
-	 * @since @@version
+	 * @since 1.0.0
 	 *
 	 * @param $url
 	 * @param $redirect
@@ -171,7 +171,7 @@ function login_url( $url, $redirect ){
 	 *
 	 *
 	 *
-	 * @since @@version
+	 * @since 1.0.0
 	 *
 	 * @param $url
 	 * @param $redirect
@@ -188,7 +188,7 @@ function lostpassword_url( $url, $redirect ){
 	 *
 	 *
 	 *
-	 * @since @@version
+	 * @since 1.0.0
 	 *
 	 * @param $url
 	 *
@@ -203,7 +203,7 @@ function register_url( $url ){
 	 *
 	 *
 	 *
-	 * @since @@version
+	 * @since 1.0.0
 	 *
 	 * @param      $name
 	 * @param null $original_url
@@ -229,7 +229,7 @@ function get_url( $name, $original_url = null, $extra_rewrite = null ){
 	 *
 	 *
 	 *
-	 * @since @@version
+	 * @since 1.0.0
 	 *
 	 */
 	function check_for_updates(){
@@ -248,7 +248,7 @@ function check_for_updates(){
 	 *
 	 *
 	 *
-	 * @since @@version
+	 * @since 1.0.0
 	 *
 	 * @param $prevent
 	 */
@@ -262,7 +262,7 @@ static function prevent_rewrite( $prevent ){
 	 *
 	 *
 	 *
-	 * @since @@version
+	 * @since 1.0.0
 	 *
 	 * @param $option
 	 *
@@ -279,7 +279,7 @@ function filter_rewrite_options( $option ){
 	 *
 	 *
 	 *
-	 * @since @@version
+	 * @since 1.0.0
 	 *
 	 * @param null $options
 	 *

diff --git a/pluggables/wp-new-user-notification.php b/pluggables/wp-new-user-notification.php
@@ -32,7 +32,7 @@ function wp_new_user_notification( $user_id, $plaintext_pass = '' ) {
 		/**
 		 * Fires when a activation key is generated.
 		 *
-		 * @since @@version
+		 * @since 1.0.0
 		 *
 		 * @param string $user_login The username for the user.
 		 * @param string $key        The generated password reset key.

diff --git a/wp-login-flow.php b/wp-login-flow.php
@@ -86,7 +86,7 @@ public static function admin_notices() {
 		if ( WP_LOGIN_FLOW_VERSION != get_option( 'WP_LOGIN_FLOW_VERSION' ) ) {
 			update_option( 'WP_LOGIN_FLOW_VERSION', WP_LOGIN_FLOW_VERSION );
 			$html = '<div class="updated"><p>';
-			$html .= __( 'You are now requiring users to activate their email when registering.' );
+			$html .= __( 'WP Login Flow is now activated, you can find <strong>Login Flow</strong> under the <strong>Users</strong> menu.<br />Dont forget to check/enable <strong>Anyone can register</strong> under <strong>Settings > General</strong>' );
 			$html .= '</p></div>';
 
 			echo $html;
@@ -109,7 +109,7 @@ public static function admin_notices() {
 	/**
 	 * Load Plugin Translations from Languages Directory
 	 *
-	 * @since @@version
+	 * @since 1.0.0
 	 *
 	 */
 	function load_translations() {