Skip to content
This repository was archived by the owner on Mar 13, 2025. It is now read-only.

Commit c4ac8a5

Browse files
committed
Merge branch 'develop'
2 parents 7b01428 + 52a2055 commit c4ac8a5

File tree

7 files changed

+62
-35
lines changed

7 files changed

+62
-35
lines changed

docs/RenewGitToken.md

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,3 +21,41 @@ To revoke a token:
2121
Once the token(s) are revoked, you can add them again by clicking the `Setup` button next to the Git provider. This will walk you through the flow to reauthorize.
2222

2323
![Add](https://github.com/topcoder-platform/topcoder-x-ui/raw/develop/docs/images/Screen%20Shot%202019-11-07%20at%208.31.56%20am.png "Add")
24+
25+
#### Remove a webhook (Github)
26+
27+
To remove an old webhook in Github:
28+
29+
1. Go to the project
30+
2. Click on `Settings` in the header
31+
3. Click on `Webhooks` on the left nav
32+
4. Find the `topcoder-x-receiver.herokuapp.com` entry
33+
5. Click `Delete` and follow the prompts
34+
35+
![Delete](https://github.com/topcoder-platform/topcoder-x-ui/raw/develop/docs/images/Screen_Shot_2019-11-21_at_5_28_59_pm.png "Delete")
36+
37+
38+
#### Remove a webhook (Gitlab)
39+
40+
To remove an old webhook in Gitlab:
41+
42+
1. Go to the project
43+
2. Click on `Settings` on the left nav
44+
3. Select `Integrations` under `Settings`
45+
4. Find the `topcoder-x-receiver.herokuapp.com` entry
46+
5. Click the trashcan icon
47+
48+
![Delete](https://github.com/topcoder-platform/topcoder-x-ui/raw/develop/docs/images/Screen_Shot_2019-11-21_at_5_33_35_pm.png "Delete")
49+
50+
#### Add a new webhook
51+
52+
In Topcoder-X:
53+
54+
1. Click `Project Management`
55+
2. Select the existing project
56+
3. Click `Add Webhook`
57+
58+
The new, correct webhook for the new server will be added automatically. You can verify by following the steps above, but without deleting the new webhook.
59+
60+
![Add](https://github.com/topcoder-platform/topcoder-x-ui/raw/develop/docs/images/Screen_Shot_2019-11-21_at_5_35_18_pm.png "Add")
61+
Loading
Loading
Loading

package-lock.json

Lines changed: 13 additions & 29 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,17 +23,17 @@
2323
"heroku-postbuild": "gulp build"
2424
},
2525
"dependencies": {
26-
"angular": "~1.4.4",
27-
"angular-animate": "~1.4.4",
26+
"angular": "~1.7.9",
27+
"angular-animate": "~1.7.4",
2828
"angular-clipboard": "~1.2.1",
29-
"angular-cookies": "~1.4.4",
29+
"angular-cookies": "~1.7.4",
3030
"angular-footable": "0.0.3",
3131
"angular-jwt": "~0.0.9",
3232
"angular-moment": "~1.0.0-beta.3",
33-
"angular-resource": "~1.4.4",
34-
"angular-sanitize": "~1.4.4",
33+
"angular-resource": "~1.7.4",
34+
"angular-sanitize": "~1.7.4",
3535
"angular-storage": "~0.0.11",
36-
"angular-touch": "~1.4.4",
36+
"angular-touch": "~1.7.4",
3737
"angular-ui-bootstrap": "~2.5.0",
3838
"angular-ui-router": "~0.2.13",
3939
"auth0-angular": "~4.0.4",

src/front/src/app/app.js

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,11 @@ angular.module('topcoderX', [
142142
templateUrl: 'app/members/member.html',
143143
controller: 'MemberController',
144144
controllerAs: 'vm',
145+
resolve: {
146+
authService: ['AuthService', function (AuthService) {
147+
return AuthService.getAppConfig();
148+
}]
149+
},
145150
})
146151
.state('app.copilotPayments', {
147152
url: '/copilot-payments',

0 commit comments

Comments
 (0)