Plugin Directory

Changeset 940993


Ignore:
Timestamp:
06/30/2014 01:44:51 PM (12 years ago)
Author:
robmcvey
Message:

Squashed commit of the following:

commit a7879d2749faab2b67fbf2f8d1c17e1bae2f3cb3
Author: Rob McVey <robmcvey@…>
Date: Mon Jun 30 14:41:38 2014 +0100

Merging in flickr functionality

commit 0850d7a8489e28a52999e68aaa87bc51afae3230
Merge: 363c99c 7466280
Author: Rob McVey <robmcvey@…>
Date: Tue Jun 17 14:09:37 2014 +0100

Merge branch 'master' of github.com:copify/copify-wordpress

commit 7466280588a40d82c21c4c89ed937be44f3b1431
Author: Rob McVey <robmcvey@…>
Date: Wed May 14 11:49:51 2014 +0100

Use esc_attr() rather than htmlentities() in brief

commit aae02c000dc73ca2fc6391187936d06282e5963b
Author: Rob McVey <robmcvey@…>
Date: Wed May 14 11:46:40 2014 +0100

Use esc_attr() rather than htmlentities()

commit 5083284ea753777182a630727fbae907bba0b392
Merge: 6fee5db 6e8f2f6
Author: Rob McVey <robmcvey@…>
Date: Wed May 7 14:20:20 2014 +0100

Merge branch 'master' of github.com:copify/copify-wordpress

commit 6e8f2f6a3f5f2e435a6ebd4d0a75c0f6ead5ce84
Merge: fff6a52 60cb22c
Author: Rob McVey <robmcvey@…>
Date: Wed May 7 14:15:25 2014 +0100

Merge branch 'master' of github.com:copify/copify-wordpress

commit fff6a52e740998b5fbe27bc479876340b0b14c2d
Author: Rob McVey <robmcvey@…>
Date: Wed May 7 13:58:28 2014 +0100

Checking version, base path, ready...

commit eeb9dac42b2321bad5d9fd491e1287662c640c25
Author: Rob McVey <robmcvey@…>
Date: Tue May 6 18:35:18 2014 +0100

Minor change to return JSON when auto publish complete

commit 8bfd7857f735871ca8813722d73e32b8d962def7
Author: Rob McVey <robmcvey@…>
Date: Wed May 7 14:13:43 2014 +0100

Conflicts fixed

commit f14aebb04e4b99a89e7056e323b6301dfa571103
Author: Rob McVey <robmcvey@…>
Date: Wed May 7 14:09:34 2014 +0100

Fixing conflicts

commit 60cb22c114789c7daeb0a89322f792a5d720d266
Author: Rob McVey <robmcvey@…>
Date: Wed May 7 13:58:28 2014 +0100

Checking version, base path, ready...

commit ceda3754eacbf0ef065ceb74fd0f80d5bcc31377
Merge: bea2939 bb8c671
Author: Rob McVey <robmcvey@…>
Date: Tue May 6 18:48:44 2014 +0100

Merge branch 'master' of github.com:copify/copify-wordpress

commit bb8c671358edaab6136091cc4b148f676a7c9ff3
Merge: 5017f90 c17858b
Author: Rob McVey <robmcvey@…>
Date: Tue May 6 18:37:33 2014 +0100

Merge branch 'master' of github.com:copify/copify-wordpress

Conflicts:

CopifyWordpress.php

commit 5017f90de52609020bd2c282a1db80280b28987a
Author: Rob McVey <robmcvey@…>
Date: Tue May 6 18:35:18 2014 +0100

Minor change to return JSON when auto publish complete

commit c17858bb1f1c1865b6e22b56332a00fd7c2a6d24
Merge: c64b47d 1b01950
Author: Rob McVey <robmcvey@…>
Date: Wed Apr 30 18:05:18 2014 +0100

Merge branch 'master' of github.com:copify/copify-wordpress

Conflicts:

CopifyWordpress.php

commit c64b47d3ad1bf3297c4929115a2e1e8cc74acf83
Author: Rob McVey <robmcvey@…>
Date: Wed Apr 30 18:01:51 2014 +0100

Check version requires a token

commit c58f362255e1388db5798adaad8de04aa4ffe2b7
Author: Rob McVey <robmcvey@…>
Date: Wed Apr 30 11:57:20 2014 +0100

Meh.

commit 2f15b69ee9042f97c8fa38c2f5ebb2c8b81e6bad
Author: Rob McVey <robmcvey@…>
Date: Wed Apr 30 11:56:22 2014 +0100

absolute url

commit 92595fc3bbcf753d7ec03f666543ca9b16691990
Author: Rob McVey <robmcvey@…>
Date: Wed Apr 30 11:53:15 2014 +0100

