| [galette-commits] [GIT] galette/plugin-paypal.git branch, master, updated. 1.1.0.1-12-g7531f3e |
[ Thread Index |
Date Index
| More lists.galette.eu/commits Archives
]
This is an automated email from git. It was enerated because a ref
change was pushed to the repository "galette/plugin-paypal.git".
The branch, master has been updated
via 7531f3e013f480d0142d24cfc31b426b5967aad6 (commit)
via a627dbecb0a14a9d98bdddb9dc292f2406411db6 (commit)
via 3c362964e4e511eec4b11db8e47019def33ef751 (commit)
via 8e4fc1a94b7a0d6e3776cc863271ebd1fef90088 (commit)
via d09659c45cd9f50ec1f20c6e00c29da1ee21675c (commit)
via 0d49b18cf3b78775f02062357d638af4a7a3f354 (commit)
via 28561a999856cbf742f64b5edd64f772f351aad1 (commit)
via b9b8ac0325f40a6127fd98ff4ce88ab538737e49 (commit)
via 694b0a1b39875beef0915db6a6041c1ea2aa837e (commit)
via 2f4759437fe45a65e399e409ce3988947ccb1469 (commit)
via 1d2877c9a6c91f6b191bc89f2956e18843c95562 (commit)
from ed7bd7fff518b7dcb3f8ff4f2653a93b825de27a (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 7531f3e013f480d0142d24cfc31b426b5967aad6
Merge: ed7bd7f a627dbe
Author: Johan Cwiklinski <johan@xxxxxxxx>
Date: Sun Jan 6 11:27:22 2013 +0100
Merge branch 'release/1.2'
Conflicts:
templates/default/paypal_history.tpl
commit a627dbecb0a14a9d98bdddb9dc292f2406411db6
Author: Johan Cwiklinski <johan@xxxxxxxx>
Date: Sun Jan 6 11:26:04 2013 +0100
Bump version
-----------------------------------------------------------------------
Summary of changes:
_config.inc.php | 4 +-
_define.php | 8 ++--
_smarties.php | 4 +-
classes/paypal-history.class.php | 53 ++++++++++++++++++++----------
classes/paypal.class.php | 58 +++++++++++++++++-----------------
paypal_form.php | 10 +++---
paypal_history.php | 14 ++++----
paypal_notify.php | 42 ++++++++++++------------
paypal_preferences.php | 12 +++---
paypal_success.php | 8 ++--
templates/default/galette_paypal.css | 11 ++++++-
templates/default/images/warning.png | Bin 0 -> 863 bytes
templates/default/paypal_history.tpl | 53 +++++++++++++++++++++++--------
13 files changed, 164 insertions(+), 113 deletions(-)
create mode 100644 templates/default/images/warning.png
hooks/post-receive
--
galette/plugin-paypal.git
--
--
Galette repositories commits - http://galette.tuxfamily.org