Commit Graph

75 Commits

Author SHA1 Message Date
Boris Cherny 1108243112 v4.0.3 2018-06-21 12:29:26 +03:00
Boris Cherny 75658b81ba add changelog 2018-06-21 12:28:35 +03:00
Boris Cherny fb55d349fd v4.0.2 2018-05-13 11:26:31 -07:00
Boris Cherny 348b30ff3e Merge pull request #83 from moshfeu/re-place-angular-types
#81 - Move angular types to devDependencies
2018-05-13 11:25:48 -07:00
Mosh Feu fc6fe7c4e6 #81 - Move angular types to devDependencies
So it will not force consumers to use angular types (In case of using custom types file)
2018-05-13 10:28:48 +03:00
Boris Cherny 1d9a24ba86 v4.0.1 2018-05-05 11:07:52 -07:00
Boris Cherny dc49188171 Merge pull request #74 from ajdaniel/master
fix: Override props with injections
2018-05-05 10:45:11 -07:00
Boris Cherny e2ccf8c4b8 Merge pull request #80 from arai-a/ngIsClass
Add $$ngIsClass class accessor to support older browsers
2018-05-05 10:43:40 -07:00
Andrew J Daniel 5bc1810407 fix: Override props with injections
If you have a prop and an injection with the same name (perhaps you defined it in a static propTypes class property) then the injection will take precedence and override any props with the same name.

Signed-off-by: Andrew J Daniel <adaniel@uk.ibm.com>
2018-05-02 13:16:55 +01:00
arai f361ac5b90 Add $$ngIsClass class accessor to support older browsers 2018-05-01 21:12:19 +09:00
Boris Cherny d0b8c336b2 v3.2.1 2018-02-08 23:17:18 -08:00
Boris Cherny b307f1b575 upgrade deps, cleanup old code 2018-02-08 23:16:54 -08:00
Boris Cherny 43b084e63a v3.2.0 2018-01-30 17:46:12 -08:00
Boris Cherny ac59a84562 update yarn.lock 2018-01-30 17:45:52 -08:00
Boris Cherny 64e98b0a48 Merge pull request #66 from rkomiyama/patch-2
Added missing square closing bracket
2018-01-22 14:06:01 -08:00
Ryu Komiyama 5fc50367b8 Added missing square closing bracket 2018-01-22 16:42:26 -05:00
Boris Cherny deea3723ed Merge pull request #63 from coatue-oss/greenkeeper/browserify-15.1.0
Update browserify to the latest version 🚀
2018-01-11 15:58:39 -08:00
greenkeeper[bot] 0549878a8a chore(package): update browserify to version 15.1.0 2018-01-11 14:53:54 +00:00
Boris Cherny 4b6b6a9e4d Merge pull request #60 from coatue-oss/greenkeeper/browserify-15.0.0
Update browserify to the latest version 🚀
2018-01-10 21:41:48 -08:00
greenkeeper[bot] b5afa3bb8b chore(package): update browserify to version 15.0.0 2018-01-04 19:32:25 +00:00
Boris Cherny f3519981f0 Merge pull request #57 from coatue-oss/greenkeeper/karma-2.0.0
Update karma to the latest version 🚀
2017-12-29 14:55:13 -08:00
greenkeeper[bot] 5f167cd712 chore(package): update karma to version 2.0.0 2017-12-21 17:35:20 +00:00
Boris Cherny a4a68c23e6 update docs 2017-12-11 09:20:06 -08:00
Boris Cherny d95d61291b clean up test 2017-12-11 09:17:19 -08:00
Boris Cherny 2a3ddd8ba8 Merge pull request #49 from fand/di
Add injectNames to use DI in react2angular
2017-12-11 11:57:06 -05:00
fand 365786bfba Fix reference to prop-types 2017-12-07 10:33:27 +09:00
fand 893bdc5c69 Test that bindingNames and propTypes overrides injectedProps 2017-12-07 10:24:16 +09:00
fand 8e03472671 Test if props in injectedProps are injected correctly 2017-12-07 10:24:16 +09:00
fand 225b37ec26 this.injectedProps must be an object 2017-12-07 10:24:16 +09:00
fand 192d590c82 Reverse the order of props and injectedProps to prioritize props 2017-12-07 10:24:16 +09:00
fand 9bcc7c52a5 Remove "as any" 2017-12-07 10:24:16 +09:00
fand 870d6ec0ea Add injectNames argument to react2angular 2017-12-07 10:24:16 +09:00
Boris Cherny cf65d0dd05 upgrade dependencies, fix license field in package.json 2017-11-22 18:48:56 -08:00
Boris Cherny b9cb639ed6 Merge pull request #53 from assignar/react-typings-fix
Fix typescript @types dependencies
2017-11-22 18:41:34 -08:00
Chappo d03cfbad88 Changes react types to be peer dependencies to allow consuming package to manage their version 2017-11-22 22:01:52 +11:00
Boris Cherny ccf48bab47 Merge pull request #44 from coatue-oss/greenkeeper/@types/react-dom-16.0.0
Update @types/react-dom to the latest version 🚀
2017-10-22 09:06:03 -06:00
greenkeeper[bot] 2109df6e8b fix(package): update @types/react-dom to version 16.0.0 2017-10-03 16:36:33 +00:00
Boris Cherny 8b7209d1c8 explicitly update react2angular (fix #42) 2017-10-02 15:39:18 -07:00
Boris Cherny 234058fb65 pathological v bump => 3.0.0 2017-09-26 11:26:46 -07:00
Boris Cherny 47ff21f922 upgrade deps, add yarn lockfile 2017-09-26 11:26:05 -07:00
Boris Cherny 3f51627407 Merge pull request #37 from frankandrobot/angular-fix
works with older angular
2017-09-14 10:03:52 -07:00
Uriel Avalos 77942b45de Require correct old angular version 2017-09-14 08:48:40 -05:00
Uriel Avalos a870a8d5d9 works with older angular 2017-09-14 08:33:16 -05:00
Boris Cherny 791681b612 fix build, v bump => 2.0.0 2017-08-31 23:05:04 -07:00
Boris Cherny 19f61366b1 Merge pull request #35 from capaj/patch-1
fixes #33
2017-08-31 23:00:38 -07:00
Jiri Spac d8a6d4ab80 fixes #33 2017-08-31 17:06:15 +02:00
Boris Cherny 3653f8a08c fix build, add tests for when component takes no props (see #31) 2017-08-02 14:55:36 -07:00
Boris Cherny 7425713295 Merge pull request #20 from coatue-oss/greenkeeper/rollupify-0.4.0
Update rollupify to the latest version 🚀
2017-07-12 13:15:04 -07:00
greenkeeper[bot] f6bc14d02e chore(package): update rollupify to version 0.4.0 2017-06-19 18:00:29 +00:00
Boris Cherny 7484cf4fc3 housekeeping 2017-04-27 18:03:04 -07:00