Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: marmelab/ng-admin
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v1.0.0
Choose a base ref
...
head repository: marmelab/ng-admin
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
13 contributors

Commits on Feb 1, 2017

  1. Remove bower documentation

    @Kmaschta
    Kmaschta committed Feb 1, 2017
    Copy the full SHA
    9aab042 View commit details

Commits on Feb 2, 2017

  1. Merge pull request #1303 from marmelab/remove-bower 

    [RFR] Remove bower documentation
    @jpetitcolas
    jpetitcolas authored Feb 2, 2017
    1
    Copy the full SHA
    3319708 View commit details

Commits on Feb 11, 2017

  1. maFileField: Close em and small tags in template

    @beevelop
    beevelop authored Feb 11, 2017
    Copy the full SHA
    d955f28 View commit details

Commits on Feb 13, 2017

  1. Merge pull request #1306 from beevelop/patch-1 

    maFileField: Close em and small tags in template
    @Kmaschta
    Kmaschta authored Feb 13, 2017
    Copy the full SHA
    1dfa889 View commit details

  2. Makefile: Fix generating source-map with webpack 

    The command is slightly different to really get source maps for the `ng-admin.min.js` and `ng-admin.min.css` files.
    @beevelop
    beevelop authored Feb 13, 2017
    Copy the full SHA
    6be9eb1 View commit details

Commits on Feb 24, 2017

  1. Update FAQ.md 

    `falue` to `value`
    @escapedcat
    escapedcat authored Feb 24, 2017
    Copy the full SHA
    c21564d View commit details

  2. Merge pull request #1310 from escapedcat/patch-1 

    Update FAQ.md
    @Kmaschta
    Kmaschta authored Feb 24, 2017
    Copy the full SHA
    85f6145 View commit details

Commits on Feb 27, 2017

  1. Update Field.md 

    Fix anchor jump links
    @escapedcat
    escapedcat authored Feb 27, 2017
    Copy the full SHA
    9e4df9e View commit details

  2. Update Field.md 

    Fixed wrong links
    @escapedcat
    escapedcat authored Feb 27, 2017
    Copy the full SHA
    248dfcb View commit details

  3. Merge pull request #1312 from escapedcat/patch-2 

    Update Field.md
    @Kmaschta
    Kmaschta authored Feb 27, 2017
    Copy the full SHA
    ffa7600 View commit details

Commits on Mar 7, 2017

  1. Merge pull request #1307 from beevelop/patch-2 

    Makefile: Fix generating source-map with webpack
    @Kmaschta
    Kmaschta authored Mar 7, 2017
    Copy the full SHA
    51a50a3 View commit details

Commits on Mar 8, 2017

  1. Fix DateField watches

    @Kmaschta
    Kmaschta committed Mar 8, 2017
    Copy the full SHA
    ad7287b View commit details

  2. Merge pull request #1318 from marmelab/datefield-watches 

    [RFR] Fix DateField watches
    Florian F authored Mar 8, 2017
    Copy the full SHA
    6dc31ae View commit details

  3. Prepare 1.0.1

    @fzaninotto
    fzaninotto committed Mar 8, 2017
    Copy the full SHA
    7afed09 View commit details

  4. Update CHANGELOG for 1.0.1

    @Kmaschta
    Kmaschta committed Mar 8, 2017
    Copy the full SHA
    8560f79 View commit details

  5. Merge pull request #1319 from marmelab/update-changelog 

    [RFR] Update CHANGELOG for 1.0.1
    @fzaninotto
    fzaninotto authored Mar 8, 2017
    Copy the full SHA
    5e171aa View commit details

Commits on Mar 10, 2017

  1. Fixed misleading typo 

    I've copy pasted and got my code faulty
    @matheo
    matheo authored Mar 10, 2017
    Copy the full SHA
    a643780 View commit details

Commits on Mar 11, 2017

  1. Merge pull request #1320 from matheo/patch-1 

    Fixed misleading typo
    @Kmaschta
    Kmaschta authored Mar 11, 2017
    Copy the full SHA
    d30d713 View commit details

Commits on Mar 15, 2017

  1. Infinite scroll: avoid to load multiple time at the same time

    @Kmaschta
    Kmaschta committed Mar 15, 2017
    Copy the full SHA
    3f76098 View commit details

  2. Update test dependencies

    @Kmaschta
    Kmaschta committed Mar 15, 2017
    Copy the full SHA
    d499c64 View commit details

  3. Fix tests

    @Kmaschta
    Kmaschta committed Mar 15, 2017
    Copy the full SHA
    d809f5a View commit details

