Skip to content

Commit 9b310f7

Browse files
committed
Merge pull request #509 from Martii/authStuff
JSON primary name alphabetize and white space expand strategies Auto-merge
2 parents 928ae77 + cc7dfa1 commit 9b310f7

File tree

1 file changed

+68
-17
lines changed

1 file changed

+68
-17
lines changed

controllers/strategies.json

Lines changed: 68 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,70 @@
11
{
2-
"github" : { "name" : "GitHub", "oauth" : true },
3-
"facebook" : { "name" : "Facebook", "oauth" : true },
4-
"google" : { "name" : "Google", "oauth" : false },
5-
"persona" : { "name" : "Mozilla Persona", "oauth" : false },
6-
"yahoo" : { "name" : "Yahoo!", "oauth" : false },
7-
"aol" : { "name" : "AOL", "oauth" : false },
8-
"twitter" : { "name" : "Twitter", "oauth" : true },
9-
"flickr" : { "name" : "Flickr", "oauth" : true },
10-
"linkedin" : { "name" : "LinkedIn", "oauth" : true },
11-
"reddit" : { "name" : "Reddit", "oauth" : true },
12-
"imgur" : { "name" : "Imgur", "oauth" : true },
13-
"amazon" : { "name" : "Amazon", "oauth" : true },
14-
"windowslive" : { "name" : "Windows Live", "oauth" : true },
15-
"tumblr" : { "name" : "Tumblr", "oauth" : true },
16-
"foursquare" : { "name" : "Foursquare", "oauth" : true },
17-
"instagram" : { "name" : "Instagram", "oauth" : true },
18-
"steam" : { "name" : "Steam", "oauth" : false }
2+
"amazon": {
3+
"name": "Amazon",
4+
"oauth": true
5+
},
6+
"aol": {
7+
"name": "AOL",
8+
"oauth": false
9+
},
10+
"facebook": {
11+
"name": "Facebook",
12+
"oauth": true
13+
},
14+
"flickr": {
15+
"name": "Flickr",
16+
"oauth": true
17+
},
18+
"foursquare": {
19+
"name": "Foursquare",
20+
"oauth": true
21+
},
22+
"github": {
23+
"name": "GitHub",
24+
"oauth": true
25+
},
26+
"google": {
27+
"name": "Google",
28+
"oauth": false
29+
},
30+
"imgur": {
31+
"name": "Imgur",
32+
"oauth": true
33+
},
34+
"instagram": {
35+
"name": "Instagram",
36+
"oauth": true
37+
},
38+
"linkedin": {
39+
"name": "LinkedIn",
40+
"oauth": true
41+
},
42+
"persona": {
43+
"name": "Mozilla Persona",
44+
"oauth": false
45+
},
46+
"reddit": {
47+
"name": "Reddit",
48+
"oauth": true
49+
},
50+
"steam": {
51+
"name": "Steam",
52+
"oauth": false
53+
},
54+
"tumblr": {
55+
"name": "Tumblr",
56+
"oauth": true
57+
},
58+
"twitter": {
59+
"name": "Twitter",
60+
"oauth": true
61+
},
62+
"yahoo": {
63+
"name": "Yahoo!",
64+
"oauth": false
65+
},
66+
"windowslive": {
67+
"name": "Windows Live",
68+
"oauth": true
69+
}
1970
}

0 commit comments

Comments
 (0)