lams-github

Clone Tools

Stats

Commits this week: 0
Total Committers: 50
Last Commit:
Commits this week: 0

Lines of code count not available

Commit Activity

Commits By Day In Week
52 week commits volume
Commits By Day In Week
Commits by day
Commits By Day In Week
Commits by hour
Commits By Hour In Day
Commit calendar
 

Most active committers (90 days)

loading
loading
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Tuesday 21 Oct 2008
7:09 am

jliew

autoformat

Options
    • -323
    • +347
    /TestHarness4LAMS2/src/org/lamsfoundation/testharness/TestReporter.java
7:08 am

jliew

add total and average response times to test report

Options
    • -0
    • +10
    /TestHarness4LAMS2/src/org/lamsfoundation/testharness/TestReporter.java
    • -0
    • +2
    /TestHarness4LAMS2/template.html
Monday 20 Oct 2008
1:31 pm

lfoxton

LDEV-1977 make a lams-central action that takes a relative LAMS url and redirects to it, so the users are taken through the login page if neccessary.

Options
    • -0
    • +2
    /lams_central/src/java/org/lamsfoundation/lams/util/CentralConstants.java
1:07 pm

paulg

LDEV-1929 Presence now creating users with LAMS Jabber manager account in both flash and flashless learner modules

Options
    • -4
    • +6
    /lams_central/src/java/org/lamsfoundation/lams/web/PresenceServlet.java
    • binary
    /lams_flash/src/central/flash/lams_learner.fla
    • binary
    /lams_flash/src/central/flash/lams_monitoring_v1.fla
    • -0
    • +5
    /lams_flash/src/central/flash/main2.as
    • -218
    • +240
    /lams_flash/src/central/flash/org/lamsfoundation/lams/learner/Presence.as
    • -7
    • +12
    /lams_learning/web/includes/presence.js
    • binary
    /lams_learning/web/lams_learner.swf
    • -5
    • +18
    /lams_learning/web/mainnoflash.jsp
12:26 pm

lfoxton

LDEV-1977 make a lams-central action that takes a relative LAMS url and redirects to it, so the users are taken through the login page if neccessary.

Options
    • -0
    • +70
    /lams_central/src/java/org/lamsfoundation/lams/web/RedirectAction.java
7:24 am

paulg

LDEV-1929 Fixed a bug with IE not detecting flashvars for connecting with presence

Options
    • -2
    • +5
    /lams_flash/src/central/flash/main2.as
    • -1
    • +1
    /lams_learning/web/controlFrame.jsp
    • binary
    /lams_learning/web/lams_learner.swf
6:17 am

Andrey Balan

LDEV-1958 almost finished authoring also * lightbox introduced * Image scaling and creation of 3 files: original, medium, thumbnail

Options
    • -1
    • +5
    /lams_tool_images/conf/language/lams/ApplicationResources_en_AU.properties
    • -11
    • +8
    /lams_tool_images/db/sql/create_lams_tool_imageGallery.sql
    • -1
    • +1
    /lams_tool_images/db/sql/table-schema.sql
    • -13
    • +2
    /lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/dto/Summary.java
    • -1
    • +1
    /lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/model/ImageGallery.java
    • -1
    • +1
    /lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/model/ImageGalleryAttachment.hbm.xml
    • -1
    • +1
    /lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/model/ImageGalleryAttachment.java
    • -40
    • +39
    /lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/model/ImageGalleryItem.hbm.xml
    • -79
    • +82
    /lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/model/ImageGalleryItem.java
    • -10
    • +0
    /lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/IImageGalleryService.java
    • -120
    • +77
    /lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/ImageGalleryServiceImpl.java
    • -0
    • +2
    /lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/UploadImageGalleryFileException.java
    • -0
    • +80
    /lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/util/BufferOverflowException.java
    • -0
    • +835
    /lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/util/CircularByteBuffer.java
    • -47
    • +47
    /lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/action/AuthoringAction.java
  16. … 13 more files in changeset.
Friday 17 Oct 2008
11:29 am

paulg

LDEV-1816 Now using a blue text area (user should not think that data can be entered) to display lesson description

Options
    • -1
    • +1
    /lams_central/conf/flashxml/lams/defaultTheme.xml
    • binary
    /lams_flash/src/central/flash/lams_monitoring_v1.fla
    • -15
    • +6
    /lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/tabviews/LessonTabView.as
    • binary
    /lams_monitoring/web/lams_monitoring.swf
    • binary
    /lams_monitoring/web/lams_monitoring_library.swf
