This repository was archived by the owner on Sep 8, 2020. It is now read-only.

Angular1.2#56

Merged

thgreasi merged 13 commits intoangular-ui:angular1.2from

CyborgMaster:angular1.2

Nov 19, 2013

Commits on Nov 9, 2013

Standardize to 2 spaces for indents

Jeremy Mickelson
authored and
Jeremy Mickelson
committed
Use a different strategy for working with Angular that works with Angular 1.2 ng-repeat comments. angular-ui/ui-sortable#48

Jeremy Mickelson
authored and
Jeremy Mickelson
committed
Added the watch on the callbacks to as smithkl42 suggested. angular-ui/ui-sortable#48

Jeremy Mickelson
authored and
Jeremy Mickelson
committed
Supported cusotm placeholders by excluding the placeholder based on it's class, not the default ui-sortable-placeholder class. angular-ui/ui-sortable#48

Jeremy Mickelson
authored and
Jeremy Mickelson
committed
Added support for drag and drop between lists (idea taken from filipkis' comment). angular-ui/ui-sortable#48

Jeremy Mickelson
authored and
Jeremy Mickelson
committed

Commits on Nov 12, 2013

Fix drag and drop between lists. (This has been tested carefully, should be working now).

Jeremy Mickelson
authored and
Jeremy Mickelson
committed
Spell received correctly.

Jeremy Mickelson
authored and
Jeremy Mickelson
committed

Commits on Nov 13, 2013

Don't modify the model if the item was dropped in the same place it started

Jeremy Mickelson
authored and
Jeremy Mickelson
committed
Correctly detect the placeholder even if a placeholder class has been provided in the options

Jeremy Mickelson
authored and
Jeremy Mickelson
committed

Commits on Nov 18, 2013

Merge remote-tracking branch 'angular-ui/master' into angular1.2

Jeremy Mickelson
authored and
Jeremy Mickelson
committed
Merge remote-tracking branch 'angular-ui/master' into angular1.2

Jeremy Mickelson
authored and
Jeremy Mickelson
committed
Changed bowerfile to require angular 1.2

Jeremy Mickelson
authored and
Jeremy Mickelson
committed
Fixed broken tests

Jeremy Mickelson
authored and
Jeremy Mickelson
committed