Skip to content
This repository has been archived by the owner on Sep 4, 2020. It is now read-only.

Merge v2.0.x into master #1736

Merged
merged 81 commits into from May 25, 2017
Merged
Show file tree
Hide file tree
Changes from 80 commits
Commits
Show all changes
81 commits
Select commit Hold shift + click to select a range
aca6011
Added partial Android FCM support (#975)
jcesarmobile Jun 10, 2016
06aa1a7
Fixed empty token on android first run (#1008)
jcesarmobile Jun 20, 2016
c2f4954
Removed GCM files and added FCM files
jcesarmobile Jul 18, 2016
18b2723
Added .framework files as custom frameworks
jcesarmobile Jul 18, 2016
458a025
Changed code to work with FCM
jcesarmobile Jul 18, 2016
5635651
Added hook and resource file to copy GoogleService-Info.plist
jcesarmobile Jul 20, 2016
32333ce
fixed registration and removed unused code
jcesarmobile Jul 20, 2016
4bbc818
Use CocoaPods
jcesarmobile Nov 5, 2016
684a07c
Fix rebase errors
macdonst Nov 22, 2016
0a0521f
Fix topic subscription and unsubscription on FCM
jcesarmobile Nov 22, 2016
67069af
Refactor GCMIntentService to FCMService
macdonst Nov 24, 2016
bef73be
Issue #689: Remove sender id from PushNotification init Android options
macdonst Nov 24, 2016
c8394e2
Issue #689: Remove sender id from PushNotification init iOS options
macdonst Nov 25, 2016
d0bc2a8
:memo: Update to using fcm-node
macdonst Nov 28, 2016
4645efc
:bug: Issue #1188: Strings.xml google_app_id conflict with google-ser…
macdonst Nov 29, 2016
4270a50
Add empty google services plist
macdonst Nov 29, 2016
531de4e
Pin FCM to 9.8.0
macdonst Nov 30, 2016
8544202
:wrench: Add browser platform back for FCM branch
macdonst Dec 1, 2016
00a38d7
:hammer::wrench::arrow_up: Use Babel to transpile ES2015 code
macdonst Dec 2, 2016
52d54c4
:wrench: add tern to gitignore
macdonst Dec 13, 2016
6df9706
:bookmark: Bumping plugin version to 2.0.0-rc1
macdonst Dec 13, 2016
368de77
2.0.0-rc1
macdonst Dec 13, 2016
6c58cee
Updating CHANGELOG
macdonst Dec 13, 2016
706dcbf
Fixing my merge error for PR #1378 Optional event emit instead of fun…
macdonst Dec 14, 2016
dbe3964
:bug::apple: Issue #1461: App crashes when initialising with topics (…
macdonst Dec 15, 2016
41be377
:bug::penguin::memo::arrow_up: #1460: Build Issue Android
macdonst Dec 15, 2016
96d6bc7
:bug::apple::wrench: Fixing a merge issue where aps-environment was a…
macdonst Dec 21, 2016
107e600
:penguin::memo::bug: Issue #1470: Cannot install phonegap-plugin-push…
macdonst Dec 21, 2016
1d05980
:memo: Using a newer version on the examples
fredgalvao Dec 21, 2016
5ee535a
:apple::bug: Issue #1497: App crashes after refreshing when using FCM…
macdonst Jan 4, 2017
a9c7df3
Bumping plugin version to 2.0.0-rc2
macdonst Jan 5, 2017
7eb6abf
2.0.0-rc2
macdonst Jan 5, 2017
df61d02
Updating CHANGELOG
macdonst Jan 5, 2017
1887154
Added partial Android FCM support (#975)
jcesarmobile Jun 10, 2016
3b35e84
Removed GCM files and added FCM files
jcesarmobile Jul 18, 2016
ddfb22b
Changed code to work with FCM
jcesarmobile Jul 18, 2016
3b69d69
Added hook and resource file to copy GoogleService-Info.plist
jcesarmobile Jul 20, 2016
1cb32e1
Use CocoaPods
jcesarmobile Nov 5, 2016
e6723c5
Fix rebase errors
macdonst Nov 22, 2016
089d9af
Issue #689: Remove sender id from PushNotification init Android options
macdonst Nov 24, 2016
85b3d8b
:bug: Issue #1188: Strings.xml google_app_id conflict with google-ser…
macdonst Nov 29, 2016
316fa81
Pin FCM to 9.8.0
macdonst Nov 30, 2016
e8b1d07
:wrench: Add browser platform back for FCM branch
macdonst Dec 1, 2016
fa23bc9
:hammer::wrench::arrow_up: Use Babel to transpile ES2015 code
macdonst Dec 2, 2016
9ad1866
:wrench: add tern to gitignore
macdonst Dec 13, 2016
fa7f3ea
:bookmark: Bumping plugin version to 2.0.0-rc1
macdonst Dec 13, 2016
e7be897
:bug::penguin::memo::arrow_up: #1460: Build Issue Android
macdonst Dec 15, 2016
e3c63a9
Bumping plugin version to 2.0.0-rc2
macdonst Jan 5, 2017
271ee0f
Added partial Android FCM support (#975)
jcesarmobile Jun 10, 2016
094f173
Removed GCM files and added FCM files
jcesarmobile Jul 18, 2016
0b1adf5
Added hook and resource file to copy GoogleService-Info.plist
jcesarmobile Jul 20, 2016
d45c062
Use CocoaPods
jcesarmobile Nov 5, 2016
8dc6b43
Fix rebase errors
macdonst Nov 22, 2016
2f97e82
:bug: Issue #1188: Strings.xml google_app_id conflict with google-ser…
macdonst Nov 29, 2016
b97506f
Updating CHANGELOG
macdonst Dec 13, 2016
624a748
:pencil2: fixing error in CHANGELOG
macdonst Jan 4, 2017
62049bb
Bumping plugin version to 2.0.0-rc2
macdonst Jan 5, 2017
c258e80
Updating CHANGELOG
macdonst Jan 5, 2017
e2c2f3f
Added partial Android FCM support (#975)
jcesarmobile Jun 10, 2016
6e03b71
Removed GCM files and added FCM files
jcesarmobile Jul 18, 2016
e48f205
Changed code to work with FCM
jcesarmobile Jul 18, 2016
9a30f6a
Added hook and resource file to copy GoogleService-Info.plist
jcesarmobile Jul 20, 2016
8cad612
fixed registration and removed unused code
jcesarmobile Jul 20, 2016
bf5b3a2
Use CocoaPods
jcesarmobile Nov 5, 2016
2260157
Fix rebase errors
macdonst Nov 22, 2016
46a0df7
Issue #689: Remove sender id from PushNotification init Android options
macdonst Nov 24, 2016
7877919
Issue #689: Remove sender id from PushNotification init iOS options
macdonst Nov 25, 2016
589f42b
:bug: Issue #1188: Strings.xml google_app_id conflict with google-ser…
macdonst Nov 29, 2016
0e40f33
:wrench: add tern to gitignore
macdonst Dec 13, 2016
79ef98e
:bookmark: Bumping plugin version to 2.0.0-rc1
macdonst Dec 13, 2016
6c0cb26
Bumping plugin version to 2.0.0-rc2
macdonst Jan 5, 2017
4e89dd5
Remove hook and use resource-file tag to copy google services file
macdonst May 3, 2017
0b5fedc
Add resource-file way of copying google services files
macdonst May 5, 2017
781182a
Bump requirements
macdonst May 5, 2017
f0e67cd
:wrench: Update cordovaDependencies
macdonst May 8, 2017
358f770
:bookmark: Bumping plugin version to 2.0.0-rc3
macdonst May 8, 2017
7af6f8a
2.0.0-rc3
macdonst May 8, 2017
6e9ea9a
Updating CHANGELOG
macdonst May 8, 2017
e5739b8
Fixes 'framework not found GoogleToolboxForMac' linker error in 2.0.0…
shazron May 9, 2017
09344ef
Remove unused files (#1732)
jcesarmobile May 23, 2017
c2b15d8
Remove GTM framework. (#1739)
shazron May 25, 2017
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
18 changes: 18 additions & 0 deletions .babelrc
@@ -0,0 +1,18 @@
{
"presets": [
"es2015"
],
"plugins": [
["add-header-comment", {
"files": {
"src/js/push.js": {
"header": [
"This file has been generated by Babel.\n",
"DO NOT EDIT IT DIRECTLY\n",
"Edit the JS source file src/js/push.js"
]
}
}
}]
]
}
2 changes: 1 addition & 1 deletion .editorconfig
Expand Up @@ -6,7 +6,7 @@ root = true
[*]
charset = utf-8
end_of_line = lf
indent_size = 4
indent_size = 2
indent_style = space
insert_final_newline = true
trim_trailing_whitespace = true
Expand Down
17 changes: 17 additions & 0 deletions .eslintrc
@@ -0,0 +1,17 @@
{
"extends": "airbnb",
"parser": "babel-eslint",
"ecmaFeatures": {
"experimentalObjectRestSpread": true
},
"rules": {
"spaced-comment": 0,
"no-console": 0,
"no-unused-expressions": [2, { "allowShortCircuit": true }]
},
"env": {
"node": true,
"mocha": true,
"browser": true
}
}
75 changes: 30 additions & 45 deletions .github/CONTRIBUTING.md
Expand Up @@ -41,33 +41,33 @@ git commit -m "Cool stuff"
```

Consider starting the commit message with an applicable emoji:
* :art: `:art:` when improving the format/structure of the code
* :zap: `:zap:` when improving performance
* :non-potable_water: `:non-potable_water:` when plugging memory leaks
* :memo: `:memo:` when writing docs
* :ambulance: `:ambulance:` a critical hotfix.
* :sparkles: `:sparkles:` when introducing new features
* :bookmark: `:bookmark:` when releasing / version tags
* :rocket: `:rocket:` when deploying stuff
* :penguin: `:penguin:` when fixing something on Android
* :apple: `:apple:` when fixing something on iOS
* :checkered_flag: `:checkered_flag:` when fixing something on Windows
* :bug: `:bug:` when fixing a bug
* :fire: `:fire:` when removing code or files
* :green_heart: `:green_heart:` when fixing the CI build
* :white_check_mark: `:white_check_mark:` when adding tests
* :lock: `:lock:` when dealing with security
* :arrow_up: `:arrow_up:` when upgrading dependencies
* :arrow_down: `:arrow_down:` when downgrading dependencies
* :shirt: `:shirt:` when removing linter warnings
* :hammer: `:hammer:` when doing heavy refactoring
* :heavy_minus_sign: `:heavy_minus_sign:` when removing a dependency.
* :heavy_plus_sign: `:heavy_plus_sign:` when adding a dependency.
* :wrench: `:wrench:` when changing configuration files.
* :globe_with_meridians: `:globe_with_meridians:` when dealing with internationalization and localization.
* :pencil2: `:pencil2:` when fixing typos.
* :hankey: `:hankey:` when writing bad code that needs to be improved.
* :package: `:package:` when updating compiled files or packages.
* :art: `:art:` when improving the format/structure of the code
* :zap: `:zap:` when improving performance
* :non-potable_water: `:non-potable_water:` when plugging memory leaks
* :memo: `:memo:` when writing docs
* :ambulance: `:ambulance:` a critical hotfix.
* :sparkles: `:sparkles:` when introducing new features
* :bookmark: `:bookmark:` when releasing / version tags
* :rocket: `:rocket:` when deploying stuff
* :penguin: `:penguin:` when fixing something on Android
* :apple: `:apple:` when fixing something on iOS
* :checkered_flag: `:checkered_flag:` when fixing something on Windows
* :bug: `:bug:` when fixing a bug
* :fire: `:fire:` when removing code or files
* :green_heart: `:green_heart:` when fixing the CI build
* :white_check_mark: `:white_check_mark:` when adding tests
* :lock: `:lock:` when dealing with security
* :arrow_up: `:arrow_up:` when upgrading dependencies
* :arrow_down: `:arrow_down:` when downgrading dependencies
* :shirt: `:shirt:` when removing linter warnings
* :hammer: `:hammer:` when doing heavy refactoring
* :heavy_minus_sign: `:heavy_minus_sign:` when removing a dependency.
* :heavy_plus_sign: `:heavy_plus_sign:` when adding a dependency.
* :wrench: `:wrench:` when changing configuration files.
* :globe_with_meridians: `:globe_with_meridians:` when dealing with internationalization and localization.
* :pencil2: `:pencil2:` when fixing typos.
* :hankey: `:hankey:` when writing bad code that needs to be improved.
* :package: `:package:` when updating compiled files or packages.

Make sure your branch is up to date with the original repo:

Expand Down Expand Up @@ -100,23 +100,8 @@ The project uses [.editorconfig](http://editorconfig.org/) to define the coding
style of each file. We recommend that you install the Editor Config extension
for your preferred IDE. Consistency is key.

## JSHint
## ESLint

The project uses [.jshint](http://jshint.com/docs) to define the JavaScript
coding conventions. Most editors now have a JSHint add-on to provide on-save
The project uses [.eslint](http://eslint.org/) to define the JavaScript
coding conventions. Most editors now have a ESLint add-on to provide on-save
or on-edit linting.

### Install JSHint for vim

1. Install [jshint](https://www.npmjs.com/package/jshint).
1. Install [jshint.vim](https://github.com/wookiehangover/jshint.vim).

### Install JSHint for Sublime

1. Install [Package Control](https://packagecontrol.io/installation)
1. Restart Sublime
1. Type `CMD+SHIFT+P`
1. Type _Install Package_
1. Type _JSHint Gutter_
1. Sublime -> Preferences -> Package Settings -> JSHint Gutter
1. Set `lint_on_load` and `lint_on_save` to `true`
1 change: 1 addition & 0 deletions .gitignore
Expand Up @@ -3,3 +3,4 @@
.DS_Store
/node_modules/
npm-debug.log
.tern-project
30 changes: 0 additions & 30 deletions .jshintrc

This file was deleted.