10:15 am

paulg

LDEV-1929 Fixed problem when launching preview from author

Options
    • binary
    /lams_central/web/lams_authoring.swf
    • binary
    /lams_central/web/lams_authoring_library.swf
    • -0
    • +2
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/DesignDataModel.as
9:58 am

lfoxton

Some cosmetic changes requested by Ernie

Options
    • -0
    • +1
    /lams_tool_wiki/build.xml
    • -1
    • +5
    /lams_tool_wiki/conf/language/lams/ApplicationResources_en_AU.properties
    • -5
    • +10
    /lams_tool_wiki/conf/language/rams/ApplicationResources_en_AU.properties
    • binary
    /lams_tool_wiki/web/images/tree_closed.gif
    • binary
    /lams_tool_wiki/web/images/tree_open.gif
    • -0
    • +18
    /lams_tool_wiki/web/includes/javascript/wikiCommon.js
    • -0
    • +27
    /lams_tool_wiki/web/pages/aa.jsp
    • -179
    • +220
    /lams_tool_wiki/web/pages/authoring/basic.jsp
    • -256
    • +305
    /lams_tool_wiki/web/pages/learning/wiki.jsp
    • -182
    • +240
    /lams_tool_wiki/web/pages/monitoring/wikiDisplay.jsp
    • -1
    • +1
    /lams_tool_wiki/web/pages/wiki/compare.jsp
    • -1
    • +1
    /lams_tool_wiki/web/pages/wiki/viewWiki.jsp
9:39 am

paulg

LDEV-1976 Space in username added for presence

Options
    • -1
    • +1
    /lams_flash/src/central/flash/org/lamsfoundation/lams/learner/Presence.as
    • binary
    /lams_learning/web/lams_learner.swf
    • -1
    • +1
    /lams_learning/web/mainnoflash.jsp
8:53 am

paulg

LDEV-1929 Enable instant messaging checkbox hidden from user

Options
    • binary
    /lams_flash/src/central/flash/lam_addseq_wiz.fla
    • -1
    • +1
    /lams_flash/src/central/flash/org/lamsfoundation/lams/wizard/steps/WizardLessonDetailsView.as
    • binary
    /lams_monitoring/web/lams_wizard.swf
    • binary
    /lams_monitoring/web/lams_wizard_library.swf
8:23 am

erniegx <ernieg@gmail.com>

Updating Greek

Options
    • -1
    • +1
    /lams_central/conf/flashxml/lams/wizard/el_GR_dictionary.xml
    • -3
    • +5
    /lams_learning/conf/language/lams/ApplicationResources_el_GR.properties
Thursday 16 Oct 2008
2:47 pm

paulg

LDEV-1907 Show a plus sign "+" in the activity if it contains more than 10 learners

LDEV-1469 Progress Bar - rotate green triangles

LDEV-1929 Implement presence in learner (Flash and non-flash)

= TODO:

+ must refactor to use xmpp service to create users with admin account

+ fix IE to catch flashvars sent from javascript

+ find workaround to not commenting out sasl in jsjac lib

LDEV-1783 Improve the error message when a user tries to select an activity inside an optional activity/sequence via the progress bar

Options
    • -1
    • +7
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/DesignDataModel.as
    • -0
    • +265
    /lams_flash/src/central/flash/org/lamsfoundation/lams/learner/Presence.as
    • -6
    • +21
    /lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/tabviews/LessonTabView.as
    • -0
    • +455
    /lams_learning/web/includes/JavaScriptFlashGateway.js
    • binary
    /lams_learning/web/includes/JavaScriptFlashGateway.swf
    • -0
    • +3
    /lams_learning/web/includes/jsjac-1.3.1/AUTHORS
    • -0
    • +11
    /lams_learning/web/includes/jsjac-1.3.1/COPYING
    • -0
    • +143
    /lams_learning/web/includes/jsjac-1.3.1/ChangeLog
    • -0
    • +470
    /lams_learning/web/includes/jsjac-1.3.1/MPL-1.1.txt
    • -0
    • +57
    /lams_learning/web/includes/jsjac-1.3.1/Makefile
    • -0
    • +87
    /lams_learning/web/includes/jsjac-1.3.1/README
    • -0
    • +314
    /lams_learning/web/includes/jsjac-1.3.1/examples/simpleclient.html
    • -0
    • +339
    /lams_learning/web/includes/jsjac-1.3.1/gpl-2.0.txt
    • -0
    • +506
    /lams_learning/web/includes/jsjac-1.3.1/jsjac.js
    • -0
    • +33
    /lams_learning/web/includes/jsjac-1.3.1/jsjac.packed.js
  16. … 22 more files in changeset.
