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

Commit

Permalink
Merge pull request #27 from UW-Madison-DoIT/upgrade_to_4.1.1.24
Browse files Browse the repository at this point in the history
MUMMNG-1707 : Upgrade to 4.1.1.24
  • Loading branch information
Tim Levett committed Jul 22, 2015
2 parents 5786948 + fe575fd commit 8e20f15
Show file tree
Hide file tree
Showing 2 changed files with 49 additions and 10 deletions.
39 changes: 39 additions & 0 deletions my-profile-webapp/src/main/webapp/js/app-config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
define(['angular'], function(angular) {

var config = angular.module('app-config', []);
config
.constant('APP_FLAGS', {
'enableToggle': true,
'defaultView' : 'list',
'list' : true,
'widgets' : true
})
.constant('SERVICE_LOC', {
'sessionInfo' : '/portal/web/session.json',
'sidebarInfo' : '/web/samples/sidebar.json',
'notificationsURL' : '/web/samples/notifications.json',
'groupURL' : '/portal/api/groups'
})
.constant('NAMES', {
'title' : 'MyUW',
'crest' : 'img/uwcrest_web_sm.png',
'crestalt' : 'UW Crest',
'sublogo' : 'beta'
})
.constant('SEARCH',{
'isWeb' : false,
'searchURL' : '/web/apps/search/'
})
.constant('NOTIFICATION', {
'groupFiltering' : true,
'notificationFullURL' : 'notifications'
})
.constant('MISC_URLS',{
'feedbackURL' : 'https://my.wisc.edu/portal/p/feedback',
'back2ClassicURL' : null,
'whatsNewURL' : null
});

return config;

});
20 changes: 10 additions & 10 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -46,23 +46,23 @@
<dependency>
<groupId>edu.wisc.my.portal.angular</groupId>
<artifactId>angularjs-portal-frame</artifactId>
<version>4.1.1.22</version>
<version>4.1.1.24</version>
<type>war</type>
</dependency>

<dependency>
<groupId>joda-time</groupId>
<artifactId>joda-time</artifactId>
<version>${joda.version}</version>
</dependency>

<dependency>
<groupId>com.fasterxml.jackson.datatype</groupId>
<artifactId>jackson-datatype-joda</artifactId>
<version>${jackson.version}</version>
</dependency>
</dependency>


<dependency>
<groupId>commons-dbcp</groupId>
<artifactId>commons-dbcp</artifactId>
Expand All @@ -78,13 +78,13 @@
<artifactId>jackson-databind</artifactId>
<version>${jackson.version}</version>
</dependency>

<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<version>2.5</version>
</dependency>

<!-- Logging -->
<dependency>
<groupId>ch.qos.logback</groupId>
Expand Down Expand Up @@ -130,13 +130,13 @@
<artifactId>spring-webmvc</artifactId>
<version>${spring.version}</version>
</dependency>

<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
<version>${spring.version}</version>
</dependency>

<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
Expand Down

0 comments on commit 8e20f15

Please sign in to comment.