alekseybobkov a5b217ff0b Merge branch 'develop' into builder-ui ...

Conflicts:
	modules/backend/widgets/table/assets/js/build-min.js
	modules/backend/widgets/table/assets/js/table.js

2015-10-15 17:32:19 -07:00

..

assets

Improve tabs consistency, fix conflict with .primary

2015-07-10 15:51:24 +10:00

classes

Merge branch 'develop' into builder-ui

2015-10-15 17:32:19 -07:00

controllers

Minor revert from previous 2 commits

2015-09-26 08:01:08 +10:00

database/migrations

Adds Theme customization feature

2014-12-04 16:49:52 +11:00

formwidgets

These methods should be protected, update client lang

2015-08-04 10:01:17 +10:00

helpers

Swap FileHelper methods for new Ini parser

2015-10-03 07:30:11 +10:00

lang

Merge pull request #1488 from vojtasvoboda/feature/duplicate-array-keys

2015-10-05 08:45:48 +11:00

models

Use correct folder permissions in ThemeImport/Export

2015-09-26 18:12:13 +10:00

twig

Add |media filter and MediaLibrary::url helper

2015-06-17 18:51:05 +10:00

views

Update refs to flash message script

2015-05-28 20:33:49 +10:00

widgets

Minor styling fix

2015-10-07 07:22:16 +11:00

composer.json

Convert autoload refs to PSR-4 so they actually work

2014-09-19 17:23:11 +10:00

routes.php

Add hooks to the cms/backend route definitions

2015-05-02 13:53:05 +10:00

ServiceProvider.php

Fixes bug in IE11 that prevents use of Media Manager - Fixes #1198

2015-06-27 12:24:19 +10:00