2:29 pm

paulg

LDEV-1907 Show a plus sign "+" in the activity if it contains more than 10 learners

LDEV-1469 Progress Bar - rotate green triangles

LDEV-1929 Implement presence in learner (Flash and non-flash)

= TODO:

+ must refactor to use xmpp service to create users with admin account

+ fix IE to catch flashvars sent from javascript

+ find workaround to not commenting out sasl in jsjac lib

LDEV-1783 Improve the error message when a user tries to select an activity inside an optional activity/sequence via the progress bar

Options
    • binary
    /lams_flash/src/central/flash/lam_addseq_wiz.fla
    • binary
    /lams_flash/src/central/flash/lams_learner.fla
    • binary
    /lams_flash/src/central/flash/lams_monitoring_v1.fla
    • -7
    • +34
    /lams_flash/src/central/flash/main2.as
    • -2
    • +6
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasActivity.as
    • -3
    • +7
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasOptionalActivity.as
    • -1
    • +5
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasParallelActivity.as
    • -27
    • +63
    /lams_flash/src/central/flash/org/lamsfoundation/lams/learner/Application.as
    • -0
    • +710
    /lams_flash/src/central/flash/org/lamsfoundation/lams/learner/PresenceXIFF.as
    • -6
    • +6
    /lams_flash/src/central/flash/org/lamsfoundation/lams/learner/Scratchpad.as
    • -8
    • +16
    /lams_flash/src/central/flash/org/lamsfoundation/lams/learner/ls/Lesson.as
    • -13
    • +139
    /lams_flash/src/central/flash/org/lamsfoundation/lams/learner/ls/LessonModel.as
    • -0
    • +8
    /lams_flash/src/central/flash/org/lamsfoundation/lams/learner/ls/LessonView.as
    • -0
    • +79
    /lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/PlusIcon.as
    • -1
    • +6
    /lams_flash/src/central/flash/org/lamsfoundation/lams/wizard/Wizard.as
  16. … 8 more files in changeset.
2:08 pm

paulg

LDEV-1907 Show a plus sign "+" in the activity if it contains more than 10 learners

LDEV-1469 Progress Bar - rotate green triangles

LDEV-1929 Implement presence in learner (Flash and non-flash)

= TODO:

+ must refactor to use xmpp service to create users with admin account

+ fix IE to catch flashvars sent from javascript

+ find workaround to not commenting out sasl in jsjac lib

LDEV-1783 Improve the error message when a user tries to select an activity inside an optional activity/sequence via the progress bar

Options
    • -1
    • +2
    /lams_build/3rdParty.userlibraries
    • -2
    • +3
    /lams_build/build.xml
    • -0
    • +3
    /lams_build/conf/j2ee/lams.application.xml
    • -0
    • +3
    /lams_build/conf/j2ee/rams.application.xml
    • binary
    /lams_build/lib/jabber/JabberHTTPBind-1.1.1.jar
    • -1
    • +1
    /lams_build/windows.properties
    • -1
    • +1
    /lams_central/conf/flashxml/lams/learner/en_AU_dictionary.xml
    • -1
    • +1
    /lams_central/conf/flashxml/lams/learner/en_dictionary.xml
    • -1
    • +1
    /lams_central/conf/flashxml/lams/wizard/en_AU_dictionary.xml
    • -1
    • +1
    /lams_central/conf/flashxml/lams/wizard/en_dictionary.xml
    • -0
    • +5
    /lams_central/conf/xdoclet/servlet-mappings.xml
    • -0
    • +7
    /lams_central/conf/xdoclet/servlets.xml
    • -0
    • +1
    /lams_central/conf/xdoclet/web-security.xml
    • -0
    • +4
    /lams_central/src/java/org/lamsfoundation/lams/web/HomeAction.java
    • -0
    • +114
    /lams_central/src/java/org/lamsfoundation/lams/web/PresenceServlet.java
  16. … 19 more files in changeset.
11:33 am

lfoxton

Relocating the fckeditor wikilink plugin from lams_central to the wiki tool