Works?

commit 93816bef78807f2c3167bce4441a23b720d84e85
Author: Rob McVey <robmcvey@…>
Date: Wed Apr 30 11:51:26 2014 +0100

Relative img url to assets branch banner

commit 1b019503d8ecbb0d28cb275e2af9501cbd1a7ae4
Author: Rob McVey <robmcvey@…>
Date: Wed Apr 30 11:57:20 2014 +0100

Meh.

commit 8e1f5cbb6be8aec9e721ab816353875d4f334a80
Author: Rob McVey <robmcvey@…>
Date: Wed Apr 30 11:56:22 2014 +0100

absolute url

commit c3f5a66893422c089a5440c751a4b1da9094c9b6
Author: Rob McVey <robmcvey@…>
Date: Wed Apr 30 11:53:15 2014 +0100

Works?

commit 3c3356820d0aaf3fc5bf06e76706601a211b4edb
Author: Rob McVey <robmcvey@…>
Date: Wed Apr 30 11:51:26 2014 +0100

Relative img url to assets branch banner

commit c7c22ac726ed499341d69c1527fe9b750b4a9e0d
Merge: f0cd019 6c6afb5
Author: Rob McVey <robmcvey@…>
Date: Wed Apr 30 11:44:50 2014 +0100

Merge branch 'master' of github.com:copify/copify-wordpress

commit f0cd0193b27865fc3a085842d18c55459d5d9b59
Author: Rob McVey <robmcvey@…>
Date: Wed Apr 30 11:44:37 2014 +0100

Allow version check

commit 6c6afb5ac4ea2981b25ce8701e357cf9cc5eeabe
Merge: 733244c 7e456e7
Author: Rob McVey <robmcvey@…>
Date: Tue Apr 29 15:02:34 2014 +0100

Merge branch 'master' of github.com:copify/copify-wordpress

commit 7e456e7ded3152de41bfa02abe3f1f570adc2e56
Merge: f98179c ad86c3f
Author: Rob McVey <robmcvey@…>
Date: Tue Apr 29 15:01:12 2014 +0100

Merge branch 'master' of github.com:copify/copify-wordpress

commit f98179ca2b5b9b7bf17776be9fd485af032a6926
Author: Rob McVey <robmcvey@…>
Date: Tue Apr 29 15:00:51 2014 +0100

gizignizzle

commit ad86c3f4f1d8e6b637dfc87b8841aa70f964bb8c
Merge: 1564e22 15fcd29
Author: Rob McVey <robmcvey@…>
Date: Tue Apr 29 14:56:16 2014 +0100

Merge branch 'master' of github.com:copify/copify-wordpress

commit 1564e2278632dc150a239ef577314474bb5d01c6
Author: Rob McVey <robmcvey@…>
Date: Tue Apr 29 14:56:02 2014 +0100

Assets moved to seperate branch

commit dfdcb9bbd7762905527fe3b4e8f78271f4ae0905
Author: Rob McVey <robmcvey@…>
Date: Tue Apr 29 14:09:04 2014 +0100

Removing bold from readme

commit 15fcd29152306f98e67ee516b82a066164df396e
Merge: dffac27 6fa8f80
Author: Rob McVey <robmcvey@…>
Date: Tue Apr 29 12:47:37 2014 +0100

Merge pull request #8 from copify/packages

Adding functionality for auto-publish

Location:
copify/trunk
Files:
7 added
1 deleted
4 edited
1 moved

Legend:

