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
Monday 09 May 2016
10:27 pm

Marcin Cieslak

LDEV-3773: Remove Workspace and WorkspaceWorkspaceFolder entities. Link WorkspaceFolders directly to User and Organisation. General clean up.

Options
    • binary
    /lams_build/lib/lams/lams.jar
    • -6
    • +2
    /lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java
    • -4
    • +4
    /lams_central/src/java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerAction.java
    • -36
    • +12
    /lams_central/src/java/org/lamsfoundation/lams/workspace/service/WorkspaceManagementService.java
    • -81
    • +76
    /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/Organisation.hbm.xml
    • -577
    • +406
    /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/User.hbm.xml
    • -145
    • +0
    /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/Workspace.hbm.xml
    • -119
    • +101
    /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/WorkspaceFolder.hbm.xml
    • -66
    • +0
    /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/WorkspaceWorkspaceFolder.hbm.xml
    • -0
    • +29
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch2040062.sql
    • -1
    • +1
    /lams_common/src/java/org/lamsfoundation/lams/integration/service/IntegrationService.java
    • -4
    • +4
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java
    • -5
    • +27
    /lams_common/src/java/org/lamsfoundation/lams/usermanagement/Organisation.java
    • -19
    • +12
    /lams_common/src/java/org/lamsfoundation/lams/usermanagement/User.java
    • -204
    • +0
    /lams_common/src/java/org/lamsfoundation/lams/usermanagement/Workspace.java
  16. … 5 more files in changeset.
9:46 pm

Marcin Cieslak

LDEV-3773: Remove Workspace and WorkspaceWorkspaceFolder entities. Link WorkspaceFolders directly to User and Organisation. General clean up.

Options
    • binary
    /lams_build/lib/lams/lams-central.jar
    • binary
    /lams_build/lib/lams/lams.jar
    • -6
    • +2
    /lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java
    • -4
    • +4
    /lams_central/src/java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerAction.java
    • -10
    • +0
    /lams_central/src/java/org/lamsfoundation/lams/workspace/service/IWorkspaceManagementService.java
    • -65
    • +24
    /lams_central/src/java/org/lamsfoundation/lams/workspace/service/WorkspaceManagementService.java
    • -227
    • +83
    /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/Organisation.hbm.xml
    • -604
    • +388
    /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/User.hbm.xml
    • -145
    • +0
    /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/Workspace.hbm.xml
    • -119
    • +70
    /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/WorkspaceFolder.hbm.xml
    • -66
    • +0
    /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/WorkspaceWorkspaceFolder.hbm.xml
    • -0
    • +29
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch2040062.sql
    • -1
    • +1
    /lams_common/src/java/org/lamsfoundation/lams/integration/service/IntegrationService.java
    • -4
    • +4
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java
    • -5
    • +27
    /lams_common/src/java/org/lamsfoundation/lams/usermanagement/Organisation.java
  16. … 7 more files in changeset.
8:13 pm

FionaMalikoff <Fiona.Malikoff@gmail.com>

LDEV-3754 LDEV-3755 Cleaning up inconsistencies in DACO found while doing Forum

Options
    • -2
    • +2
    /lams_tool_daco/web/WEB-INF/tags/AdvancedAccordian.tag
    • -2
    • +1
    /lams_tool_daco/web/common/jqueryheader.jsp
    • -1
    • +1
    /lams_tool_daco/web/pages/authoring/advanced.jsp
    • -1
    • +1
    /lams_tool_daco/web/pages/authoring/basic.jsp
    • -6
    • +2
    /lams_tool_daco/web/pages/monitoring/summary.jsp
8:06 pm

FionaMalikoff <Fiona.Malikoff@gmail.com>

LDEV-3775: Adding a RestrictedUsage tag to make the date restriction section easier in monitor. Updated javascript to match. Tweaked other tags.

Options
    • -2
    • +2
    /lams_central/web/WEB-INF/tags/AdvancedAccordian.tag
    • -1
    • +1
    /lams_central/web/WEB-INF/tags/AuthoringButton.tag
    • -0
    • +54
    /lams_central/web/WEB-INF/tags/RestrictedUsageAccordian.tag
    • -0
    • +4
    /lams_central/web/WEB-INF/tlds/lams/lams.tld
    • -4
    • +11
    /lams_central/web/includes/javascript/monitorToolSummaryAdvanced.js