Options
    • -133
    • +0
    /lams_central/web/fckeditor/editor/plugins/wikilink/fck_wikilink.jsp
    • -18
    • +0
    /lams_central/web/fckeditor/editor/plugins/wikilink/fckplugin.js
    • -8
    • +0
    /lams_central/web/fckeditor/editor/plugins/wikilink/lang/en.js
    • binary
    /lams_central/web/fckeditor/editor/plugins/wikilink/wikilink.gif
    • -3
    • +3
    /lams_central/web/includes/javascript/fckconfig_custom.js
    • -0
    • +131
    /lams_tool_wiki/web/wikilink/fck_wikilink.jsp
    • -0
    • +19
    /lams_tool_wiki/web/wikilink/fckplugin.js
    • -0
    • +7
    /lams_tool_wiki/web/wikilink/lang/en.js
    • binary
    /lams_tool_wiki/web/wikilink/wikilink.gif
11:03 am

asukkar

Switched to unpacked jsjac file.

Options
    • -1
    • +1
    /lams_tool_chat/web/pages/learning/learning.jsp
7:20 am

lfoxton

LDEV-1657 - Wikilinking, with dan's help, used an FCKEditor property to store the wikilink array and fix cross-browser problems

Options
    • -2
    • +1
    /lams_central/web/fckeditor/editor/plugins/wikilink/fck_wikilink.jsp
    • -0
    • +23
    /lams_tool_wiki/web/pages/authoring/basic.jsp
    • -0
    • +2
    /lams_tool_wiki/web/pages/learning/wiki.jsp
    • -0
    • +5
    /lams_tool_wiki/web/pages/monitoring/wikiDisplay.jsp
Wednesday 15 Oct 2008
1:21 pm

lfoxton

Cleanup and commenting

Options
    • -1
    • +47
    /lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/service/IWikiService.java
    • -135
    • +128
    /lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/service/WikiService.java
    • -2
    • +44
    /lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/actions/AuthoringAction.java
    • -15
    • +46
    /lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/actions/LearningAction.java
    • -1
    • +29
    /lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/actions/MonitoringAction.java
    • -1
    • +43
    /lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/servlets/ExportServlet.java
12:50 pm

asukkar

LDEV-1969

Moved jsjac library to lams central

Options
    • -0
    • +506
    /lams_central/web/includes/javascript/jsjac.js
    • -0
    • +33
    /lams_central/web/includes/javascript/jsjac.packed.js
    • -3
    • +0
    /lams_tool_chat/web/includes/javascript/jsjac-1.3.1/AUTHORS
    • -11
    • +0
    /lams_tool_chat/web/includes/javascript/jsjac-1.3.1/COPYING
    • -143
    • +0
    /lams_tool_chat/web/includes/javascript/jsjac-1.3.1/ChangeLog
    • -470
    • +0
    /lams_tool_chat/web/includes/javascript/jsjac-1.3.1/MPL-1.1.txt
    • -57
    • +0
    /lams_tool_chat/web/includes/javascript/jsjac-1.3.1/Makefile
    • -87
    • +0
    /lams_tool_chat/web/includes/javascript/jsjac-1.3.1/README
    • -314
    • +0
    /lams_tool_chat/web/includes/javascript/jsjac-1.3.1/examples/simpleclient.html
    • -339
    • +0
    /lams_tool_chat/web/includes/javascript/jsjac-1.3.1/gpl-2.0.txt
    • -506
    • +0
    /lams_tool_chat/web/includes/javascript/jsjac-1.3.1/jsjac.js
    • -33
    • +0
    /lams_tool_chat/web/includes/javascript/jsjac-1.3.1/jsjac.packed.js
    • -504
    • +0
    /lams_tool_chat/web/includes/javascript/jsjac-1.3.1/lgpl-2.1.txt
    • -55
    • +0
    /lams_tool_chat/web/includes/javascript/jsjac-1.3.1/src/JSJaC.js
    • -126
    • +0
    /lams_tool_chat/web/includes/javascript/jsjac-1.3.1/src/JSJaCBuilder.js
  16. … 18 more files in changeset.
12:13 pm

asukkar

LDEV-1969

Moved createId and createMultiUserChat from the chat tool to lams_common

Options
    • -0
    • +94
    /lams_common/src/java/org/lamsfoundation/lams/util/XMPPUtil.java
    • -78
    • +7
    /lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/service/ChatService.java
    • -6
    • +0
    /lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/service/IChatService.java
    • -1
    • +8
    /lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/actions/LearningAction.java
11:30 am

lfoxton

Updating language files and confinguration files

