Commit Graph

479 Commits

Author SHA1 Message Date
Hevin
5d42764438 Merge branch 'master' into dev 2017-06-30 10:57:54 +08:00
Hevin
a5a03a3214 Merge pull request #249 from snipking/master
check does `com.apple.Push` attribute exist in .pbxproj
2017-06-30 10:52:56 +08:00
DerekChia jingqiang.jia@hand-china.com
7b70564f82 add: check does com.apple.Push attribute exist in .pbxproj to avoid not found error. 2017-06-29 15:15:12 +08:00
DerekChia jingqiang.jia@hand-china.com
6059f546f6 Merge remote-tracking branch 'jpush/master' 2017-06-29 15:07:28 +08:00
Hevin
d855a07271 Merge branch 'dev' 2017-06-29 10:55:27 +08:00
Hevin
c1e70448b1 Update plugin version to 3.1.9 2017-06-29 10:55:07 +08:00
Hevin
a9f6adb7af Merge branch 'master' into dev 2017-06-29 10:04:08 +08:00
Hevin
847d94c080 Merge pull request #248 from snipking/master
fix #245
2017-06-29 09:51:55 +08:00
DerekChia jingqiang.jia@hand-china.com
c959fdddeb add: check does ios.release.developmentTeam exist in build.json
fix #245
2017-06-28 16:50:26 +08:00
DerekChia jingqiang.jia@hand-china.com
4285170332 Merge remote-tracking branch 'jpush/master' 2017-06-28 16:50:04 +08:00
Hevin
86f07c9729 Merge branch 'dev' 2017-06-28 10:00:16 +08:00
Hevin
e3d8d69147 Fix spelling error. 2017-06-28 09:59:57 +08:00
Hevin
8970e44dc1 Merge branch 'dev' 2017-06-27 10:23:48 +08:00
Hevin
7f3682e2a8 fix #244 2017-06-27 10:23:33 +08:00
Hevin
dd716aaca7 Merge branch 'master' into dev 2017-06-23 16:30:32 +08:00
Hevin
f5394d6d01 Merge pull request #243 from snipking/master
fix #242
2017-06-23 16:29:09 +08:00
DerekChia jingqiang.jia@hand-china.com
2fc0bc9213 Merge remote-tracking branch 'jpush/master' 2017-06-23 14:33:15 +08:00
DerekChia jingqiang.jia@hand-china.com
4bc2fe3dc1 fix #242 2017-06-23 14:31:46 +08:00
Hevin
3bf9dae294 Merge branch 'dev' 2017-06-22 12:31:18 +08:00
Hevin
ca88f5878a Update npm version 2017-06-22 12:31:00 +08:00
Hevin
8d9a7fa8b0 Add getConnectionState API 2017-06-22 12:30:47 +08:00
Hevin
dead85a931 Merge branch 'dev' 2017-06-21 13:05:04 +08:00
Hevin
95330b11ed Fix spelling error 2017-06-21 13:04:42 +08:00
hevin
cba5ffbabb Merge branch 'dev' 2017-06-14 14:02:52 +08:00
hevin
d524d8db00 Update README 2017-06-14 14:02:19 +08:00
DerekChia jingqiang.jia@hand-china.com
e20a10588f Merge remote-tracking branch 'jpush/master' 2017-06-06 13:57:52 +08:00
DerekChia jingqiang.jia@hand-china.com
eefc2e13cb fix typo 2017-06-06 13:57:38 +08:00
hevin
e8417df550 Merge branch 'master' into dev 2017-06-06 13:54:48 +08:00
Hevin
89293001e8 Merge pull request #235 from snipking/master
After hook to turn on 'Push Notification' switch on Xcode 8
2017-06-06 13:47:46 +08:00
Hevin
78222b7123 Merge branch 'dev' 2017-06-06 09:55:11 +08:00
Hevin
1fb48e886f Remove community link 2017-06-06 09:50:26 +08:00
DerekChia jingqiang.jia@hand-china.com
28a9c298c8 Remove useless execution path log 2017-06-05 22:09:22 +08:00
DerekChia jingqiang.jia@hand-china.com
c65c5a4057 After hook to turn on 'Push Notification' switch on Xcode 8 2017-06-05 21:55:55 +08:00
hevin
6a47116b82 Merge branch 'dev' 2017-06-05 19:51:34 +08:00
hevin
68b217d8a8 Remove unused link 2017-06-05 19:49:33 +08:00
hevin
13b36b746c Merge branch 'dev' 2017-05-31 17:37:08 +08:00
hevin
b234861e44 Fix package name 2017-05-31 17:34:53 +08:00
hevin
2287ef10dd Optimize ios native methods
- setTags
- setAlias
- setTagsWithAlias
2017-05-26 20:46:21 +08:00
Hevin
2a05ea1784 Merge branch 'master' into dev 2017-05-26 16:18:08 +08:00
Hevin
9d3d32d725 Optimize API
- setTags
- setAlias
- setTagsAndAlias
2017-05-26 16:17:54 +08:00
hevin
3c88e87b17 Merge branch 'dev' 2017-05-24 14:46:02 +08:00
hevin
b3b2af1520 Change package name 2017-05-24 14:43:22 +08:00
hevin
6e8b5931fb Update package name & npm version 2017-05-24 11:20:52 +08:00
hevin
23ed4817a4 Update .gitignore 2017-05-16 22:15:59 +08:00
Hevin
9a1da318cc Merge remote-tracking branch 'refs/remotes/origin/master' into dev 2017-05-15 16:15:00 +08:00
lhw5123
2fab3a9e60 Update npm version. 2017-05-10 17:29:31 +08:00
lhw5123
a032906b1f Merge branch 'dev' 2017-05-10 16:53:03 +08:00
lhw5123
d362ee788b Update Android SDK to v3.0.6 2017-05-10 16:51:28 +08:00
huangminlinux
50588d593c update jpush to 3.0.5 2017-05-03 16:33:44 +08:00
lhw5123
ea06f04415 Merge branch 'dev' 2017-05-02 23:24:40 +08:00