8:03 pm

FionaMalikoff <Fiona.Malikoff@gmail.com>

LDEV-3775: Bootstrap authoring and monitor. A couple of the secondary screens in monitor have been rationalised to reduce mouse clicks and to reuse existing screens.

Options
    • -1
    • +12
    /lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/LearningAction.java
    • -0
    • +1
    /lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/MonitoringAction.java
    • -0
    • +53
    /lams_tool_forum/web/WEB-INF/tags/AdvancedAccordian.tag
    • -0
    • +35
    /lams_tool_forum/web/WEB-INF/tags/Arrow.tag
    • -5
    • +5
    /lams_tool_forum/web/WEB-INF/tags/AuthoringButton.tag
    • -4
    • +12
    /lams_tool_forum/web/WEB-INF/tags/CKEditor.tag
    • -0
    • +47
    /lams_tool_forum/web/WEB-INF/tags/Comments.tag
    • -0
    • +51
    /lams_tool_forum/web/WEB-INF/tags/CommentsAuthor.tag
    • -7
    • +20
    /lams_tool_forum/web/WEB-INF/tags/Page.tag
    • -0
    • +91
    /lams_tool_forum/web/WEB-INF/tags/ProgressBar.tag
    • -0
    • +54
    /lams_tool_forum/web/WEB-INF/tags/RestrictedUsageAccordian.tag
    • -0
    • +53
    /lams_tool_forum/web/WEB-INF/tags/TSTable.tag
    • -85
    • +89
    /lams_tool_forum/web/WEB-INF/tags/Tab.tag
    • -52
    • +44
    /lams_tool_forum/web/WEB-INF/tags/TabBody.tag
    • -0
    • +39
    /lams_tool_forum/web/WEB-INF/tags/TabBodyArea.tag
  16. … 34 more files in changeset.
5:05 pm

Marcin Cieslak

LDEV-3777: Make Authoring interface closeable even after a Tool threw an exception.

Options
    • -2
    • +5
    /lams_central/web/includes/javascript/groupDisplay.js
10:15 am

FionaMalikoff <Fiona.Malikoff@gmail.com>

LDEV-3779: Name parameters must be straight after the tool_session join, and not after the notebook entry join, or the user name parameters are ignored in the sql query.

Options
    • -3
    • +3
    /lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/ForumUserDao.java
10:05 am

FionaMalikoff <Fiona.Malikoff@gmail.com>

LDEV-3779: Name parameters must be straight after the tool_session join, and not after the notebook entry join, or the user name parameters are ignored in the sql query.

Options
    • -3
    • +3
    /lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/hibernate/ForumUserDao.java
Thursday 05 May 2016
11:40 pm

Andrey Balan

LDEV-3721 adding cursor:pointer; rule to navbar buttons

Options
    • -0
    • +4
    /lams_central/web/css/defaultHTML_learner.css
4:11 pm

Marcin Cieslak

LDEV-3776: Clean up and format all LAMS Java code.

Options
    • -5
    • +5
    /TestHarness4LAMS2/src/org/lamsfoundation/testharness/AbstractTest.java
    • -9
    • +9
    /TestHarness4LAMS2/src/org/lamsfoundation/testharness/Call.java
    • -8
    • +8
    /TestHarness4LAMS2/src/org/lamsfoundation/testharness/Main.java
    • -11
    • +13
    /TestHarness4LAMS2/src/org/lamsfoundation/testharness/MockUser.java
    • -8
    • +8
    /TestHarness4LAMS2/src/org/lamsfoundation/testharness/TestHarnessException.java
    • -20
    • +21
    /TestHarness4LAMS2/src/org/lamsfoundation/testharness/TestManager.java
    • -72
    • +75
    /TestHarness4LAMS2/src/org/lamsfoundation/testharness/TestReporter.java
    • -8
    • +8
    /TestHarness4LAMS2/src/org/lamsfoundation/testharness/TestSuite.java
    • -5
    • +5
    /TestHarness4LAMS2/src/org/lamsfoundation/testharness/TestUtil.java
    • -10
    • +10
    /TestHarness4LAMS2/src/org/lamsfoundation/testharness/admin/AdminTest.java
    • -8
    • +8
    /TestHarness4LAMS2/src/org/lamsfoundation/testharness/admin/MockAdmin.java
    • -8
    • +8
    /TestHarness4LAMS2/src/org/lamsfoundation/testharness/author/AuthorTest.java
    • -16
    • +16
    /TestHarness4LAMS2/src/org/lamsfoundation/testharness/author/MockAuthor.java
    • -18
    • +20
    /TestHarness4LAMS2/src/org/lamsfoundation/testharness/learner/LearnerTest.java
    • -51
    • +54
    /TestHarness4LAMS2/src/org/lamsfoundation/testharness/learner/MockLearner.java
  16. … 2106 more files in changeset.