Commits on Mar 16, 2017

  1. Fix dependencies

    @Kmaschta
    Kmaschta committed Mar 16, 2017
    Copy the full SHA
    cf72de2 View commit details

  2. Wording code review

    @Kmaschta
    Kmaschta committed Mar 16, 2017
    Copy the full SHA
    0ec36bc View commit details

  3. Merge pull request #1322 from marmelab/fix-infinite-scrolling 

    [RFR] Infinite scroll: avoid to load multiple time at the same time
    Florian F authored Mar 16, 2017
    Copy the full SHA
    664d950 View commit details

  4. Prepare 1.0.2

    @Kmaschta
    Kmaschta committed Mar 16, 2017
    Copy the full SHA
    440be44 View commit details

Commits on Mar 17, 2017

  1. Merge pull request #1324 from marmelab/prepare-1.0.2 

    [RFR] Prepare 1.0.2 release
    @fzaninotto
    fzaninotto authored Mar 17, 2017
    Copy the full SHA
    ac8eb4e View commit details

Commits on Mar 30, 2017

  1. Revert "[RFR] Fix filter which was overwriting url after a change"

    @fzaninotto
    fzaninotto authored Mar 30, 2017
    Copy the full SHA
    576d10e View commit details

  2. Remove fit

    @Kmaschta
    Kmaschta authored Mar 30, 2017
    Copy the full SHA
    4212654 View commit details

  3. Fix test

    @Kmaschta
    Kmaschta authored Mar 30, 2017
    Copy the full SHA
    8d3dcb7 View commit details

  4. Merge pull request #1333 from marmelab/revert-1290-fix_filter_autoupdate 

    Revert "[RFR] Fix filter which was overwriting url after a change"
    @djhi
    djhi authored Mar 30, 2017
    Copy the full SHA
    a3209bb View commit details

Commits on Apr 3, 2017

  1. Do not update date field actual value if invalid

    Florian FERBACH committed Apr 3, 2017
    Copy the full SHA
    a439490 View commit details

  2. Apply review

    Florian FERBACH committed Apr 3, 2017
    Copy the full SHA
    cafc44e View commit details

  3. Add test

    Florian FERBACH committed Apr 3, 2017
    Copy the full SHA
    718b010 View commit details

  4. Merge pull request #1334 from marmelab/fix_datepicker_values_disappea… 

    …ring

[RFR] Do not update date field actual value if invalid
    @jpetitcolas
    jpetitcolas authored Apr 3, 2017
    Copy the full SHA
    9a8957f View commit details

  5. Prepare version 1.0.3

    Florian FERBACH committed Apr 3, 2017
    Copy the full SHA
    52afa53 View commit details

  6. Merge pull request #1335 from marmelab/prepare_1.0.3 

    [RFR] Prepare 1.0.3 release
    @fzaninotto
    fzaninotto authored Apr 3, 2017
    Copy the full SHA
    6b30888 View commit details

Commits on Apr 4, 2017

  1. Republish

    @fzaninotto
    fzaninotto committed Apr 4, 2017
    Copy the full SHA
    bfa8e70 View commit details

Commits on Apr 5, 2017

  1. Update admin-config to fix the disabling of views

    Florian FERBACH committed Apr 5, 2017
    Copy the full SHA
    e4ea9bc View commit details

  2. Prepare release 1.0.5

    Florian FERBACH committed Apr 5, 2017
    Copy the full SHA
    453cb69 View commit details

  3. Fix test fixtures

    Florian FERBACH committed Apr 5, 2017
    Copy the full SHA
    ec0eda1 View commit details

  4. Merge pull request #1336 from marmelab/fix_disabling_views 

    [RFR] Fix disabling views
    @Kmaschta
    Kmaschta authored Apr 5, 2017
    Copy the full SHA
    cd64165 View commit details

Commits on Apr 26, 2017

  1. Use http error service handlers inside view events

    Florian FERBACH committed Apr 26, 2017
    Copy the full SHA
    8fd61a7 View commit details

  2. Add tests

    Florian FERBACH committed Apr 26, 2017
    Copy the full SHA
    1336e2d View commit details

Commits on Apr 27, 2017

  1. Merge pull request #1339 from marmelab/fix_httperrorservice_decorator 

    [RFR] Use http error service handlers inside view events
    @fzaninotto
    fzaninotto authored Apr 27, 2017
    Copy the full SHA
    186d98f View commit details

  2. Prepare 1.0.6

    @fzaninotto
    fzaninotto committed Apr 27, 2017
    Copy the full SHA
    c4f3667 View commit details

