Skip to content

Stable release #52

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 32 commits into from
Dec 15, 2016
Merged

Stable release #52

merged 32 commits into from
Dec 15, 2016

Conversation

MladenJanjetovic
Copy link
Collaborator

No description provided.

maki10 and others added 30 commits October 3, 2016 13:25
@maki10
Update README.md
ea9d89f
@maki10
Update README.md
1d5ea92
@maki10
Added foreign key check
4d49e08
@maki10
Merge branch 'development' of https://github.com/systeminc/laravel-admin
91ec1f7 
 into development
@maki10
Update README.md
ed66ed3
@stevonakic
style changes
f3b7b38
@stevonakic
Merge branch 'development' of https://github.com/systeminc/laravel-admin
9d45414 
 into development

# Conflicts:
#	src/resources/assets/dist/css/admin.css
#	src/resources/assets/dist/css/admin.css.map
#	src/resources/assets/src/less/admin.min.css
@maki10
Merge branch 'development' of https://github.com/systeminc/laravel-admin
7cccec3 
 into development
@maki10
Added sanitizeKey for uri_id in blog,
97d3610 
SLA blog changes,
Migration changes, Added nullable fields
@maki10
Added sanitizeUri for products,
17951e3 
Added uri_id unique validation
@maki10 @StyleCIBot
Applied fixes from StyleCI
8c1c9e6
@maki10
Merge pull request #47 from systeminc/analysis-zGJblE
1fd8c86 
Applied fixes from StyleCI
@maki10
Updated product validation,
000e292 
Remove sanitizeUri added str_slug()
@stevonakic
style changes
279f7c6
@stevonakic
Merge branch 'development' of https://github.com/systeminc/laravel-admin
debb878 
 into development
@maki10
Fixing misspell for location
b1f39b9
@maki10
Changed uri, uri_key, uri_id to slug
ea8aced
@maki10
Changed UpdateCommand,
100a41f 
Added config for invoice,
Set up invoice pdf
@maki10 @StyleCIBot
Applied fixes from StyleCI
a7e77aa
@maki10
Merge pull request #48 from systeminc/analysis-8n2Z7A
a1a8c8b 
Applied fixes from StyleCI
@maki10
Fixing adding items to order,
fcf1ba9 
Added VAT for invoice
@stevonakic
style change
13533ac
@stevonakic
Merge branch 'development' of https://github.com/systeminc/laravel-admin
cd7fef6 
 into development

# Conflicts:
#	src/resources/views/pages/edit.blade.php
@maki10
Retype misspell on page elements
065a4f1
@maki10
Changed uri_key to slug
df49324
@maki10
Added url for location
32d6f52
@maki10
Merge branch 'development' of https://github.com/systeminc/laravel-admin
ff4243d 
 into development
@maki10
Fixing delete image when location is updated
063d8b0
@MladenJanjetovic
Merge branch 'master' into development
c2f5e28 
# Conflicts:
#	README.md
@MladenJanjetovic
Update AdminServiceProvider.php
b82acf2
@MladenJanjetovic MladenJanjetovic merged commit e7781de into master Dec 15, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@MladenJanjetovic @maki10 @stevonakic