Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Tn 1207 cms integration #146

Open
wants to merge 162 commits into
base: master
Choose a base branch
from
Open

Tn 1207 cms integration #146

Changes from 1 commit
Commits
Show all changes
162 commits
Select commit Hold shift + click to select a range
76a5f70
Committing 0.8.1-69 as a new branch.
Feb 16, 2019
be9d3c6
Reverting 0.8.3 changes to get a truly clean version of 0.8.1
Feb 16, 2019
d45dacb
adding the rotuer changes from 0.8.3
Feb 16, 2019
0787e8d
Updating package version to reflect 0.8.3-0
Feb 16, 2019
647d880
Revision from 0.8.1-69 to 0.8.3-1
Feb 16, 2019
ef40282
Fixing package to not reference koa.
Feb 16, 2019
37724d4
Revision from 0.8.1-69 to 0.8.3-1 and not koa
Feb 16, 2019
8f4faf3
Updating Router to look more like the original 0.8.3 change set. Rem…
Feb 16, 2019
c199e3d
Fixing Async issue in public content
Feb 16, 2019
ce9eaae
Merge pull request #106 from careerbuilder/double-callback-fix
bradleylowenstein Feb 18, 2019
70d9059
Triiger the version process
JoseDomingoMoraNunezCB Feb 18, 2019
38bcf22
Merge pull request #107 from careerbuilder/feature/verify-version-tri…
JoseDomingoMoraNunezCB Feb 18, 2019
ed44db2
[skip ci] 0.8.3-3
Feb 19, 2019
470c0f8
Adding salesforce sso without callback
Feb 20, 2019
b4773f3
Adding login salesforce callback, pending user registration to mongo'…
Feb 20, 2019
02dd1ff
Saving user in the mongo's db
Feb 20, 2019
fab45e2
removing console.logs
Feb 20, 2019
40acc54
Merge pull request #108 from careerbuilder/feature/tn-970-migrate-sf-…
DanielCoello Feb 26, 2019
4dff342
[skip ci] 0.8.3-4
Feb 26, 2019
0ee926f
Adding redirect when the user doesn't exists.
Feb 28, 2019
1aae0e5
Merge pull request #109 from careerbuilder/feature/tn-970-redirect-to…
DanielCoello Feb 28, 2019
0cf2fd5
[skip ci] 0.8.3-5
Feb 28, 2019
6ba3c76
enabling state param to the login
Mar 13, 2019
fa82748
Merge pull request #110 from careerbuilder/feature/tn-1020-allow-logi…
DanielCoello Mar 15, 2019
2206e52
[skip ci] 0.8.3-6
Mar 15, 2019
296d11b
Add highPriorityToRegister flag to the state params
Mar 18, 2019
3106ee5
Merge pull request #111 from careerbuilder/feature/tn-1035-allow-prio…
DanielCoello Mar 18, 2019
bc5fb52
[skip ci] 0.8.3-7
Mar 18, 2019
d81ab20
Adding logout endpoint with the revoke of the salesforce's session.
Mar 21, 2019
fb576a1
Adding Sindy's observations
Mar 21, 2019
5c8a7b9
Merge pull request #112 from careerbuilder/feature/tn-1034-logout-wit…
DanielCoello Mar 22, 2019
e5d8ef1
[skip ci] 0.8.3-8
Mar 22, 2019
791825e
Adding service and implementation of the email update in mongo's coll…
Mar 28, 2019
fde0896
Adding Domingo's observations
Mar 28, 2019
e99d4c2
Merge pull request #113 from careerbuilder/feature/tn-958-email-updat…
DanielCoello Mar 28, 2019
013799a
[skip ci] 0.8.3-9
Mar 28, 2019
5740b7f
Adding custom logout implementation
Mar 29, 2019
73a4d41
Merge pull request #114 from careerbuilder/feature/tn-1054-logout-red…
DanielCoello Mar 29, 2019
4486164
[skip ci] 0.8.3-10
Mar 29, 2019
6cb0666
remove reponse check
lyliuCB Apr 4, 2019
b53571b
Merge pull request #115 from careerbuilder/feature/clear-local-cookie
bradleylowenstein Apr 9, 2019
488b9dc
[skip ci] 0.8.3-11
Apr 9, 2019
9696f08
TN-1084 Register option for SF
Apr 10, 2019
4f4de76
Merge pull request #116 from careerbuilder/feature/TN-1084-DM-add-reg…
jwwcb Apr 11, 2019
ce35d6f
[skip ci] 0.8.3-12
Apr 11, 2019
43a2e3e
TN-1084 allow use of the login process to obtain an URL to be used fo…
Apr 16, 2019
c5b1066
Merge pull request #117 from careerbuilder/feature/TN-1084-DM-hack-us…
bradleylowenstein Apr 17, 2019
726ce04
[skip ci] 0.8.3-13
Apr 17, 2019
f81b5ca
remove a empty line
lyliuCB Apr 17, 2019
8223f8b
Merge pull request #118 from careerbuilder/empty-pr-to-release
lynnliuCB Apr 17, 2019
6ec4a04
[skip ci] 0.8.3-14
Apr 17, 2019
c7f7c2f
reverse-proxy-work-base-route add changes to handle prefix value in a…
Apr 17, 2019
89eb276
reverse-proxy-work-base-route Shenghua's proposed changes included
Apr 17, 2019
9f3033e
fix admin redirect and search and join issue
cecilliaQin Apr 18, 2019
2131717
hack html response
vokidya Apr 18, 2019
a5bdc08
hack on js file
vokidya Apr 18, 2019
39af11a
reverse-proxy-work-base-route added middleware to intercept output
Apr 18, 2019
144921d
add other hack to the middleware
vokidya Apr 19, 2019
565d612
add fix
vokidya Apr 19, 2019
798a181
update regrex
vokidya Apr 19, 2019
ff1c7bc
add the hack for ng-href in jQuery
vokidya Apr 22, 2019
d812f8d
fix
vokidya Apr 22, 2019
fd549ba
fix static file not load issue
vokidya Apr 22, 2019
94ef928
fix multi redirect issue
vokidya Apr 22, 2019
16743d8
fix admin login issue
vokidya Apr 22, 2019
32d1bf3
fix multiple lines regex not working issue
vokidya Apr 22, 2019
fb0a64a
fix static files regex replacesment not working
vokidya Apr 22, 2019
1197d02
skip the url replacement for admin
vokidya Apr 22, 2019
4d59fad
add more hacks
vokidya Apr 22, 2019
5467285
add more hacks
cecilliaQin Apr 22, 2019
93f447e
add image prefix in css files
vokidya Apr 22, 2019
75f8258
Merge pull request #119 from careerbuilder/feature/reverse-proxy-work…
bradleylowenstein Apr 22, 2019
f001dc8
[skip ci] 0.8.3-15
Apr 22, 2019
bba634b
reverse-proxy-work replace harcoded prefix values with read from setting
Apr 22, 2019
c95ff06
reverse-proxy-work add origin setting
cecilliaQin Apr 23, 2019
6de1a11
add disableHtmlPrefix to disable prex
vokidya Apr 23, 2019
82dec55
Merge pull request #120 from careerbuilder/bugfix/reverse-proxy-work-…
bradleylowenstein Apr 23, 2019
a664ca5
[skip ci] 0.8.3-16
Apr 23, 2019
18ee594
update request.url instead of update routes
vokidya Apr 24, 2019
7cd1a1e
Merge pull request #122 from careerbuilder/bugfix/reverse-proxy-work
bradleylowenstein Apr 24, 2019
93db107
[skip ci] 0.8.3-17
Apr 24, 2019
d8c6ac1
reverse-proxy-work callback aware of prefix and/or origin domain (rev…
Apr 24, 2019
22e16d5
Merge pull request #123 from careerbuilder/feature/reverse-proxy-work…
bradleylowenstein Apr 24, 2019
9871091
[skip ci] 0.8.3-18
Apr 24, 2019
17a1db2
move redirect logic to request handler
vokidya Apr 25, 2019
d92cc34
Merge pull request #124 from careerbuilder/bugfix/reverse-proxy-work
lynnliuCB Apr 26, 2019
4dd9e5f
[skip ci] 0.8.3-19
Apr 26, 2019
b457f5d
fix image in CSS prefix issue and ng-src prefix issue
vokidya Apr 28, 2019
b8a6657
handle html link tags in javascript
vokidya Apr 29, 2019
ea58553
enable cors
lyliuCB Apr 29, 2019
b96048c
fix the issue of prfix contains '/'
vokidya Apr 29, 2019
bef1eff
Merge pull request #126 from careerbuilder/bugfix/reverse-proxy-work
bradleylowenstein Apr 29, 2019
35126e6
[skip ci] 0.8.3-20
Apr 29, 2019
a6b81ad
Merge pull request #127 from careerbuilder/feature-add-cors-whitelist
bradleylowenstein Apr 30, 2019
442a96d
[skip ci] 0.8.3-21
Apr 30, 2019
5442d88
TN-1163 avoid use of startsWith function over undefined value
Apr 30, 2019
6fd8b50
Merge pull request #128 from careerbuilder/bugfix/TN-1163-avoid-undef…
bradleylowenstein May 1, 2019
cd50b15
[skip ci] 0.8.3-22
May 1, 2019
ac77613
TN-1167 implemenation of new setting to control prefix in login callb…
JoseDomingoMoraNunezCB May 2, 2019
3c2bd54
Merge pull request #130 from careerbuilder/bugfix/TN-1167-login-calba…
bradleylowenstein May 3, 2019
23a3045
[skip ci] 0.8.3-23
May 3, 2019
3d4db39
TN-1165 close session on session end for logout
JoseDomingoMoraNunezCB May 3, 2019
26f1da4
add logs for login redirection
vokidya May 6, 2019
f3fc62d
Merge pull request #132 from careerbuilder/bugfix/reverse-proxy-work-…
bradleylowenstein May 6, 2019
4598a22
[skip ci] 0.8.3-24
May 6, 2019
6d74262
Merge pull request #131 from careerbuilder/bugfix/TN-1165-close-sessi…
bradleylowenstein May 6, 2019
2534cfe
[skip ci] 0.8.3-25
May 6, 2019
c3bb7e0
TN-1165 add log for redirection link in SF callback
JoseDomingoMoraNunezCB May 6, 2019
23c371c
Merge pull request #133 from careerbuilder/bugfix/TN-1165-add-callbac…
bradleylowenstein May 6, 2019
193311c
[skip ci] 0.8.3-26
May 6, 2019
2c77283
TN-1165 decision between using server side request to custom logout U…
JoseDomingoMoraNunezCB May 7, 2019
ea76172
TN-1165 removal of temp setting
JoseDomingoMoraNunezCB May 7, 2019
cefa854
Merge pull request #134 from careerbuilder/bugfix/TN-1165-redir-to-cu…
bradleylowenstein May 8, 2019
70989d9
[skip ci] 0.8.3-27
May 8, 2019
f71a558
TN-1106 Sanitize state.redirectURL to pass it as part of the URL safely
JoseDomingoMoraNunezCB May 14, 2019
a83f140
TN-1106 enhancements to sanitization
JoseDomingoMoraNunezCB May 14, 2019
a3776ec
Merge pull request #135 from careerbuilder/bugfix/TN-1106-sanitize-st…
bradleylowenstein May 15, 2019
0e5748a
[skip ci] 0.8.3-28
May 15, 2019
e59ff14
fix redirection issue
vokidya May 23, 2019
813f150
Merge pull request #138 from careerbuilder/bugfix/prefix-redirection-…
bradleylowenstein May 23, 2019
9c57c42
[skip ci] 0.8.3-29
May 23, 2019
b75dc93
rediret to profile view when logged in already
lyliuCB May 27, 2019
888d73e
update based on review
lyliuCB May 27, 2019
8036df8
update http to https
lyliuCB May 27, 2019
590c851
remove absolute path
lyliuCB May 27, 2019
183afac
Merge pull request #139 from careerbuilder/enable-login-redirect
lynnliuCB May 28, 2019
5f72989
[skip ci] 0.8.3-30
May 28, 2019
8c30238
AO-3825: Logic for setting "set-cookies" to secure
cb-manojpathak May 22, 2019
9622e66
Added Secure Button On PencilBlue
cb-manojpathak May 29, 2019
3021d56
Update site_form.html
cb-manojpathak May 30, 2019
71169df
Update code as per suggestion
cb-manojpathak May 31, 2019
47a8247
Updated the code as per suggestion
cb-manojpathak May 31, 2019
0c62c28
updated changes with suggestions
cb-manojpathak Jun 3, 2019
0c64591
updated variable name
cb-manojpathak Jun 3, 2019
ebcbdde
updated variable name
cb-manojpathak Jun 3, 2019
086c009
Merge branch 'Bugs/ACEAO-3825-Change-to-Career-Site-Footer' of github…
cb-manojpathak Jun 4, 2019
84fd9cf
[TN-1219]Add language string to salesforce pages
CB-JackLi Jun 5, 2019
af51d57
Merge pull request #141 from careerbuilder/feature/tn1219-addLangStri…
lynnliuCB Jun 5, 2019
4921115
[skip ci] 0.8.3-31
Jun 5, 2019
005fb68
[ACEAO-4399] fix prefix issue on ie
vokidya Jun 14, 2019
79c35bf
fix root url redirection issue
vokidya Jun 14, 2019
fdfebdb
Merge pull request #143 from careerbuilder/bugfix/aceao-4399-search-o…
lynnliuCB Jun 14, 2019
ea60ca9
[skip ci] 0.8.3-32
Jun 14, 2019
3642324
fix ie issue with attr changes
vokidya Jun 14, 2019
0b612c9
Merge pull request #144 from careerbuilder/bugfix/aceao-4399-search-o…
lynnliuCB Jun 14, 2019
bd1c453
[skip ci] 0.8.3-33
Jun 14, 2019
f731c24
fix the admin issue
vokidya Jun 17, 2019
6109bc1
Merge pull request #145 from careerbuilder/bugfix/aceao-4399-search-o…
bradleylowenstein Jun 17, 2019
bd04f8e
[skip ci] 0.8.3-34
Jun 17, 2019
d7e3331
updated variable name as Youran suggested
cb-manojpathak Jun 17, 2019
b98298b
updated variable name as Youran suggested
cb-manojpathak Jun 17, 2019
fb006d8
Merge pull request #137 from careerbuilder/Bugs/ACEAO-3825-Change-to-…
bradleylowenstein Jun 17, 2019
b9eeb0f
[skip ci] 0.8.3-35
Jun 17, 2019
bb14c93
add proxy setting
vokidya Jun 20, 2019
a6bd489
refactor the proxy middleware
vokidya Jun 21, 2019
2f85dca
Merge pull request #147 from careerbuilder/TN-1207-cms-integration
vokidya Jun 21, 2019
6e6599f
[skip ci] 0.8.3-36
Jun 21, 2019
68ec854
Revert "add proxy setting"
vokidya Jun 21, 2019
a97a128
Merge pull request #148 from careerbuilder/revert-147-TN-1207-cms-int…
vokidya Jun 21, 2019
bc1fefc
[skip ci] 0.8.3-37
Jun 21, 2019
97f83f6
Revert "Revert "add proxy setting""
vokidya Jun 21, 2019
aa4f408
update headers
vokidya Jun 21, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
updated variable name as Youran suggested 
updated variable name as Youran suggested
  • Loading branch information
@cb-manojpathak
cb-manojpathak committed Jun 17, 2019
commit b98298be44ec49c8484a792687bc2dcb40b54aa0
2 changes: 1 addition & 1 deletion plugins/pencilblue/templates/angular/admin/sites/site_form.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
selectedLocales: $scope.selectedLocales,
defaultLocale: $scope.defaultLocale,
useCustomRedirect: $scope.useCustomRedirect || true,
enabledSecureCookie: $scope.enabledSecureCookie || true,
disableSecureCookie: $scope.disableSecureCookie || true,
redirectLink: $scope.redirectLink,
prefix: $scope.prefix,
origin: $scope.origin
Expand Down