Commits on May 20, 2017

  1. Improve list view actions documentation 

    Fix #1338
    @Kmaschta
    Kmaschta authored May 20, 2017
    Copy the full SHA
    74886bb View commit details

Commits on May 22, 2017

  1. Merge pull request #1344 from marmelab/listview-actions-doc 

    [RFR] Improve list view actions documentation
    @ThieryMichel
    ThieryMichel authored May 22, 2017
    Copy the full SHA
    45bbb81 View commit details

Commits on May 29, 2017

  1. install has been replaced with add

    @Piliponful
    Piliponful authored May 29, 2017
    Copy the full SHA
    89e0ada View commit details

  2. Merge pull request #1345 from Piliponful/patch-1 

    `install` has been replaced with `add`
    @Kmaschta
    Kmaschta authored May 29, 2017
    Copy the full SHA
    3828607 View commit details

Commits on Sep 29, 2017

  1. Update filters on view initialization

    Florian FERBACH committed Sep 29, 2017
    Copy the full SHA
    234d4aa View commit details
Showing with 964 additions and 277 deletions.
  1. +0 −3 .bowerrc
  2. +0 −1 .gitignore
  3. +39 −0 CHANGELOG.md
  4. +5 −1 Makefile
  5. +6 −4 README.md
  6. +18 −0 build/ng-admin.min.css
  7. +1 −0 build/ng-admin.min.css.map
  8. +121 −0 build/ng-admin.min.js
  9. +1 −0 build/ng-admin.min.js.map
  10. +1 −1 doc/FAQ.md
  11. +2 −2 doc/Installation.md
  12. +13 −13 doc/reference/Field.md
  13. +3 −1 doc/reference/View.md
  14. +1 −2 examples/blog/config.js
  15. +11 −9 package.json
  16. +13 −12 src/javascripts/ng-admin/Crud/delete/BatchDeleteController.js
  17. +46 −30 src/javascripts/ng-admin/Crud/delete/DeleteController.js
  18. +1 −1 src/javascripts/ng-admin/Crud/delete/batchDelete.html
  19. +1 −1 src/javascripts/ng-admin/Crud/delete/delete.html
  20. +30 −6 src/javascripts/ng-admin/Crud/field/maDateField.js
  21. +1 −1 src/javascripts/ng-admin/Crud/field/maFileField.js
  22. +83 −69 src/javascripts/ng-admin/Crud/form/FormController.js
  23. +18 −7 src/javascripts/ng-admin/Crud/list/ListController.js
  24. +5 −6 src/javascripts/ng-admin/Crud/list/ListLayoutController.js
  25. +2 −1 src/javascripts/ng-admin/Crud/list/list.html
  26. +85 −26 src/javascripts/ng-admin/Crud/list/maDatagridInfinitePagination.js
  27. +74 −0 src/javascripts/test/unit/Crud/delete/BatchDeleteControllerSpec.js
  28. +44 −4 src/javascripts/test/unit/Crud/delete/DeleteControllerSpec.js
  29. +31 −0 src/javascripts/test/unit/Crud/field/maDateFieldSpec.js
  30. +155 −0 src/javascripts/test/unit/Crud/form/FormControllerSpec.js
  31. +37 −26 src/javascripts/test/unit/Crud/list/ListLayoutControllerSpec.js
  32. +116 −50 src/javascripts/test/unit/Crud/list/maDatagridInfinitePaginationSpec.js
3 changes: 0 additions & 3 deletions .bowerrc
View file

This file was deleted.

