Skip to content

Commit

Permalink
Merge pull request #832 from FrozenNode/dev
Browse files Browse the repository at this point in the history
Merging 5.0.1 into master
  • Loading branch information
janhartigan committed Mar 4, 2015
2 parents 71b4101 + 6f47a9b commit 6b5c3ee
Show file tree
Hide file tree
Showing 4 changed files with 21 additions and 1 deletion.
3 changes: 3 additions & 0 deletions changelog.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
## Changelog

### 5.0.1
- Bugfix: Fixing csrf token mismatches for some requests

### 5.0.0
- Upgraded to Laravel 5
- New translations (az)
Expand Down
7 changes: 7 additions & 0 deletions public/js/admin.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,13 @@
return this.init();
};

//setting up csrf token
$.ajaxSetup({
headers: {
'X-CSRF-TOKEN': window.csrf
}
});

admin.prototype = {

//properties
Expand Down
7 changes: 7 additions & 0 deletions public/js/settings.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,13 @@
return this.init();
};

//setting up csrf token
$.ajaxSetup({
headers: {
'X-CSRF-TOKEN': window.csrf
}
});

admin.prototype = {

//properties
Expand Down
5 changes: 4 additions & 1 deletion readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Administrator is an administrative interface builder for [Laravel](http://larave

- **Author:** Jan Hartigan
- **Website:** [http://frozennode.com](http://administrator.frozennode.com/)
- **Version:** 5.0.0
- **Version:** 5.0.1

[![Build Status](https://travis-ci.org/FrozenNode/Laravel-Administrator.png?branch=master)](https://travis-ci.org/FrozenNode/Laravel-Administrator)

Expand Down Expand Up @@ -63,6 +63,9 @@ Administrator is released under the MIT License. See the LICENSE file for detail

## Recent Changelog

### 5.0.1
- Bugfix: Fixing csrf token mismatches for some requests

### 5.0.0
- Upgraded to Laravel 5
- New translations (az)

0 comments on commit 6b5c3ee

Please sign in to comment.