-
Notifications
You must be signed in to change notification settings - Fork 724
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix Angular template compilation Add missing Code Mirror extensions Fix CSS generation Fix last icon paths issues
- Loading branch information
1 parent
db10369
commit ffd64bd
Showing
31 changed files
with
721 additions
and
983 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -12,3 +12,4 @@ build/ng-admin.css | |
| src/css | ||
| examples/blog/build | ||
| examples/blog/assets | ||
| npm-debug.log | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,68 +1,13 @@ | ||
| /*global require,define,angular*/ | ||
| require('./vendors.js'); | ||
| require('./ng-admin/Main/MainModule'); | ||
| require('./ng-admin/Crud/CrudModule'); | ||
|
|
||
| define('angular', [], function () { | ||
| 'use strict'; | ||
| var Factory = require('./ng-admin/es6/lib/Factory'); | ||
|
|
||
| return angular; | ||
| }); | ||
|
|
||
| require.config({ | ||
| paths: { | ||
| 'angular-bootstrap': 'bower_components/angular-bootstrap/ui-bootstrap.min', | ||
| 'angular-bootstrap-tpls': 'bower_components/angular-bootstrap/ui-bootstrap-tpls.min', | ||
| 'angular-numeraljs': 'bower_components/angular-numeraljs/dist/angular-numeraljs', | ||
| 'angular-resource': 'bower_components/angular-resource/angular-resource', | ||
| 'angular-sanitize': 'bower_components/angular-sanitize/angular-sanitize', | ||
| 'angular-ui-codemirror': 'bower_components/angular-ui-codemirror/ui-codemirror.min', | ||
| 'angular-ui-router': 'bower_components/angular-ui-router/release/angular-ui-router', | ||
| 'humane': 'bower_components/humane/humane', | ||
| 'inflection': 'bower_components/inflection/inflection.min', | ||
| 'lodash': 'bower_components/lodash/dist/lodash.min', | ||
| 'ng-file-upload': 'bower_components/ng-file-upload/angular-file-upload', | ||
| 'ngInflection': 'bower_components/ngInflection/ngInflection', | ||
| 'nprogress': 'bower_components/nprogress/nprogress', | ||
| 'numeral': 'bower_components/numeral/numeral', | ||
| 'restangular': 'bower_components/restangular/dist/restangular', | ||
| 'text' : 'bower_components/requirejs-text/text', | ||
| 'textangular': 'bower_components/textAngular/dist/textAngular.min', | ||
| 'CrudModule': 'ng-admin/Crud/CrudModule', | ||
| 'papaparse': 'bower_components/papaparse/papaparse.min', | ||
| 'MainModule': 'ng-admin/Main/MainModule', | ||
| 'AdminDescription': '../../build/ng-admin-configuration' | ||
| }, | ||
| shim: { | ||
| 'papaparse': { | ||
| exports: 'Papa' | ||
| }, | ||
| 'restangular': { | ||
| deps: ['angular', 'lodash'] | ||
| }, | ||
| 'angular-ui-router': { | ||
| deps: ['angular'] | ||
| }, | ||
| 'angular-bootstrap': { | ||
| deps: ['angular'] | ||
| }, | ||
| 'angular-bootstrap-tpls': { | ||
| deps: ['angular', 'angular-bootstrap'] | ||
| } | ||
| } | ||
| }); | ||
|
|
||
| define(function (require) { | ||
| 'use strict'; | ||
|
|
||
| var angular = require('angular'); | ||
| require('MainModule'); | ||
| require('CrudModule'); | ||
|
|
||
| var AdminDescription = require('AdminDescription'); | ||
|
|
||
| var factory = angular.module('AdminDescriptionModule', []); | ||
| factory.constant('AdminDescription', new AdminDescription()); | ||
| var factory = angular.module('AdminDescriptionModule', []); | ||
| factory.constant('AdminDescription', new Factory()); | ||
|
|
||
| var ngadmin = angular.module('ng-admin', ['main', 'crud', 'AdminDescriptionModule']); | ||
| ngadmin.config(['NgAdminConfigurationProvider', 'AdminDescription', function(NgAdminConfigurationProvider, AdminDescription) { | ||
| NgAdminConfigurationProvider.setAdminDescription(AdminDescription); | ||
| }]); | ||
| var ngadmin = angular.module('ng-admin', ['main', 'crud', 'AdminDescriptionModule']); | ||
| ngadmin.config(function(NgAdminConfigurationProvider, AdminDescription) { | ||
| NgAdminConfigurationProvider.setAdminDescription(AdminDescription); | ||
| }); |
Oops, something went wrong.