1 change: 0 additions & 1 deletion .gitignore
View file
Original file line number Diff line number Diff line change
@@ -8,7 +8,6 @@ lib/
node_modules
npm-debug.log
src/css
src/javascripts/bower_components
src/javascripts/config.js
src/javascripts/test/fixtures/examples/blog
src/styles/*.css
39 changes: 39 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,44 @@
CHANGELOG
=========
v1.0.7 - 2 Oct. 2017
---------------------

- Fix pinned filters not filtering with its initially selected value [\#1366](https://github.com/marmelab/ng-admin/pull/1366) ([floo51](https://github.com/floo51))

v1.0.6 - 27 Apr. 2017
---------------------

- Use http error service handlers inside view events [\#1339](https://github.com/marmelab/ng-admin/pull/1339) ([floo51](https://github.com/floo51))

v1.0.5 - 5 Apr. 2017
---------------------

- Fix view disabling not working on initialized views [\#1334](https://github.com/marmelab/ng-admin/pull/1336) ([floo51](https://github.com/floo51))

v1.0.3 - 3 Apr. 2017
---------------------

- Fix filter value not being updated based on search url parameter
[\#1333](https://github.com/marmelab/ng-admin/pull/1333)
([fzaninotto](https://github.com/fzaninotto))
- Fix not being able to type into date fields
[\#1334](https://github.com/marmelab/ng-admin/pull/1334)
([floo51](https://github.com/floo51))

v1.0.2 - 16 Mar. 2017
---------------------

- Increase the infinite scroll performance [\#1322](https://github.com/marmelab/ng-admin/pull/1322) ([Kmaschta](https://github.com/Kmaschta))
- Fix misleading typo on the documentation [\#1320](https://github.com/marmelab/ng-admin/pull/1320) ([matheo](https://github.com/matheo))

v1.0.1 - 08 Feb. 2017
---------------------

- Fix DateField infinite watches loop [\#1318](https://github.com/marmelab/ng-admin/pull/1318) ([Kmaschta](https://github.com/Kmaschta))
- Fix typos and links on the documentation [\#1310](https://github.com/marmelab/ng-admin/pull/1310) [\#1312](https://github.com/marmelab/ng-admin/pull/1312) ([escapedcat](https://github.com/escapedcat))
- Source-map are now published on NPM [\#1307](https://github.com/marmelab/ng-admin/pull/1307) ([beevelop](https://github.com/beevelop))
- Close HTML tags on FileField [\#1306](https://github.com/marmelab/ng-admin/pull/1306) ([beevelop](https://github.com/beevelop))
- Remove bower from the documentation [\#1303](https://github.com/marmelab/ng-admin/pull/1303) ([Kmaschta](https://github.com/Kmaschta))

v1.0.0 - 27 Jan. 2017
---------------------
6 changes: 5 additions & 1 deletion Makefile
View file
Original file line number Diff line number Diff line change
@@ -20,8 +20,9 @@ transpile:
cp -Rf ./src/sass/ lib/sass/

build:
rm -rf build/*
make transpile
NODE_ENV=production ./node_modules/webpack/bin/webpack.js -p --optimize-minimize --optimize-occurence-order --optimize-dedupe --progress --devtool --source-map
NODE_ENV=production ./node_modules/webpack/bin/webpack.js -p --optimize-minimize --optimize-occurence-order --optimize-dedupe --progress --devtool source-map
cp -Rf build examples/blog/
@echo "Files build/ng-admin.min.css and build/ng-admin.min.js updated (with minification)"

@@ -33,6 +34,9 @@ check-only-in-tests:
test-unit:
./node_modules/.bin/karma start src/javascripts/test/karma.conf.js --single-run

test-unit-watch:
./node_modules/.bin/karma start src/javascripts/test/karma.conf.js --watch

test-e2e: prepare-test-e2e
./node_modules/.bin/protractor src/javascripts/test/protractor.conf.js

10 changes: 6 additions & 4 deletions README.md
View file
Original file line number Diff line number Diff line change
@@ -10,16 +10,18 @@ Plug me to your RESTFul API to get a complete administration interface (datagrid
* [Online demo](http://marmelab.com/ng-admin-demo/) ([source](https://github.com/marmelab/ng-admin-demo))
* [Documentation](http://ng-admin-book.marmelab.com/)

**This project is now in maintenance mode. We've rebuilt it from scratch with React.js (the new project is called [react-admin](https://github.com/marmelab/react-admin)), and we're putting all our efforts on the React version.**

## Installation

The current ng-admin version (master) depends on Angular.js 1.4. If you need compatibility with Angular 1.3, use [ng-admin 0.9](https://github.com/marmelab/ng-admin/releases/tag/v0.9.1).
The current ng-admin version (master) depends on Angular.js 1.6. If you need compatibility with Angular 1.3, use [ng-admin 0.9](https://github.com/marmelab/ng-admin/releases/tag/v0.9.1).

Grab ng-admin from your favorite package manager, `npm` or `bower`:
Grab ng-admin from your favorite package manager:

```sh
npm install ng-admin --save
# or
bower install ng-admin --save
yarn add ng-admin
```

### With a Module Bundler
@@ -260,7 +262,7 @@ git add build
git commit -m 'update built files'
git push origin master
git tag vx.x.x
# publish to bower
# create a new tag
git push origin --tags
# publish to npm
npm publish
Loading