Changeset 2885 for sites/branches/application-tracking/wordcamp.org

Timestamp:

04/04/2016 11:03:55 AM (9 years ago)

Author:

kovshenin

Message:

Sync with trunk.

Location:

sites/branches/application-tracking/wordcamp.org

Files:

• . (modified) (1 prop)
• public_html/wp-content/plugins/wcpt/wcpt-wordcamp/wordcamp-new-site.php (modified) (1 diff)
• public_html/wp-content/plugins/wordcamp-payments (modified) (1 prop)
• public_html/wp-content/plugins/wordcamp-payments-network (modified) (1 prop)
• public_html/wp-content/plugins/wordcamp-payments-network/includes/wordcamp-budgets-dashboard.php (modified) (1 diff)
• public_html/wp-content/plugins/wordcamp-payments/css/wordcamp-budgets.css (modified) (1 diff)
• public_html/wp-content/plugins/wordcamp-payments/includes/wordcamp-budgets.php (modified) (1 diff)
• public_html/wp-content/plugins/wordcamp-payments/javascript/attached-files.js (modified) (1 diff)

sites/branches/application-tracking/wordcamp.org/public_html/wp-content/plugins/wcpt/wcpt-wordcamp/wordcamp-new-site.php

@@ -47 +47 @@
                     </label>
 
-                    <span class="description">(e.g., https://city.wordcamp.org/<?php echo esc_html( date( 'Y' ) ); ?>)</span>
+                    <span class="description">(e.g., https://<?php echo date('Y'); ?>.city.wordcamp.org)</span>
                 <?php endif; // domain_exists ?>
             <?php endif; // current_user_can ?>

sites/branches/application-tracking/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments-network/includes/wordcamp-budgets-dashboard.php

@@ -692 +692 @@
 
     $file = $_FILES['wcpn-import-file'];
-    if ( $file['type'] != 'text/csv' ) {
-        wp_die( 'Please upload a text/csv file.' );
+    $ext = strtolower( pathinfo( $file['name'], PATHINFO_EXTENSION ) );
+
+    if ( $ext != 'csv' ) {
+        wp_die( 'Please upload a .csv file.' );
     }
 

sites/branches/application-tracking/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/css/wordcamp-budgets.css

@@ -18 +18 @@
 }
 
-#save-action {
+body.post-type-wcb_sponsor_invoice #save-action {
     overflow: auto; /* Without this the element collapses on Invoices because all of it's children are floated */
 }

sites/branches/application-tracking/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/includes/wordcamp-budgets.php

@@ -161 +161 @@
             plugins_url( 'css/wordcamp-budgets.css', __DIR__ ),
             $soft_deps,
-            3
+            4
         );
     }

sites/branches/application-tracking/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/javascript/attached-files.js

@@ -84 +84 @@
          *
          * Files that are already attached to other posts are ignored.
+         * @todo add an error message if the file is already attached to other posts, see https://wordpress.slack.com/archives/meta-wordcamp/p1459185670000179
          *
          * @param {app.AttachedFile} file