4:11 pm

Marcin Cieslak

LDEV-3776: Clean up and format all LAMS Java code.

Options
    • -5
    • +5
    /TestHarness4LAMS2/src/org/lamsfoundation/testharness/AbstractTest.java
    • -7
    • +7
    /TestHarness4LAMS2/src/org/lamsfoundation/testharness/Call.java
    • -8
    • +8
    /TestHarness4LAMS2/src/org/lamsfoundation/testharness/Main.java
    • -7
    • +9
    /TestHarness4LAMS2/src/org/lamsfoundation/testharness/MockUser.java
    • -8
    • +8
    /TestHarness4LAMS2/src/org/lamsfoundation/testharness/TestHarnessException.java
    • -5
    • +5
    /TestHarness4LAMS2/src/org/lamsfoundation/testharness/TestManager.java
    • -72
    • +75
    /TestHarness4LAMS2/src/org/lamsfoundation/testharness/TestReporter.java
    • -13
    • +13
    /TestHarness4LAMS2/src/org/lamsfoundation/testharness/TestSuite.java
    • -5
    • +5
    /TestHarness4LAMS2/src/org/lamsfoundation/testharness/TestUtil.java
    • -10
    • +10
    /TestHarness4LAMS2/src/org/lamsfoundation/testharness/admin/AdminTest.java
    • -8
    • +8
    /TestHarness4LAMS2/src/org/lamsfoundation/testharness/admin/MockAdmin.java
    • -8
    • +8
    /TestHarness4LAMS2/src/org/lamsfoundation/testharness/author/AuthorTest.java
    • -16
    • +16
    /TestHarness4LAMS2/src/org/lamsfoundation/testharness/author/MockAuthor.java
    • -18
    • +20
    /TestHarness4LAMS2/src/org/lamsfoundation/testharness/learner/LearnerTest.java
    • -51
    • +54
    /TestHarness4LAMS2/src/org/lamsfoundation/testharness/learner/MockLearner.java
  16. … 1846 more files in changeset.
3:41 pm

Marcin Cieslak

LDEV-3776: Clean up and format all LAMS Java code.

Options
    • -2
    • +2
    /lams_admin/src/java/org/lamsfoundation/lams/admin/AdminConstants.java
    • -8
    • +8
    /lams_admin/src/java/org/lamsfoundation/lams/admin/service/AdminServiceProxy.java
    • -73
    • +79
    /lams_admin/src/java/org/lamsfoundation/lams/admin/service/IImportService.java
    • -1
    • +1
    /lams_admin/src/java/org/lamsfoundation/lams/admin/service/ImportService.java
    • -87
    • +83
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/ConfigAction.java
    • -24
    • +22
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/DisabledUserManageAction.java
    • -15
    • +14
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/ImportExcelAction.java
    • -19
    • +19
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/ImportExcelForm.java
    • -49
    • +50
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/ImportExcelSaveAction.java
    • -37
    • +37
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/LoginMaintainAction.java
    • -90
    • +83
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/LoginSaveAction.java
    • -16
    • +17
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/OrgManageAction.java
    • -72
    • +88
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/OrgManageBean.java
    • -168
    • +180
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/OrgSaveAction.java
    • -13
    • +16
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/OrganisationAction.java
  16. … 36 more files in changeset.
3:39 pm

Marcin Cieslak

LDEV-3776: Clean up and format all LAMS Java code.

