Fisheye on lams/lams_central/web/editprofile.jsp

lams (lams2_head_wildfly): LDEV-4304: Do not display 2FA when editing profile

Ernie Ghiglione — Tue, 04 Apr 2017 06:20:43 +0200

Ernie Ghiglione committed lams2_head_wildfly:ernieg:20170404042043 on branch lams2_head_wildfly in lams

LDEV-4304: Do not display 2FA when editing profile

· /lams_central/src/java/org/lamsfoundation/lams/web/ProfileAction.java	(-4, +1)	\| History	\| Source	\| Diff
· /lams_central/web/editprofile.jsp	(-7, +0)	\| History	\| Source	\| Diff

lams (lams2_head_wildfly): LDEV-4217 Remove LAMS Community integration

Andrey Balan — Wed, 08 Feb 2017 20:18:23 +0100

Andrey Balan committed lams2_head_wildfly:andreyb:20170208191823 on branch lams2_head_wildfly in lams

LDEV-4217 Remove LAMS Community integration

· /lams_admin/conf/language/lams/ApplicationResources_en_AU.properties

(-23, +0)

| History

| Source

| Diff

· /lams_admin/src/java/org/lamsfoundation/lams/admin/web/RegisterAction.java

(-280, +0)

| History

| Source

| Diff

· /lams_admin/src/java/org/lamsfoundation/lams/admin/web/RegisterDTO.java

(-166, +0)

| History

| Source

| Diff

· /lams_admin/src/java/org/lamsfoundation/lams/admin/web/RegisterForm.java

(-253, +0)

| History

| Source

| Diff

· /lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/StatisticsAction.java

(-10, +4)

| History

| Source

| Diff

· /lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/SysAdminStartAction.java

(-1, +0)

| History

| Source

| Diff

· /lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/ThemeManagementAction.java

(-8, +3)

| History

| Source

| Diff

· /lams_admin/web/register.jsp

(-476, +0)

| History

| Source

| Diff

· /lams_admin/web/WEB-INF/struts-config.xml

(-35, +0)

| History

| Source

| Diff

· /lams_admin/web/WEB-INF/tiles-defs.xml

(-5, +0)

| History

| Source

| Diff

· /lams_central/src/java/org/lamsfoundation/lams/authoring/web/ExportToolContentAction.java

(-7, +0)

| History

| Source

| Diff

· /lams_central/src/java/org/lamsfoundation/lams/authoring/web/ImportToolContentAction.java

(-126, +0)

| History

| Source

| Diff

· /lams_central/src/java/org/lamsfoundation/lams/web/HomeAction.java

(-14, +2)

| History

| Source

| Diff

· /lams_central/src/java/org/lamsfoundation/lams/web/IndexAction.java

(-6, +0)

| History

| Source

| Diff

· /lams_central/src/java/org/lamsfoundation/lams/web/ProfileAction.java

(-3, +0)

| History

| Source

| Diff

… 24 more files in changeset.

lams (lams2_head_wildfly): LDEV-4123: Removing the highContrast theme that is no longer used. Users with this theme should now revert to the defaul...

fionam — Thu, 08 Dec 2016 05:07:52 +0100

fionam committed lams2_head_wildfly:fionam:20161208040752 on branch lams2_head_wildfly in lams

LDEV-4123: Removing the highContrast theme that is no longer used. Users with this theme should now revert to the default theme. The code that handled invalid themes was not correct and was stopped users logging in - now if the theme id in the database is null or if the theme id points to a non-existent theme then it can still log in using the default theme, and next time the user updates their profile the theme id will be fixed.

· /lams_central/src/java/org/lamsfoundation/lams/web/tag/UserTag.java	(-1, +2)	\| History	\| Source	\| Diff
· /lams_central/web/editprofile.jsp	(-1, +4)	\| History	\| Source	\| Diff
· /lams_central/web/css/highContrast.css	(-1666, +0)	\| History	\| Source	\| Diff
· /lams_central/web/css/highContrast_learner.css	(-578, +0)	\| History	\| Source	\| Diff
· /lams_central/web/css/highContrast_rtl.css	(-1662, +0)	\| History	\| Source	\| Diff
· /lams_central/web/css/highContrast_rtl_learner.css	(-542, +0)	\| History	\| Source	\| Diff
· /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch2040079.sql	(-0, +12)	\| History	\| Source	\| Diff
· /lams_common/src/java/org/lamsfoundation/lams/usermanagement/User.java	(-1, +1)	\| History	\| Source	\| Diff

lams (lams2_head_wildfly): LDEV-3963 Prevent horizontal bar to appear on editprofile page when using Windows' Chrome browser

Andrey Balan — Tue, 29 Nov 2016 16:47:51 +0100

Andrey Balan committed lams2_head_wildfly:andreyb:20161129154751 on branch lams2_head_wildfly in lams

LDEV-3963 Prevent horizontal bar to appear on editprofile page when using Windows' Chrome browser

· /lams_central/web/editprofile.jsp	(-4, +7)	\| History	\| Source	\| Diff
· /lams_central/web/profile.jsp	(-2, +1)	\| History	\| Source	\| Diff

lams (lams2_head_wildfly): LDEV-3963 Just to be consistent with change my password page

Andrey Balan — Wed, 23 Nov 2016 16:33:56 +0100

Andrey Balan committed lams2_head_wildfly:andreyb:20161123153356 on branch lams2_head_wildfly in lams

LDEV-3963 Just to be consistent with change my password page

· /lams_central/web/editprofile.jsp

(-1, +1)

| History

| Source

