Skip to content
This repository has been archived by the owner on Dec 22, 2023. It is now read-only.

Upgrade to latest frame, change to override.js #66

Merged
merged 1 commit into from
Mar 28, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
68 changes: 0 additions & 68 deletions my-profile-webapp/src/main/webapp/js/app-config.js

This file was deleted.

37 changes: 37 additions & 0 deletions my-profile-webapp/src/main/webapp/js/override.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
define(['angular'], function(angular) {

/*Keep in sync with docs/mardown/configuration.md*/

var config = angular.module('override', []);
config
//see configuration.md for howto
.constant('OVERRIDE', {
'APP_FLAGS' : {
'defaultTheme' : 0
},
'SERVICE_LOC' : {
'sessionInfo' : '/portal/web/session.json',
'featuresInfo' : '/web/staticFeeds/features.json',
'notificationsURL' : '/web/staticFeeds/notifications.json'
},
'NAMES' : {
'fname' : 'contact-info'
},
'SEARCH' : {
'searchURL' : '/web/apps/search/'
},
'MISC_URLS' : {
'feedbackURL' : 'https://my.wisc.edu/portal/p/feedback'
},
'APP_BETA_FEATURES' : [
{
"id" : "enableProfileNavigation",
"title" : "Enable Profile Navigation",
"description" : "In LEC, enable profile navigation to the other parts of My Profile that is hidden right now"
}
]
})

return config;

});
10 changes: 5 additions & 5 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
</scm>

<properties>
<frame.version>2.1.0</frame.version>
<frame.version>2.2.1</frame.version>
<spring.version>3.1.3.RELEASE</spring.version>
<joda.version>2.7</joda.version>
<jackson.version>2.2.2</jackson.version>
Expand Down Expand Up @@ -67,7 +67,7 @@
<artifactId>jackson-datatype-joda</artifactId>
<version>${jackson.version}</version>
</dependency>

<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
Expand All @@ -77,7 +77,7 @@
<groupId>com.fatboyindustrial.gson-jodatime-serialisers</groupId>
<artifactId>gson-jodatime-serialisers</artifactId>
<version>${gson-jodaTime-serializer.version}</version>
</dependency>
</dependency>

<dependency>
<groupId>commons-dbcp</groupId>
Expand Down Expand Up @@ -126,7 +126,7 @@
<artifactId>slf4j-api</artifactId>
<version>1.7.5</version>
</dependency>

<!-- Testing dependencies -->
<dependency>
<groupId>org.mockito</groupId>
Expand All @@ -140,7 +140,7 @@
<version>${junit.version}</version>
<scope>test</scope>
</dependency>


<!-- Spring dependencies -->
<dependency>
Expand Down