Options
    • -2
    • +2
    /lams_admin/src/java/org/lamsfoundation/lams/admin/AdminConstants.java
    • -8
    • +8
    /lams_admin/src/java/org/lamsfoundation/lams/admin/service/AdminServiceProxy.java
    • -73
    • +79
    /lams_admin/src/java/org/lamsfoundation/lams/admin/service/IImportService.java
    • -627
    • +632
    /lams_admin/src/java/org/lamsfoundation/lams/admin/service/ImportService.java
    • -90
    • +91
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/CacheAction.java
    • -28
    • +28
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/CacheActionForm.java
    • -87
    • +85
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/ConfigAction.java
    • -24
    • +22
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/DisabledUserManageAction.java
    • -18
    • +17
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/ImportExcelAction.java
    • -19
    • +19
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/ImportExcelForm.java
    • -53
    • +54
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/ImportExcelSaveAction.java
    • -37
    • +37
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/LoginMaintainAction.java
    • -88
    • +81
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/LoginSaveAction.java
    • -60
    • +63
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/OpenIDConfigAction.java
    • -32
    • +33
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/OpenIDConfigForm.java
  16. … 41 more files in changeset.
12:58 pm

Andrey Balan

LDEV-3752 Gradebook .xlsx export to include time stamps for start and completion

Options
    • binary
    /lams_build/lib/lams/lams.jar
8:14 am

FionaMalikoff <Fiona.Malikoff@gmail.com>

LDEV-3775: Overriding standard form-control parameters so that text boxes can go on the same line as a checkbox.

Options
    • -0
    • +5
    /lams_central/web/css/defaultHTML_learner.css
Wednesday 04 May 2016
10:53 pm

Andrey Balan

LDEV-3752 Gradebook .xlsx export to include time stamps for start and completion

Options
    • -1
    • +1
    /lams_common/src/java/org/lamsfoundation/lams/util/FileUtil.java
    • -0
    • +19
    /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/dto/GBUserGridRowDTO.java
    • -45
    • +154
    /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java
10:04 pm

Marcin Cieslak

NTU-5: Modify login mechanism so it redirects unauthenticated user to IdP instead of standard login page.

Options
    • -0
    • +2
    /lams_central/web/login.jsp
9:40 pm

Marcin Cieslak

NTU-5: Modify login mechanism so it redirects unauthenticated user to IdP instead of standard login page.

Options
    • -1
    • +4
    /lams_central/web/login.jsp
7:20 pm

Andrey Balan

LDEV-3752 Course gradebook .xlsx export to include time stamps for start and completion

Options
    • -21
    • +66
    /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java
7:20 pm

Andrey Balan

LDEV-3752 Timestamp to show minutes and seconds

Options
    • -1
    • +1
    /lams_common/src/java/org/lamsfoundation/lams/util/FileUtil.java
7:01 pm

Marcin Cieslak

LDEV-3768: Commit ignored files.

Options
    • -4
    • +0
    /lams_tool_scratchie/web/WEB-INF/.cvsignore
    • -0
    • +324
    /lams_tool_scratchie/web/WEB-INF/struts-config.xml
    • -0
    • +42
    /lams_tool_scratchie/web/WEB-INF/validation.xml
5:26 pm

Marcin Cieslak

LDEV-3273: Remove obsolete reference to a JS file.

Options
    • -1
    • +0
    /lams_tool_scratchie/web/common/tabbedheader.jsp
3:44 pm

Marcin Cieslak

LDEV-3768: Remove references to "assembly" dir in Ant build files. Clean up lams-www.

Options
    • -1
    • +1
    /lams_central/build.xml
    • -1
    • +1
    /lams_learning/build.xml
    • -1
    • +1
    /lams_tool_chat/build.xml
    • -1
    • +1
    /lams_tool_scratchie/build.xml
    • -1
    • +1
    /lams_tool_scribe/build.xml
    • -37
    • +0
    /lams_www/build.xml
    • -44
    • +0
    /lams_www/conf/lams/news.html
    • binary
    /lams_www/web/help/troubleshoot-en_AU.pdf
    • binary
    /lams_www/web/help/troubleshoot-no_NO.pdf
    • -0
    • +44
    /lams_www/web/news.html
1:42 pm

Marcin Cieslak

LDEV-3768: Remove unused tags.

Options
    • -89
    • +0
    /lams_www/web/WEB-INF/web.xml
1:39 pm

FionaMalikoff <Fiona.Malikoff@gmail.com>