| Diff

lams (lams2_head_wildfly): LDEV-4076 Improve formatting

Andrey Balan — Tue, 22 Nov 2016 09:24:41 +0100

Andrey Balan committed lams2_head_wildfly:andreyb:20161122082441 on branch lams2_head_wildfly in lams

LDEV-4076 Improve formatting

· /lams_central/web/editprofile.jsp

(-21, +20)

| History

| Source

| Diff

lams (lams2_head_wildfly): LDEV-3676:Update My profile pages(Main.jsp get's reloaded after change editprofile.jsp is updated.)

sanjana — Thu, 03 Nov 2016 02:39:07 +0100

sanjana committed lams2_head_wildfly:sanjana:20161103013907 on branch lams2_head_wildfly in lams

LDEV-3676:Update My profile pages(Main.jsp get's reloaded after change editprofile.jsp is updated.)

· /lams_central/web/editprofile.jsp

(-72, +92)

| History

| Source

| Diff

lams (lams2_head_wildfly): LDEV-3963: fixing edit profile as previous changes have altered the logic of this page

Ernie Ghiglione — Sun, 30 Oct 2016 09:38:00 +0100

Ernie Ghiglione committed lams2_head_wildfly:ernieg:20161030083800 on branch lams2_head_wildfly in lams

LDEV-3963: fixing edit profile as previous changes have altered the logic of this page

· /lams_central/web/editprofile.jsp

(-54, +52)

| History

| Source

| Diff

lams (lams2_head_wildfly): LDEV-3962...

Andrey Balan — Thu, 27 Oct 2016 18:00:52 +0200

Andrey Balan committed lams2_head_wildfly:andreyb:20161027160052 on branch lams2_head_wildfly in lams

LDEV-3962

* support for favorite orgs and last visited one

* if last visited is stored, offcanvas bar is shown as hidden

* offcanvas bar is shrank to 220px

* CSS rules for main.jsp are all moved to main.css

* Javascript methods for main.jsp are moved to main.js. Profile related ones to profile.js. Only methods used by other pages are kept in groupDisplay.js.

* removed UserOrganisationCollapsed.java and code associated with it

· /lams_build/lib/lams/lams.jar

(binary)

| History

| Source

| Diff

· /lams_central/src/java/org/lamsfoundation/lams/web/DisplayGroupAction.java

(-0, +4)

| History

| Source

| Diff

· /lams_central/src/java/org/lamsfoundation/lams/web/IndexAction.java

(-1, +51)

| History

| Source

| Diff

· /lams_central/src/java/org/lamsfoundation/lams/web/UpdateCollapsedGroupServlet.java

(-85, +0)

| History

| Source

| Diff

· /lams_central/web/editprofile.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_central/web/favoriteOrganisations.jsp

(-0, +25)

| History

| Source

| Diff

· /lams_central/web/group.jsp

(-9, +20)

| History

| Source

| Diff

· /lams_central/web/lessons.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_central/web/main.jsp

(-127, +26)

| History

| Source

| Diff

· /lams_central/web/passwordChangeContent.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_central/web/portrait.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_central/web/profile.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_central/web/WEB-INF/struts-config.xml

(-0, +5)

| History

| Source

| Diff

· /lams_central/web/WEB-INF/web.xml

(-10, +0)

| History

| Source

| Diff

· /lams_central/web/css/index.css

(-216, +0)

| History

| Source

| Diff

… 22 more files in changeset.

lams (lams2_head_wildfly): LDEV-3962 Bootstrap index page

Andrey Balan — Mon, 24 Oct 2016 16:55:04 +0200

Andrey Balan committed lams2_head_wildfly:andreyb:20161024145504 on branch lams2_head_wildfly in lams

LDEV-3962 Bootstrap index page

· /lams_build/lib/lams/lams.jar

(binary)

| History

| Source

| Diff

· /lams_central/src/java/org/lamsfoundation/lams/web/DisplayGroupAction.java

(-3, +0)

| History

| Source

| Diff

· /lams_central/src/java/org/lamsfoundation/lams/web/IndexAction.java

(-41, +76)

| History

| Source

| Diff

· /lams_central/src/java/org/lamsfoundation/lams/web/PasswordAction.java

(-1, +0)

| History

| Source

| Diff

· /lams_central/src/java/org/lamsfoundation/lams/web/PasswordChangeAction.java

(-8, +0)

| History

| Source

| Diff

· /lams_central/src/java/org/lamsfoundation/lams/web/PortraitAction.java

(-9, +0)

| History

| Source

| Diff

· /lams_central/src/java/org/lamsfoundation/lams/web/PortraitActionForm.java

(-2, +0)

| History

| Source

| Diff

· /lams_central/src/java/org/lamsfoundation/lams/web/PortraitSaveAction.java

(-5, +0)

| History

| Source

| Diff

· /lams_central/src/java/org/lamsfoundation/lams/web/ProfileAction.java

(-4, +0)

| History

| Source

| Diff

· /lams_central/src/java/org/lamsfoundation/lams/web/ProfileSaveAction.java

(-8, +0)

| History

| Source

| Diff

· /lams_central/src/java/org/lamsfoundation/lams/web/action/TwoFactorAuthenticationAction.java

(-1, +0)

| History

| Source

| Diff

· /lams_central/web/editprofile.jsp

(-14, +22)

| History

| Source

| Diff

· /lams_central/web/lessons.jsp

(-12, +34)

| History

| Source

| Diff

· /lams_central/web/main.jsp

(-230, +347)

| History

| Source

| Diff

· /lams_central/web/passwordChangeContent.jsp

(-30, +35)

| History

| Source

| Diff

… 20 more files in changeset.

lams (lams2_head_wildfly): LDEV-3676 :Update My profile pages(Bootstrap completed)

sanjana — Fri, 14 Oct 2016 05:41:06 +0200

sanjana committed lams2_head_wildfly:sanjana:20161014034106 on branch lams2_head_wildfly in lams

LDEV-3676 :Update My profile pages(Bootstrap completed)

· /lams_central/web/editprofile.jsp	(-307, +400)	\| History	\| Source	\| Diff
· /lams_central/web/lessons.jsp	(-37, +59)	\| History	\| Source	\| Diff
· /lams_central/web/passwordChangeContent.jsp	(-67, +86)	\| History	\| Source	\| Diff
· /lams_central/web/profile.jsp	(-65, +97)	\| History	\| Source	\| Diff

lams (lams2_head_wildfly): LDEV-3436 :Consistent save/cancel buttons for Edit my profile fixed.

sanjana — Mon, 10 Oct 2016 11:17:15 +0200

sanjana committed lams2_head_wildfly:sanjana:20161010091715 on branch lams2_head_wildfly in lams

LDEV-3436 :Consistent save/cancel buttons for Edit my profile fixed.

· /lams_central/web/editprofile.jsp

(-3, +3)

| History

| Source

| Diff

lams (lams2_head_wildfly): LDEV-3965 Added ability to enable two-factor authentication for selected users

Andrey Balan — Fri, 26 Aug 2016 17:02:58 +0200

Andrey Balan committed lams2_head_wildfly:andreyb:20160826150258 on branch lams2_head_wildfly in lams

LDEV-3965 Added ability to enable two-factor authentication for selected users

· /lams_central/conf/language/lams/ApplicationResources_en_AU.properties	(-4, +6)	\| History	\| Source	\| Diff
· /lams_central/src/java/org/lamsfoundation/lams/web/IndexAction.java	(-28, +7)	\| History	\| Source	\| Diff
· /lams_central/src/java/org/lamsfoundation/lams/web/PasswordAction.java	(-8, +0)	\| History	\| Source	\| Diff
· /lams_central/src/java/org/lamsfoundation/lams/web/ProfileAction.java	(-15, +3)	\| History	\| Source	\| Diff
· /lams_central/src/java/org/lamsfoundation/lams/web/action/TwoFactorAuthenticationAction.java	(-0, +74)	\| History	\| Source	\| Diff
· /lams_central/web/editprofile.jsp	(-0, +9)	\| History	\| Source	\| Diff
· /lams_central/web/loginTwoFactorAuth.jsp	(-0, +125)	\| History	\| Source	\| Diff
· /lams_central/web/twoFactorAuthSecret.jsp	(-0, +14)	\| History	\| Source	\| Diff
· /lams_central/web/WEB-INF/struts-config.xml	(-0, +19)	\| History	\| Source	\| Diff
· /lams_central/web/WEB-INF/tiles-defs.xml	(-0, +4)	\| History	\| Source	\| Diff
· /lams_central/web/WEB-INF/web.xml	(-0, +1)	\| History	\| Source	\| Diff
· /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/User.hbm.xml	(-0, +18)	\| History	\| Source	\| Diff
· /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch2040067.sql	(-0, +13)	\| History	\| Source	\| Diff
· /lams_common/src/java/org/lamsfoundation/lams/integration/security/SsoHandler.java	(-0, +33)	\| History	\| Source	\| Diff
· /lams_common/src/java/org/lamsfoundation/lams/usermanagement/User.java	(-0, +21)	\| History	\| Source	\| Diff

lams (lams2_head_wildfly): LDEV-3674: Remove multiple Flash elements: Authoring, icons, themes, i18n files, WDDX libraries and classes, methods, se...

Marcin Cieslak — Wed, 16 Mar 2016 13:12:40 +0100

Marcin Cieslak committed lams2_head_wildfly:marcin:20160316121240 on branch lams2_head_wildfly in lams

LDEV-3674: Remove multiple Flash elements: Authoring, icons, themes, i18n files, WDDX libraries and classes, methods, servlets etc.

Rename/rewrite methods for Flashless use.

· /TestHarness4LAMS2/run.bat

(binary)

| History

| Source

| Diff

· /TestHarness4LAMS2/src/org/lamsfoundation/testharness/TestManager.java

(-19, +16)

| History

| Source

| Diff

· /lams_admin/conf/language/lams/ApplicationResources.properties

(-12, +4)

| History

| Source

| Diff

· /lams_admin/conf/xdoclet/struts-forms.xml

(-2, +1)

| History

| Source

| Diff

· /lams_admin/src/java/org/lamsfoundation/lams/admin/service/ImportService.java

(-120, +101)

| History

| Source

| Diff

· /lams_admin/src/java/org/lamsfoundation/lams/admin/web/RegisterAction.java

(-2, +0)

| History

| Source

| Diff

· /lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserAction.java

(-69, +51)

| History

| Source

| Diff

· /lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserSaveAction.java

(-17, +8)

| History

| Source

| Diff

· /lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/CloneLessonsAction.java

(-18, +22)

| History

| Source

| Diff

· /lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/ThemeManagementAction.java

(-67, +41)

| History

| Source

| Diff

· /lams_admin/web/themeManagement.jsp

(-23, +0)

| History

| Source

| Diff

· /lams_admin/web/user.jsp

(-13, +3)

| History

| Source

| Diff

· /lams_build/3rdParty.userlibraries

(-3, +0)

| History

| Source

| Diff

· /lams_build/build.xml

(-20, +0)

| History

| Source

| Diff

· /lams_build/liblist.txt

(-5, +0)

| History

| Source

| Diff

… 406 more files in changeset.

lams (MAIN): LDEV-3113: Remove Flash Learner. Remove unnecessary SWF, tag and other files, along with methods in service classes.

Marcin Cieslak — Tue, 03 Sep 2013 12:54:45 +0200

Marcin Cieslak committed MAIN:marcin:20130903105445 on branch MAIN in lams

LDEV-3113: Remove Flash Learner. Remove unnecessary SWF, tag and other files, along with methods in service classes.

· /lams_admin/conf/xdoclet/struts-forms.xml

(-1, +0)

| History

| Source

| Diff

· /lams_admin/src/java/org/lamsfoundation/lams/admin/service/ImportService.java

(-2, +1)

| History

| Source

| Diff

· /lams_admin/web/user.jsp

(-19, +1)

| History

| Source

| Diff

· /lams_admin/web/WEB-INF/tags/Passon.tag

(-86, +0)

| History

| Source

| Diff

· /lams_admin/web/WEB-INF/tlds/lams/lams.tld

(-45, +6)

| History

| Source

| Diff

· /lams_build/build.xml

(-0, +2)

| History

| Source

| Diff

· /lams_build/lib/lams/lams-central.jar

(binary)

| History

| Source

| Diff

· /lams_build/lib/lams/lams.jar

(binary)

| History

| Source

| Diff

· /lams_central/conf/flashxml/lams/learner/ar_JO_dictionary.xml

(-1, +0)

| History

| Source

| Diff

· /lams_central/conf/flashxml/lams/learner/ca_ES_dictionary.xml

(-1, +0)

| History

| Source

| Diff

· /lams_central/conf/flashxml/lams/learner/cs_CZ_dictionary.xml

(-1, +0)

| History

| Source

| Diff

· /lams_central/conf/flashxml/lams/learner/cy_GB_dictionary.xml

(-1, +0)

| History

| Source

| Diff

· /lams_central/conf/flashxml/lams/learner/da_DK_dictionary.xml

(-1, +0)

| History

| Source

| Diff

· /lams_central/conf/flashxml/lams/learner/de_DE_dictionary.xml

(-1, +0)

| History

| Source

| Diff

· /lams_central/conf/flashxml/lams/learner/el_GR_dictionary.xml

(-1, +0)

| History

| Source

| Diff

… 145 more files in changeset.

lams (MAIN): LDEV-1616: Add hidden fields so first and last name are submitted even if they are disabled by Partial Profile Editing....

Marcin Cieslak — Fri, 30 Dec 2011 09:29:37 +0100

Marcin Cieslak committed MAIN:marcin:20111230082937 on branch MAIN in lams

LDEV-1616: Add hidden fields so first and last name are submitted even if they are disabled by Partial Profile Editing.

Fix validation error messages overwriting.

· /lams_central/src/java/org/lamsfoundation/lams/web/ProfileAction.java	(-1, +7)	\| History	\| Source	\| Diff
· /lams_central/web/editprofile.jsp	(-0, +10)	\| History	\| Source	\| Diff

lams (MAIN): LDEV-2544 Default Timezones...

Andrey Balan — Fri, 01 Oct 2010 22:30:49 +0200

Andrey Balan committed MAIN:andreyb:20101001203049 on branch MAIN in lams

LDEV-2544 Default Timezones

*merge from lams2_3_release

· /lams_admin/conf/language/lams/ApplicationResources.properties

(-1, +16)

| History

| Source

| Diff

· /lams_admin/conf/xdoclet/struts-forms.xml

(-0, +6)

| History

| Source

| Diff

· /lams_admin/src/java/org/lamsfoundation/lams/admin/service/AdminServiceProxy.java

(-1, +10)

| History

| Source

| Diff

· /lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserAction.java

(-1, +7)

| History

| Source

| Diff

· /lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/SysAdminStartAction.java

(-1, +2)

| History

| Source

| Diff

· /lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/TimezoneManagementAction.java

(-0, +165)

| History

| Source

| Diff

· /lams_admin/web/timezoneManagement.jsp

(-0, +65)

| History

| Source

| Diff

· /lams_admin/web/timezoneServerManagement.jsp

(-0, +64)

| History

| Source

| Diff

· /lams_admin/web/WEB-INF/struts/struts-config.xml

(-0, +31)

| History

| Source

| Diff

· /lams_admin/web/WEB-INF/tiles/tiles-defs.xml

(-0, +10)

| History

| Source

| Diff

· /lams_build/lib/lams/lams.jar

(binary)

| History

| Source

| Diff

· /lams_central/conf/xdoclet/struts-forms.xml

(-1, +1)

| History

| Source

| Diff

· /lams_central/src/java/org/lamsfoundation/lams/web/ProfileAction.java

(-0, +28)

| History

| Source

| Diff

· /lams_central/web/editprofile.jsp

(-4, +4)

| History

| Source

| Diff

· /lams_common/build.xml

(-0, +1)

| History

| Source

| Diff

… 21 more files in changeset.

lams (lams2_3_release): LDEV-2544 it displays now both timezone ID and DisplayName

Andrey Balan — Tue, 06 Apr 2010 10:56:12 +0200

Andrey Balan committed lams2_3_release:andreyb:20100406085612 on branch lams2_3_release in lams

LDEV-2544 it displays now both timezone ID and DisplayName

· /lams_central/web/editprofile.jsp	(-1, +1)	\| History	\| Source	\| Diff
· /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java	(-4, +7)	\| History	\| Source	\| Diff

lams (lams2_3_release): LDEV-2544 adding Timezone Manager

Andrey Balan — Wed, 31 Mar 2010 21:14:32 +0200

Andrey Balan committed lams2_3_release:andreyb:20100331191432 on branch lams2_3_release in lams

LDEV-2544 adding Timezone Manager

· /lams_admin/conf/language/lams/ApplicationResources.properties	(-2, +2)	\| History	\| Source	\| Diff
· /lams_admin/conf/xdoclet/struts-forms.xml	(-0, +6)	\| History	\| Source	\| Diff
· /lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/TimezoneManagementAction.java	(-75, +30)	\| History	\| Source	\| Diff
· /lams_admin/web/timezonemanagement.jsp	(-10, +11)	\| History	\| Source	\| Diff
· /lams_admin/web/WEB-INF/struts/struts-config.xml	(-1, +6)	\| History	\| Source	\| Diff
· /lams_build/lib/lams/lams.jar	(binary)	\| History	\| Source	\| Diff
· /lams_central/web/editprofile.jsp	(-2, +2)	\| History	\| Source	\| Diff
· /lams_common/db/sql/create_lams_11_tables.sql	(-1, +1)	\| History	\| Source	\| Diff
· /lams_common/db/sql/insert_types_data.sql	(-8, +18)	\| History	\| Source	\| Diff
· /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch02030403.sql	(-1, +74)	\| History	\| Source	\| Diff
· /lams_common/src/java/org/lamsfoundation/lams/timezone/Timezone.java	(-1, +4)	\| History	\| Source	\| Diff
· /lams_common/src/java/org/lamsfoundation/lams/timezone/dto/TimezoneDTO.java	(-10, +16)	\| History	\| Source	\| Diff
· /lams_common/src/java/org/lamsfoundation/lams/timezone/util/TimezoneComparator.java	(-0, +51)	\| History	\| Source	\| Diff
· /lams_common/src/java/org/lamsfoundation/lams/timezone/util/TimezoneDTOComparator.java	(-3, +4)	\| History	\| Source	\| Diff
· /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java	(-4, +4)	\| History	\| Source	\| Diff
· /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java	(-3, +11)	\| History	\| Source	\| Diff

lams (lams2_3_release): LDEV-2544 adding Timezone Manager

Andrey Balan — Wed, 31 Mar 2010 01:49:56 +0200

Andrey Balan committed lams2_3_release:andreyb:20100330234956 on branch lams2_3_release in lams

LDEV-2544 adding Timezone Manager

· /lams_admin/conf/language/lams/ApplicationResources.properties

(-1, +15)

| History

| Source

| Diff

· /lams_admin/src/java/org/lamsfoundation/lams/admin/service/AdminServiceProxy.java

(-1, +10)

| History

| Source

| Diff

· /lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/SysAdminStartAction.java

(-1, +2)

| History

| Source

| Diff

· /lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/TimezoneManagementAction.java

(-0, +162)

| History

| Source

| Diff

· /lams_admin/web/timezonemanagement.jsp

(-0, +57)

| History

| Source

| Diff

· /lams_admin/web/WEB-INF/struts/struts-config.xml

(-280, +328)

| History

| Source

| Diff

· /lams_admin/web/WEB-INF/tiles/tiles-defs.xml

(-0, +5)

| History

| Source

| Diff

· /lams_build/lib/lams/lams.jar

(binary)

| History

| Source

| Diff

· /lams_central/conf/xdoclet/struts-forms.xml

(-1, +1)

| History

| Source

| Diff

· /lams_central/src/java/org/lamsfoundation/lams/web/ProfileAction.java

(-12, +39)

| History

| Source

| Diff

· /lams_central/web/editprofile.jsp

(-4, +4)

| History

| Source

| Diff

· /lams_central/web/WEB-INF/struts/struts-config.xml

(-216, +216)

| History

| Source

| Diff

· /lams_common/build.xml

(-0, +1)

| History

| Source

| Diff

· /lams_common/conf/hibernate/mappings/hibernate.cfg.xml

(-0, +1)

| History

| Source

| Diff

· /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/timezone/Timezone.hbm.xml

(-0, +36)

| History

| Source

| Diff

… 19 more files in changeset.

lams (lams2_3_release): LDEV-2531 updating timezone list

Andrey Balan — Tue, 23 Mar 2010 11:42:51 +0100

Andrey Balan committed lams2_3_release:andreyb:20100323104251 on branch lams2_3_release in lams

LDEV-2531 updating timezone list

· /lams_central/conf/language/lams/ApplicationResources.properties	(-1, +3)	\| History	\| Source	\| Diff
· /lams_central/conf/language/lams/ApplicationResources_en_AU.properties	(-1, +3)	\| History	\| Source	\| Diff
· /lams_central/web/editprofile.jsp	(-1, +1)	\| History	\| Source	\| Diff
· /lams_common/src/java/org/lamsfoundation/lams/usermanagement/User.java	(-2, +3)	\| History	\| Source	\| Diff

lams (lams2_3_release): LDEV-2531 fixing "daylight savings" problem

Andrey Balan — Mon, 22 Mar 2010 10:02:45 +0100

Andrey Balan committed lams2_3_release:andreyb:20100322090245 on branch lams2_3_release in lams

LDEV-2531 fixing "daylight savings" problem

· /lams_central/conf/language/lams/ApplicationResources.properties	(-30, +54)	\| History	\| Source	\| Diff
· /lams_central/conf/language/lams/ApplicationResources_en_AU.properties	(-30, +55)	\| History	\| Source	\| Diff
· /lams_central/web/editprofile.jsp	(-1, +1)	\| History	\| Source	\| Diff
· /lams_common/src/java/org/lamsfoundation/lams/usermanagement/User.java	(-9, +14)	\| History	\| Source	\| Diff

lams (lams2_3_release): LDEV-2517 Merging head theme changes with 2.3 branch for 2.3.4

lfoxton — Mon, 01 Mar 2010 05:53:24 +0100

lfoxton committed lams2_3_release:lfoxton:20100301045324 on branch lams2_3_release in lams

LDEV-2517 Merging head theme changes with 2.3 branch for 2.3.4

· /lams_admin/conf/language/lams/ApplicationResources.properties

(-1, +19)

| History

| Source

| Diff

· /lams_admin/conf/language/lams/ApplicationResources_en_AU.properties

(-1, +19)

| History

| Source

| Diff

· /lams_admin/conf/xdoclet/struts-forms.xml

(-0, +2)

| History

| Source

| Diff

· /lams_admin/src/java/org/lamsfoundation/lams/admin/service/AdminServiceProxy.java

(-1, +10)

| History

| Source

| Diff

· /lams_admin/src/java/org/lamsfoundation/lams/admin/service/ImportService.java

(-8, +8)

| History

| Source

| Diff

· /lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserAction.java

(-231, +293)

| History

| Source

| Diff

· /lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserSaveAction.java

(-127, +144)

| History

| Source

| Diff

· /lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/SysAdminStartAction.java

(-1, +2)

| History

| Source

| Diff

· /lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/ThemeManagementAction.java

(-0, +197)

| History

| Source

| Diff

· /lams_admin/src/java/org/lamsfoundation/lams/admin/web/form/ThemeForm.java

(-0, +101)

| History

| Source

| Diff

· /lams_admin/web/themeManagement.jsp

(-0, +216)

| History

| Source

| Diff

· /lams_admin/web/user.jsp

(-0, +20)

| History

| Source

| Diff

· /lams_admin/web/WEB-INF/tiles/tiles-defs.xml

(-0, +5)

| History

| Source

| Diff

· /lams_central/conf/language/lams/ApplicationResources.properties

(-1, +3)

| History

| Source

| Diff

· /lams_central/conf/language/lams/ApplicationResources_en_AU.properties

(-1, +3)

| History

| Source

| Diff

… 50 more files in changeset.

lams (MAIN): LDEV-1616 configuration to allow profile editing

jliew — Fri, 06 Nov 2009 07:48:31 +0100

jliew committed MAIN:jliew:20091106064831 on branch MAIN in lams

LDEV-1616 configuration to allow profile editing

· /lams_admin/conf/language/lams/ApplicationResources.properties	(-1, +3)	\| History	\| Source	\| Diff
· /lams_admin/conf/language/lams/ApplicationResources_en_AU.properties	(-1, +3)	\| History	\| Source	\| Diff
· /lams_central/conf/language/lams/ApplicationResources.properties	(-1, +3)	\| History	\| Source	\| Diff
· /lams_central/conf/language/lams/ApplicationResources_en_AU.properties	(-1, +3)	\| History	\| Source	\| Diff
· /lams_central/src/java/org/lamsfoundation/lams/web/ProfileAction.java	(-0, +12)	\| History	\| Source	\| Diff
· /lams_central/src/java/org/lamsfoundation/lams/web/ProfileSaveAction.java	(-22, +38)	\| History	\| Source	\| Diff
· /lams_central/web/editprofile.jsp	(-26, +30)	\| History	\| Source	\| Diff
· /lams_common/db/sql/insert_lams_unix_config_data.sql	(-0, +6)	\| History	\| Source	\| Diff
· /lams_common/db/sql/insert_lams_windows_config_data.sql	(-0, +6)	\| History	\| Source	\| Diff
· /lams_common/db/sql/insert_types_data.sql	(-2, +2)	\| History	\| Source	\| Diff
· /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch02040002.sql	(-0, +11)	\| History	\| Source
· /lams_common/src/java/org/lamsfoundation/lams/util/ConfigurationKeys.java	(-1, +5)	\| History	\| Source	\| Diff

lams (MAIN): LDEV-2420 Removing uneccessary data structures and tables from the db, as well as implementing the same theme settings f...

lfoxton — Thu, 20 Aug 2009 06:37:18 +0200

lfoxton committed MAIN:lfoxton:20090820043718 on branch MAIN in lams

LDEV-2420 Removing uneccessary data structures and tables from the db, as well as implementing the same theme settings for flash themes

· /lams_admin/conf/language/lams/ApplicationResources.properties

(-1, +4)

| History

| Source

| Diff

· /lams_admin/conf/language/lams/ApplicationResources_en_AU.properties

(-1, +4)

| History

| Source

| Diff

· /lams_admin/src/java/org/lamsfoundation/lams/admin/service/ImportService.java

(-10, +10)

| History

| Source

| Diff

· /lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/ThemeManagementAction.java

(-33, +56)

| History

| Source

| Diff

· /lams_admin/src/java/org/lamsfoundation/lams/admin/web/form/ThemeForm.java

(-1, +8)

| History

| Source

| Diff

· /lams_admin/web/themeManagement.jsp

(-7, +32)

| History

| Source

| Diff

· /lams_central/conf/language/lams/ApplicationResources.properties

(-2, +3)

| History

| Source

| Diff

· /lams_central/conf/language/lams/ApplicationResources_en_AU.properties

(-2, +3)

| History

| Source

| Diff

· /lams_central/conf/xdoclet/struts-forms.xml

(-1, +2)

| History

| Source

| Diff

· /lams_central/src/java/org/lamsfoundation/lams/security/UniversalLoginModule.java

(-8, +24)

| History

| Source

| Diff

· /lams_central/src/java/org/lamsfoundation/lams/web/ProfileAction.java

(-11, +30)

| History

| Source

| Diff

· /lams_central/src/java/org/lamsfoundation/lams/web/ProfileSaveAction.java

(-5, +9)

| History

| Source

| Diff

· /lams_central/web/editprofile.jsp

(-8, +28)

| History

| Source

| Diff

· /lams_central/web/WEB-INF/struts/struts-config.xml

(-1, +2)

| History

| Source

| Diff

· /lams_common/conf/hibernate/mappings/hibernate.cfg.xml

(-3, +1)

| History

| Source

| Diff

… 35 more files in changeset.

lams (MAIN): LDEV-2420 Adding functionality to add new themes to the database. All that is left now is to remove the defunct tables t...

lfoxton — Wed, 19 Aug 2009 08:45:15 +0200

lfoxton committed MAIN:lfoxton:20090819064515 on branch MAIN in lams

LDEV-2420 Adding functionality to add new themes to the database. All that is left now is to remove the defunct tables that are not used

· /lams_admin/conf/language/lams/ApplicationResources.properties

(-2, +14)

| History

| Source

| Diff

· /lams_admin/conf/language/lams/ApplicationResources_en_AU.properties

(-2, +14)

| History

| Source

| Diff

· /lams_admin/src/java/org/lamsfoundation/lams/admin/service/AdminServiceProxy.java

(-1, +10)

| History

| Source

| Diff

· /lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/SysAdminStartAction.java

(-1, +2)

| History

| Source

| Diff

· /lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/ThemeManagementAction.java

(-0, +170)

| History

| Source

· /lams_admin/src/java/org/lamsfoundation/lams/admin/web/form/ThemeForm.java

(-0, +94)

| History

| Source

· /lams_admin/web/themeManagement.jsp

(-0, +191)

| History

| Source

· /lams_admin/web/WEB-INF/struts/struts-config.xml

(-0, +34)

| History

| Source

| Diff

· /lams_admin/web/WEB-INF/tiles/tiles-defs.xml

(-0, +6)

| History

| Source

| Diff

· /lams_central/conf/language/lams/ApplicationResources.properties

(-2, +3)

| History

| Source

| Diff

· /lams_central/conf/language/lams/ApplicationResources_en_AU.properties

(-3, +3)

| History

| Source

| Diff

· /lams_central/conf/xdoclet/struts-forms.xml

(-0, +1)

| History

| Source

| Diff

· /lams_central/src/java/org/lamsfoundation/lams/security/UniversalLoginModule.java

(-5, +39)

| History

| Source

| Diff

· /lams_central/src/java/org/lamsfoundation/lams/web/ProfileAction.java

(-2, +38)

| History

| Source

| Diff

· /lams_central/src/java/org/lamsfoundation/lams/web/ProfileSaveAction.java

(-1, +6)

| History

| Source

| Diff

… 7 more files in changeset.

lams (MAIN): Recreated/updated several resources removed by previous merge.

Marcin Cieslak — Mon, 06 Jul 2009 13:04:11 +0200

Marcin Cieslak committed MAIN:marcin:20090706110411 on branch MAIN in lams

Recreated/updated several resources removed by previous merge.

· /lams_central/build.xml	(-7, +7)	\| History	\| Source	\| Diff
· /lams_central/src/java/org/lamsfoundation/lams/web/TutorialAction.java	(-0, +173)	\| History	\| Source	\| Diff
· /lams_central/web/editprofile.jsp	(-2, +1)	\| History	\| Source	\| Diff
· /lams_central/web/tutorialVideo.jsp	(-0, +102)	\| History	\| Source	\| Diff
· /lams_central/web/includes/javascript/thickbox.patched.js	(-28, +13)	\| History	\| Source	\| Diff
· /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch0017_updateFrom23-231.sql	(-0, +11)	\| History	\| Source	\| Diff

lams (MAIN): LDEV-2369: Added tutorial video functionality to HEAD (previously removed from 2.3 branch)....

Marcin Cieslak — Fri, 19 Jun 2009 12:50:33 +0200

Marcin Cieslak committed MAIN:marcin:20090619105033 on branch MAIN in lams

LDEV-2369: Added tutorial video functionality to HEAD (previously removed from 2.3 branch).

Fixed IE > 6 bug preventing Thickbox to be centered on the screen.

· /lams_central/conf/language/lams/ApplicationResources.properties

(-36, +47)

| History

| Source

| Diff

· /lams_central/conf/xdoclet/struts-forms.xml

(-0, +1)

| History

| Source

| Diff

· /lams_central/src/java/org/lamsfoundation/lams/web/IndexAction.java

(-1, +22)

| History

| Source

| Diff

· /lams_central/src/java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerAction.java

(-2, +19)

| History

| Source

| Diff

· /lams_central/web/editprofile.jsp

(-0, +26)

| History

| Source

| Diff

· /lams_central/web/main.jsp

(-1, +10)

| History

| Source

| Diff

· /lams_central/web/css/pedagogicalPlanner.css

(-0, +16)

| History

| Source

| Diff

· /lams_central/web/includes/javascript/thickbox.patched.js

(-0, +342)

| History

| Source

· /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/User.hbm.xml

(-0, +30)

| History

| Source

| Diff

· /lams_common/db/sql/create_lams_11_tables.sql

(-0, +9)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/usermanagement/User.java

(-5, +54)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/usermanagement/dto/UserDTO.java

(-23, +55)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/web/util/AttributeNames.java

(-2, +7)

| History

| Source

| Diff

· /lams_learning/web/mainnoflash.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_tool_assessment/web/pages/authoring/authoring.jsp

(-4, +6)

| History

| Source

| Diff

… 4 more files in changeset.

lams (lams2_3): Undoing some changes not meant for 2.3.1 particularly for LDEV-2389

lfoxton — Fri, 19 Jun 2009 06:32:09 +0200

lfoxton committed lams2_3:lfoxton:20090619043209 on branch lams2_3 in lams

Undoing some changes not meant for 2.3.1 particularly for LDEV-2389

· /lams_central/build.xml	(-6, +6)	\| History	\| Source	\| Diff
· /lams_central/conf/language/lams/ApplicationResources.properties	(-7, +2)	\| History	\| Source	\| Diff
· /lams_central/conf/xdoclet/struts-forms.xml	(-1, +0)	\| History	\| Source	\| Diff
· /lams_central/src/java/org/lamsfoundation/lams/web/IndexAction.java	(-20, +4)	\| History	\| Source	\| Diff
· /lams_central/src/java/org/lamsfoundation/lams/web/TutorialAction.java	(-173, +0)	\| History	\| Source	\| Diff
· /lams_central/src/java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerAction.java	(-18, +3)	\| History	\| Source	\| Diff
· /lams_central/web/editprofile.jsp	(-26, +0)	\| History	\| Source	\| Diff
· /lams_central/web/main.jsp	(-9, +0)	\| History	\| Source	\| Diff
· /lams_central/web/tutorialVideo.jsp	(-102, +0)	\| History	\| Source	\| Diff
· /lams_central/web/css/pedagogicalPlanner.css	(-16, +0)	\| History	\| Source	\| Diff
· /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/User.hbm.xml	(-30, +0)	\| History	\| Source	\| Diff
· /lams_common/db/sql/create_lams_11_tables.sql	(-9, +0)	\| History	\| Source	\| Diff
· /lams_common/src/java/org/lamsfoundation/lams/dbupdates/Patch0017_updateFrom23-231.sql	(-27, +0)	\| History	\| Source	\| Diff
· /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch0017_updateFrom23-231.sql	(-0, +15)	\| History	\| Source	\| Diff
· /lams_common/src/java/org/lamsfoundation/lams/usermanagement/User.java	(-52, +4)	\| History	\| Source	\| Diff
· /lams_common/src/java/org/lamsfoundation/lams/usermanagement/dto/UserDTO.java	(-54, +22)	\| History	\| Source	\| Diff
· /lams_common/src/java/org/lamsfoundation/lams/web/util/AttributeNames.java	(-6, +1)	\| History	\| Source	\| Diff

lams (lams2_3): LDEV-2369: Added further tutorial video functionality: user can disable single video, or all of them in his profile. Als...

Marcin Cieslak — Thu, 18 Jun 2009 21:43:09 +0200

Marcin Cieslak committed lams2_3:marcin:20090618194309 on branch lams2_3 in lams

LDEV-2369: Added further tutorial video functionality: user can disable single video, or all of them in his profile. Also, a dialog after first login is displayed.

Additionally, a small bug preventing Ped Planner to be properly deployed during whole LAMS build was fixed.

· /lams_central/build.xml	(-6, +6)	\| History	\| Source	\| Diff
· /lams_central/conf/language/lams/ApplicationResources.properties	(-1, +5)	\| History	\| Source	\| Diff
· /lams_central/conf/xdoclet/struts-forms.xml	(-0, +1)	\| History	\| Source	\| Diff
· /lams_central/src/java/org/lamsfoundation/lams/web/IndexAction.java	(-4, +20)	\| History	\| Source	\| Diff
· /lams_central/src/java/org/lamsfoundation/lams/web/TutorialAction.java	(-0, +173)	\| History	\| Source	\| Diff
· /lams_central/src/java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerAction.java	(-4, +19)	\| History	\| Source	\| Diff
· /lams_central/web/editprofile.jsp	(-0, +26)	\| History	\| Source	\| Diff
· /lams_central/web/main.jsp	(-0, +9)	\| History	\| Source	\| Diff
· /lams_central/web/tutorialVideo.jsp	(-4, +73)	\| History	\| Source	\| Diff
· /lams_central/web/css/pedagogicalPlanner.css	(-0, +6)	\| History	\| Source	\| Diff
· /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/User.hbm.xml	(-0, +30)	\| History	\| Source	\| Diff
· /lams_common/db/sql/create_lams_11_tables.sql	(-0, +9)	\| History	\| Source	\| Diff
· /lams_common/src/java/org/lamsfoundation/lams/dbupdates/Patch0017_updateFrom23-231.sql	(-1, +13)	\| History	\| Source	\| Diff
· /lams_common/src/java/org/lamsfoundation/lams/usermanagement/User.java	(-5, +53)	\| History	\| Source	\| Diff
· /lams_common/src/java/org/lamsfoundation/lams/usermanagement/dto/UserDTO.java	(-23, +55)	\| History	\| Source	\| Diff
· /lams_common/src/java/org/lamsfoundation/lams/web/util/AttributeNames.java	(-2, +7)	\| History	\| Source	\| Diff