Skip to content

Commit

Permalink
updates (#354)
Browse files Browse the repository at this point in the history 
* trim db user
* added voguepay.com payment method
* fix issue about adding custom link to menu
* other updates
  • Loading branch information
@peter-mw
peter-mw committed Apr 7, 2016
1 parent b98396e commit 7ee56eb
Show file tree
Hide file tree
Showing 18 changed files with 4,138 additions and 35 deletions.
47 changes: 23 additions & 24 deletions CHANGELOG.md
View file
Expand Up @@ -3,13 +3,13 @@ All notable changes to this project will be documented in this file.
This project adheres to [Semantic Versioning](http://semver.org/).


## [1.0.7] - 2015-03-01
## [1.0.7] - 2016-03-01

- Vendor: added Omnipay library
- Vendor: added coduo/php-humanizer library
- Vendor: added league/csv library
- Added: taxes support
- Added: caching with .htaccess on some folders
- Added: caching with .htaccess on some folders
- Added: payment providers (Mollie,Stripe and Authorize.net)
- Added: taxes support
- Added: url support for categories
Expand All @@ -20,7 +20,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
- Added: LinkedIn login
- Added: export orders to SCV
- Refactor: database, content manager, orders and shop classes
- Fix: general UI improvements
- Fix: general UI improvements
- Fix: security fixes
- Fix: bugfixes in custom fields
- Fix: bugfixes drag and drop
Expand All @@ -39,7 +39,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).

## [1.0.6] - 2015-11-19

- Vendor: added Twig parser
- Vendor: added Twig parser
- Added: taxes support
- Added: tabs module
- Added: twig parser to shop email template
Expand All @@ -65,10 +65,10 @@ This project adheres to [Semantic Versioning](http://semver.org/).

- Added: Custom content fields now can be added from the template config file
- Added: Session-less routes and Middleware
- Added: Various UI hooks
- Added: Various UI hooks
- Added: Support for custom data fields
- Added: Cache driver support (Files, APC)
- Added: Template class
- Added: Template class
- Added: Caching option for apijs and frontend assets
- Fix: create post/product now have parent page
- Fix: parser was outputting the same content in different edit fields
Expand All @@ -84,19 +84,19 @@ This project adheres to [Semantic Versioning](http://semver.org/).
- Fix: facebook login bug
- Fix: mw.front event was called before constants are defined
- Fix: bug in image cropping
- Fix: ConfigSave now replaces the storage_path
- Fix: ConfigSave now replaces the storage_path
- Fix: shipping bug
- Fix: undo is now working properly
- Fix: preg_replace bug
- Fix: icon picker
- Fix: save edit now uses MutationObserver
- Fix: category reordering
- Fix: live edit changes were not saved when editing an image
- Fix: pixum now caches the images
- Fix: category reordering
- Fix: live edit changes were not saved when editing an image
- Fix: pixum now caches the images
- Fix: drag and drop in row was appending the item on the wrong place
- Fix: upload image shows progress again
- Fix: resizable columns bug when no width is set
- Fix: redirect in views and modules was not working
- Fix: redirect in views and modules was not working
- Fix: updated jquery-ui to 1.11.4
- Fix: captcha is now working on pages with multiple captchas
- Fix: upload file bug
Expand All @@ -117,14 +117,14 @@ This project adheres to [Semantic Versioning](http://semver.org/).
- Fix: delete abandoned cart
- Fix: query pagination was skipping pages
- Fix: menu title was outputting html tags
- Fix: menu module bug when editing
- Fix: menu module bug when editing
- Fix: add to cart with quantity parameter
- Fix: cache now uses locale prefix
- Fix: updated raw SQL queries to use Eloquent
- Fix: redirect bug when using redirect from template
- Fix: UI in forms module in admin
- Fix: captcha validation when there are multiple catchas on one page
- Fix: module id was random when using module inside module
- Fix: UI in forms module in admin
- Fix: captcha validation when there are multiple catchas on one page
- Fix: module id was random when using module inside module
- Fix: other small bugs


Expand All @@ -138,7 +138,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
- Feature: Custom font size value can be set
- Fix: improvements in the live edit for Boostrap3 templates
- Fix: possible XSS in users
- Fix: fixes in shop orders management
- Fix: fixes in shop orders management
- Fix: many other minor bugs


Expand All @@ -150,19 +150,19 @@ This project adheres to [Semantic Versioning](http://semver.org/).
- Added: `sum` parameter to the `db_get` function
- Added: `connection_name` parameter to the `db_get` function
- Changed: replaced database class with database_manager
- Fix: shop currency function timeout
- Fix: shop currency function timeout
- Fix: modal initialization
- Fix: update check
- Fix: install problem under mysql 5.6
- Fix: drop in bootstrap columns
- Fix: improvements for bootsrap themes
- Fix: drop in bootstrap columns
- Fix: improvements for bootsrap themes
- Fix: edit link from live edit
- Fix: cart shipping price display
- Fix: shipping cost per weight
- Fix: price bug
- Fix: shipping cost per weight
- Fix: locale now uses App::getLocale()



## [1.0.1] - 2015-05-12
Expand All @@ -171,16 +171,15 @@ This project adheres to [Semantic Versioning](http://semver.org/).
- Vendor: Markdown provider
- Added: added option to change the currency sign position
- Fix: Custom environment name respects the `getenv` value
- Fix: Cache expiration
- Fix: Category delete
- Fix: Cache expiration
- Fix: Category delete
- Fix: Position db field is now converted to integer
- Fix: Delete categories bug
- Fix: Reorder categories bug
- Fix: Reorder categories bug
- Fix: Factored DB class
- Tests added
- Many other fixes

## [1.0.0] - 2015-02-16

- Moved to Laravel 5

2 changes: 2 additions & 0 deletions src/Microweber/Controllers/InstallController.php
View file
Expand Up @@ -65,6 +65,8 @@ public function index($input = null) {
}
if (!isset($input['db_user'])){
$errors[] = 'Parameter "db_user" is required';
} else {
$input['db_user'] = trim($input['db_user']);
}
if (!isset($input['admin_email'])){
$errors[] = 'Parameter "admin_email" is required';
Expand Down
5 changes: 3 additions & 2 deletions src/Microweber/Providers/MediaManager.php
View file
Expand Up @@ -399,6 +399,7 @@ public function save($data)
$t = trim($data['content_id']);
$s['rel_id'] = $t;
$s['rel_type'] = 'content';
$s['rel_type'] = 'content';
}

if (isset($data['for'])) {
Expand Down Expand Up @@ -454,8 +455,8 @@ public function save($data)
if (isset($s['rel_type']) and isset($s['rel_id'])) {
$s['rel_type'] = str_replace('..', '', $s['rel_type']);

$move_uploaded_files_dir = media_base_path().$host_dir.DS.$s['rel_type'].DS;
$move_uploaded_files_dir_index = media_base_path().$host_dir.DS.$s['rel_type'].DS.'index.php';
$move_uploaded_files_dir = media_base_path().'downloaded'.DS.$s['rel_type'].DS;
$move_uploaded_files_dir_index = media_base_path().'downloaded'.DS.$s['rel_type'].DS.'index.php';

$uploaded_files_dir = normalize_path($uploaded_files_dir);
if (!is_dir($move_uploaded_files_dir)) {
Expand Down
1 change: 1 addition & 0 deletions src/Microweber/Traits/QueryFilter.php
View file
Expand Up @@ -257,6 +257,7 @@ function ($pattern, $data, $delimiter = '~', $modifiers = 'isuS') {
$order_by_criteria = explode(',', $value);

foreach ($order_by_criteria as $c) {
$c = urldecode($c);
$c = explode(' ', $c);
if (isset($c[0]) and trim($c[0]) != '') {
$c[0] = trim($c[0]);
Expand Down
4 changes: 4 additions & 0 deletions src/Microweber/Utils/Adapters/Http/Curl.php
View file
Expand Up @@ -206,6 +206,8 @@ public function execute()
curl_setopt($ch, CURLOPT_URL, $this->url);
curl_setopt($ch, CURLOPT_TIMEOUT, $this->timeout);
curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);
curl_setopt($ch, CURLOPT_CAINFO, __DIR__.DS.'cacert.pem.txt');


if ($this->timeout != false) {
if (function_exists('set_time_limit')) {
Expand Down Expand Up @@ -309,6 +311,8 @@ private function setHeaders($type = '')
CURLOPT_SSL_VERIFYPEER => false,
//CURLOPT_TIMEOUT => 30,
CURLOPT_RETURNTRANSFER => true,
CURLOPT_CAINFO => __DIR__.DS.'cacert.pem.txt',

);

if ($type == 'post') {
Expand Down
11 changes: 10 additions & 1 deletion src/Microweber/Utils/Adapters/Http/Guzzle.php
View file
Expand Up @@ -24,7 +24,15 @@ public function setUrl($url)
public function get()
{
$client = new Client();
$response = $client->get($this->url, ['timeout' => $this->timeout]);







$response = $client->get($this->url, ['timeout' => $this->timeout, 'verify'=>__DIR__.DS.'cacert.pem.txt']);

$body = $response->getBody();
$r = '';

Expand Down Expand Up @@ -75,6 +83,7 @@ public function post($data = false)
$response = $client->post($this->url, [
'body' => $data,
'timeout' => $this->timeout,
'verify'=>__DIR__.DS.'cacert.pem.txt'
]);

$r = '';
Expand Down

0 comments on commit 7ee56eb

Please sign in to comment.