LDEV-3754: Missed define later screen on first pass.

Options
    • -35
    • +26
    /lams_tool_daco/web/pages/authoring/definelater.jsp
12:51 pm

FionaMalikoff <Fiona.Malikoff@gmail.com>

LDEV-3754: Tweaking size of popup window so that when teacher does Edit Activity from the monitor screen, the navbar doesn't collapse. Bootstrap was recognising the smaller size as a table and collapsing fields, etc in Firefox on OS/X.

Options
    • -1
    • +1
    /lams_central/web/includes/javascript/common.js
11:48 am

FionaMalikoff <Fiona.Malikoff@gmail.com>

LDEV-3755: Updated CKEditor

Options
    • -4
    • +12
    /lams_tool_daco/web/WEB-INF/tags/CKEditor.tag
11:46 am

FionaMalikoff <Fiona.Malikoff@gmail.com>

LDEV-3762: Updating CKEditor to bootstrapped version

Options
    • -4
    • +12
    /lams_tool_nb/web/WEB-INF/tags/CKEditor.tag
9:44 am

FionaMalikoff <Fiona.Malikoff@gmail.com>

LDEV-3774: CKEditor defaults to inline and is formatted to look like a bootstrap text-area field.

Options
    • -4
    • +12
    /lams_central/web/WEB-INF/tags/CKEditor.tag
    • -0
    • +79
    /lams_central/web/ckeditor/plugins/sourcedialog/dialogs/sourcedialog.js
    • binary
    /lams_central/web/ckeditor/plugins/sourcedialog/icons/hidpi/sourcedialog-rtl.png
    • binary
    /lams_central/web/ckeditor/plugins/sourcedialog/icons/hidpi/sourcedialog.png
    • binary
    /lams_central/web/ckeditor/plugins/sourcedialog/icons/sourcedialog-rtl.png
    • binary
    /lams_central/web/ckeditor/plugins/sourcedialog/icons/sourcedialog.png
    • -0
    • +9
    /lams_central/web/ckeditor/plugins/sourcedialog/lang/af.js
    • -0
    • +9
    /lams_central/web/ckeditor/plugins/sourcedialog/lang/ar.js
    • -0
    • +9
    /lams_central/web/ckeditor/plugins/sourcedialog/lang/bg.js
    • -0
    • +9
    /lams_central/web/ckeditor/plugins/sourcedialog/lang/bn.js
    • -0
    • +9
    /lams_central/web/ckeditor/plugins/sourcedialog/lang/bs.js
    • -0
    • +9
    /lams_central/web/ckeditor/plugins/sourcedialog/lang/ca.js
    • -0
    • +9
    /lams_central/web/ckeditor/plugins/sourcedialog/lang/cs.js
    • -0
    • +9
    /lams_central/web/ckeditor/plugins/sourcedialog/lang/cy.js
    • -0
    • +9
    /lams_central/web/ckeditor/plugins/sourcedialog/lang/da.js
  16. … 60 more files in changeset.
7:42 am

FionaMalikoff <Fiona.Malikoff@gmail.com>

LDEV-3755: Removed extra jquery includes that were breaking the tabs.

Options
    • -5
    • +0
    /lams_tool_daco/web/includes/javascript/dacoAuthoring.js
    • -2
    • +4
    /lams_tool_daco/web/pages/authoring/parts/addcheckbox.jsp
    • -2
    • +4
    /lams_tool_daco/web/pages/authoring/parts/adddate.jsp
    • -2
    • +4
    /lams_tool_daco/web/pages/authoring/parts/adddropdown.jsp
    • -2
    • +4
    /lams_tool_daco/web/pages/authoring/parts/addfile.jsp
    • -2
    • +4
    /lams_tool_daco/web/pages/authoring/parts/addimage.jsp
    • -3
    • +4
    /lams_tool_daco/web/pages/authoring/parts/addlonglat.jsp
    • -2
    • +4
    /lams_tool_daco/web/pages/authoring/parts/addnumber.jsp
    • -2
    • +4
    /lams_tool_daco/web/pages/authoring/parts/addradio.jsp
    • -2
    • +4
    /lams_tool_daco/web/pages/authoring/parts/addtextarea.jsp
    • -2
    • +4
    /lams_tool_daco/web/pages/authoring/parts/addtextfield.jsp