Unmodified
Added
Removed
  • copify/trunk/Lib/Api.php

    r913781 r940993  
    77//  Copyright 2012 Rob Mcvey. All rights reserved.
    88//
    9 class Copify {
     9class Api {
    1010   
    1111/**
     
    8080        $this->headers['Authorization'] = 'Bearer ' . $apiKey;
    8181        $this->headers['User-Agent'] = $apiEmail;
    82        
    8382    }
    8483       
     
    9291        $this->fullUrl = $this->basePath .'/' . $this->apiVersion . '/'. $this->resource . '.' . $this->format . $this->params;
    9392    }
    94        
     93   
    9594/**
    9695 * Get a list of job records (20 per page)
     
    125124        return $this->makeRequest();
    126125    }
    127    
     126
    128127/**
    129128 * Create a new job through the API
     
    140139        $this->resource = 'jobs';
    141140        return $this->makeRequest($data);
    142     }   
     141    }
    143142
    144143/**
     
    155154        $this->resource = 'feedback';
    156155        return $this->makeRequest($feedback);
    157     }   
     156    }
    158157
    159158/**
     
    167166        return $this->makeRequest();
    168167    }
    169        
     168
    170169/**
    171170 * Get an array of availble job budgets/pricing
     
    177176        $this->resource = 'job_budgets';
    178177        return $this->makeRequest();
    179     }   
     178    }
    180179
    181180/**
     
    196195        }
    197196        return $this->makeRequest();
    198     }   
     197    }
    199198
    200199/**
     
    207206        $this->resource = 'job_statuses';
    208207        return $this->makeRequest();
    209     }   
     208    }
    210209
    211210/**
     
    219218        return $this->makeRequest();
    220219    }
    221    
     220
    222221/**
    223222 * Get a list of copywriters (20 per page)
     
    233232        return $this->makeRequest();
    234233    }
    235    
     234
    236235/**
    237236 * View a single copywriter record
     
    247246        $this->resource = 'users/'.$id;
    248247        return $this->makeRequest();
    249     }   
     248    }
    250249
    251250/**
     
    257256 **/
    258257    public function makeRequest($data = null) {
    259        
    260258        if(!function_exists('curl_init')) {
    261259            throw new Exception('This Plugin requires PHP\'s cURL extension');
    262260        }
    263        
    264261        // Build the URL
    265262        $this->setfullUrl();
     
    285282            curl_setopt($curlyWurly, CURLOPT_POSTFIELDS, http_build_query($data));
    286283        }
    287        
     284
    288285        // Set the Authorization and User-Agent headers
    289286        foreach($this->headers as $key => $value) {
     
    299296            throw new Exception(curl_error($curlyWurly));
    300297        }
    301                
     298
    302299        // Bye bye curly wurly
    303300        curl_close($curlyWurly);
     
    305302        return $this->parseFormat($response);
    306303    }
    307        
     304
    308305/**
    309306 * Takes the raw response, returns an array or throws a huma readble exception
  • copify/trunk/README.md

    r905737 r940993  
    22
    33## Copify Wordpress Plugin
     4
     5[![Build Status](https://secure.travis-ci.org/copify/copify-wordpress.png?branch=master)](https://travis-ci.org/copify/copify-wordpress/)
    46
    57Automatically publish unique, relevant content every week from Copify's team of professional writers.
  • copify/trunk/Views/CopifySettings.php

    r909131 r940993  
    5858                </select>   
    5959            </div>
    60             <?php submit_button(); ?>
     60            <button class="CopifyButton CopifyGreen">Save Changes</button>
    6161        </fieldset>         
    6262    </form>
  • copify/trunk/Views/CopifyViewJob.php

    r909714 r940993  
    203203            <?php if(in_array($job['job_status_id'], array(1,2,6,7))) : // Job status info ?>
    204204                <div class="CopifyJobStatusInfo message">
    205                     <h3><?php echo sprintf('Your order is <span class="%s">%s</span>. What happens next?' , $statusNameClass, $statusName); ?></h3>
     205                    <h3><?php echo sprintf('Your order is <span class="%s">%s</span>. What happens next?', $statusNameClass, $statusName); ?></h3>
    206206                    <p>Your order has been placed with an approved Copify writer, for now sit back and relax!</p>
    207                     <p>When your order is complete, you will be notified by email and you will have chance to review the content before you publish it</p>
     207                    <p>When your order is complete, you will be notified by email and you will have chance to review the content before you publish it.</p>
    208208                    <ul>
    209                         <li><span class="open">Open</span> - Your order is in the queue for the next availalbe writer</li>
     209                        <li><span class="open">Open</span> - Your order is in the queue for the next available writer</li>
    210210                        <li><span class="in_progress">In progress</span> -  A writer is working on your content, you will receive an email once complete</li>
    211211                        <li><span class="completed">Completed</span> - Your content is ready for you to approve</li>
     
    399399                    jQuery('#CopifyConfirmSaving').hide();
    400400                    //console.log(data);
    401                     window.location.href = window.location.href + '&flashMessage=Job+approved+and+moved+to+Drafts';
     401                    window.location.href = window.location.href + '&flashMessage=Order+approved+and+moved+to+Drafts';
    402402                } else {
    403403                    alert(data.message);
     
    434434                if(data.status == 'success') {
    435435                    // OK
    436                     window.location.href = window.location.href + '&flashMessage=Job+moved+to+Drafts';
     436                    window.location.href = window.location.href + '&flashMessage=Order+moved+to+Drafts';
    437437                } else {
    438438                    alert(data.message);
  • copify/trunk/readme.txt

    r909714 r940993  
    11=== Copify ===
    2 Version: 1.0.4
     2Version: 1.0.5
    33Contributors: robmcvey
    44Tags: blog writers, automatic blogging, post writers, auto blogging, content, copywriting, copywriters, blogging, writers, writing, seo
Note: See TracChangeset for help on using the changeset viewer.