Skip to content

Commit c0d501d

Browse files
committed
Merge branch 'release/1.0.3'
2 parents f8eddae + 2747249 commit c0d501d

File tree

7 files changed

+16
-4
lines changed

7 files changed

+16
-4
lines changed

CHANGELOG.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
# v1.0.3
2+
## 02/21/2017
3+
4+
1. [](#bugfix)
5+
* Fixed issue with new 'author' option that could trigger errors when settings were not saved. (#23)
6+
* Fixed the 'More Details' button triggering the Modal to close instead of just expanding the details
7+
18
# v1.0.2
29
## 02/18/2017
310

README.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,17 @@ Thanks to this powerful bi-directional flow, Git Sync can now turn your site int
1818
<img src="wizard.png" width="500" />
1919

2020
* Easy step-by-step Wizard setup will guide you through a detailed process for setting things up
21-
* Supported hosting services: [GitHub](https://github.com), [BitBucket](https://bitbucket.org), [GitLab](https://gitlab.com)
21+
* Supported hosting services: [GitHub](https://github.com), [BitBucket](https://bitbucket.org), [GitLab](https://gitlab.com) as well as any self-hosted and git service with webhooks support.
2222
* Private repository
23+
* 2FA (Two-Factory Authentication) and Access Token support
2324
* Webhooks support allow for automatic synchronization from the Git Repository
2425
* Automatically handles simple merges behind the scenes
2526
* Easy one-click button to reset your local changes and restores it to the actual state of the git repository
2627
* Easy one-click button to manually synchronize
28+
* Customize the Committer Name, choose between Git User, GitSync Commiter Name, Grav User Name and Grav user Fullname
2729
* With the built-in Form Process action `gitsync`, you can trigger the synchronization anytime someone submits a post.
2830
* Any 3rd party plugin can integrate with Git Sync and trigger the synchronization through the `synchronize` event.
31+
* Built-in CLI command to automate synchronizations.
2932

3033
# Command Line Interface
3134

app/wizard/index.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -191,6 +191,8 @@ $(document).on('change', '[name="gitsync[repository]"]', (event) => {
191191
});
192192

193193
$(document).on('click', '[data-access-tokens-details]', (event) => {
194+
event.preventDefault();
195+
194196
const button = $(event.currentTarget);
195197
const panel = button.closest('.access-tokens').find('.access-tokens-details');
196198

blueprints.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name: Git Sync
2-
version: 1.0.2
2+
version: 1.0.3
33
description: Allows to synchronize portions of Grav with Git Repositories (GitHub, BitBucket, GitLab)
44
icon: git
55
author:

classes/GitSync.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ public function add()
161161

162162
public function commit($message = '(Grav GitSync) Automatic Commit')
163163
{
164-
$authorType = $this->getConfig('git', null)['author'];
164+
$authorType = $this->getGitConfig('author', 'gituser');
165165
if (defined('GRAV_CLI') && in_array($authorType, ['gravuser', 'gravfull'])) {
166166
$authorType = 'gituser';
167167
}

js/app.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

wizard.png

-84.3 KB
Loading

0 commit comments

Comments
 (0)