Options
    • -0
    • +13
    /lams_tool_wiki/conf/hibernate/mappings/org/lamsfoundation/lams/tool/wiki/model/WikiPage.hbm.xml
    • -0
    • +22
    /lams_tool_wiki/conf/hibernate/mappings/org/lamsfoundation/lams/tool/wiki/model/WikiSession.hbm.xml
    • -0
    • +8
    /lams_tool_wiki/conf/hibernate/mappings/org/lamsfoundation/lams/tool/wiki/model/WikiUser.hbm.xml
    • -28
    • +88
    /lams_tool_wiki/conf/language/ApplicationResources.properties
    • -15
    • +68
    /lams_tool_wiki/conf/language/lams/ApplicationResources.properties
    • -18
    • +64
    /lams_tool_wiki/conf/language/lams/ApplicationResources_en_AU.properties
    • -15
    • +68
    /lams_tool_wiki/conf/language/rams/ApplicationResources.properties
    • -2
    • +0
    /lams_tool_wiki/conf/language/rams/ApplicationResources_en_AU.properties
    • -0
    • +15
    /lams_tool_wiki/web/WEB-INF/struts/struts-config.xml
11:28 am

lfoxton

LDEV-1951 - Block images and insert link in learner from advanced options

Options
    • -168
    • +144
    /lams_tool_wiki/web/pages/authoring/basic.jsp
    • -274
    • +258
    /lams_tool_wiki/web/pages/learning/wiki.jsp
    • -22
    • +15
    /lams_tool_wiki/web/pages/monitoring/wikiDisplay.jsp
10:59 am

lfoxton

LDEV-1966 Implemented a special workspace folder for each session of the wiki

Monitor and learner modules adjuested to point to this folder

Export portfolio adjusted to export folder images and point to the correct location

Options
    • -2
    • +2
    /lams_tool_wiki/db/sql/create_lams_tool_wiki.sql
    • -4
    • +4
    /lams_tool_wiki/db/sql/table-schema.sql
    • -4
    • +16
    /lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/dto/WikiSessionDTO.java
    • -1
    • +17
    /lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/model/WikiSession.java
    • -1
    • +4
    /lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/service/WikiService.java
    • -2
    • +3
    /lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/actions/LearningAction.java
    • -0
    • +4
    /lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/actions/MonitoringAction.java
    • -5
    • +63
    /lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/servlets/ExportServlet.java
    • -4
    • +0
    /lams_tool_wiki/web/pages/learning/parts/finishButton.jsp
    • -3
    • +3
    /lams_tool_wiki/web/pages/learning/wiki.jsp
    • -2
    • +2
    /lams_tool_wiki/web/pages/monitoring/wikiDisplay.jsp
10:18 am

asukkar

Formatted code.

Options
    • -1030
    • +929
    /lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/service/ChatService.java
    • -214
    • +205
    /lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/service/IChatService.java
    • -177
    • +155
    /lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/actions/LearningAction.java
Tuesday 14 Oct 2008
12:14 pm

lfoxton

Adding reflection to export portfolio

Options
    • -1
    • +34
    /lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/servlets/ExportServlet.java
    • -25
    • +42
    /lams_tool_wiki/web/pages/export/exportPortfolio.jsp
12:13 pm

lfoxton

Fixing reflection in learning

Options
    • -3
    • +19
    /lams_tool_wiki/web/pages/learning/parts/finishButton.jsp
    • -1
    • +1
    /lams_tool_wiki/web/pages/learning/wiki.jsp
11:10 am

lfoxton

changed call to parent window to: wikiArray = window.top.opener.parent.wikiLinkArray;

wikiArray = window.top.opener.top.wikiLinkArray; was not working in learner because of the frames

Options
    • -1
    • +1
    /lams_central/web/fckeditor/editor/plugins/wikilink/fck_wikilink.jsp
10:11 am

lfoxton

LDEV-1954 Do export portfolio

Done for teacher.

Also fixed problem with grouping causing wiki pages to be copied for each new group.

Options
    • -0
    • +7
    /lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/service/WikiService.java
    • -0
    • +1
    /lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/util/WikiConstants.java
    • -13
    • +42
    /lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/servlets/ExportServlet.java
    • -73
    • +117
    /lams_tool_wiki/web/pages/export/exportPortfolio.jsp
    • -107
    • +0
    /lams_tool_wiki/web/pages/export/exportPortfolioLearner.jsp
    • -0
    • +241
    /lams_tool_wiki/web/pages/export/exportPortfolioTeacher.jsp