Skip to content
Browse files

Merge branch 'master' of github.com:GetResponse/DevZone

  • Loading branch information...
2 parents 0323c78 + 3d43a15 commit 3513fcf307b3da20d9e81f315ba6a9f14d192551 @sokroj sokroj committed Jul 5, 2012
Showing with 21 additions and 13 deletions.
  1. +0 −1 API/examples/php_synopsis.php
  2. +12 −6 DC/README.md
  3. +9 −6 README.md
View
1 API/examples/php_synopsis.php
@@ -16,7 +16,6 @@
# JSON-RPC module is required
# available at http://github.com/GetResponse/DevZone/blob/master/API/lib/jsonRPCClient.php
-# alternate version available at http://jsonrpcphp.org/
require_once 'jsonRPCClient.php';
# your API key
View
18 DC/README.md
@@ -1,6 +1,6 @@
#GetResponse Dynamic Content
-version 1.6.3, 2012-03-09 [changelog](#changelog)
+version 1.6.4, 2012-05-30 [changelog](#changelog)
##INFO
@@ -281,19 +281,20 @@ Supported tokens and message types they can be used in:
Links that allow contact to share info about message on social media.
```
-{{LINK "social_facebook"}}
+{{LINK "social_digg"}}
+{{LINK "social_facebook" "like"}}
```
Allowed tokens:
-* `social_buzz`
* `social_digg`
-* `social_facebook`
+* `social_facebook` with `post` (default) and `like` actions
+* `social_googleplus`
* `social_linkedin`
* `social_myspace`
-* `social_twitter`
+* `social_twitter` with `tweet` (default) and `retweet` actions
-**Warning**: If you want your newsletter to be shared on social media you must select "Publish in RSS" on last step of creating newsletter process.
+**Warning**: If you want your newsletter to be shared on social media you must select "Publish in RSS" on last step of creating newsletter process in old editor.
---
@@ -380,6 +381,7 @@ Countdown to/since given timestamp or contact subscription date.
```
(will insert "291 days 7 hours to the end of the world" at the moment this doc was created and will insert "World ended 32 days ago" when it is 32 days after the timestamp date)
+```
{{TIMER "added_on" "" "You signed up DAYS_UNIT ago"}}
```
(will insert "You signed up 35 days ago")
@@ -699,6 +701,10 @@ will insert Honda, Toyota, Dodge.
##CHANGELOG<a name="changelog">
+version 1.6.4, 2012-05-30
+
+* [social links](#social_links) allows action to be specified in facebook and twitter services, buzz is replaced with googleplus
+
version 1.6.3, 2012-03-09
* [campaign or contact or message info](#campaign_or_contact_or_message_info) accepts `message_reply_to_email` token
View
15 README.md
@@ -2,27 +2,30 @@
---
-<img src="https://raw.github.com/GetResponse/DevZone/master/API/icon.png"/>
+[![View documentation][2]][1]
Use our API to easily add the powerful functionality of GetResponse Email Marketing to your favorite applications.
-[View documentation](https://github.com/GetResponse/DevZone/tree/master/API)
+[1]: https://github.com/GetResponse/DevZone/tree/master/API/README.md
+[2]: https://raw.github.com/GetResponse/DevZone/master/API/icon.png
---
-<img src="https://raw.github.com/GetResponse/DevZone/master/DC/icon.png"/>
+[![View documentation][4]][3]
Use GetResponse advanced mail-merge capabilities to personalize your email messages.
-[View documentation](https://github.com/GetResponse/DevZone/tree/master/DC)
+[3]: https://github.com/GetResponse/DevZone/tree/master/DC/README.md
+[4]: https://raw.github.com/GetResponse/DevZone/master/DC/icon.png
---
-<img src="https://raw.github.com/GetResponse/DevZone/master/Plugins/icon.png"/>
+[![View GetResponse integrations][6]][5]
Browse the GetResponse App Center to find applications such as CRM, CMS or E-commerce that connect directly with GetResponse.
-[View GetResponse integrations](https://github.com/GetResponse/DevZone/tree/master/Plugins)
+[5]: https://github.com/GetResponse/DevZone/tree/master/Plugins
+[6]: https://raw.github.com/GetResponse/DevZone/master/Plugins/icon.png
---

0 comments on commit 3513fcf

Please sign in to comment.
Something went wrong with that request. Please try again.