lams

Tools

Line History

Line Count Graph
Line Count Graph

Stats

Commits this week: 0
Total Committers: 33
Last Commit:
Commits this week: 0
Total Lines of Code (LoC): 4,779,243
Net change in LoC this week: 0

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
Wednesday 10 Feb 2016
2:41 am

Andrey Balan

LDEV-3587 Modify Tasks monitor UI to support paging, sort and search

Options
    • -28
    • +33
    /lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dao/TaskListItemVisitDAO.java
    • -26
    • +71
    /lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dao/TaskListUserDAO.java
    • -56
    • +80
    /lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dto/ReflectDTO.java
    • -0
    • +98
    /lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dto/SessionDTO.java
    • -114
    • +0
    /lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dto/Summary.java
    • -0
    • +59
    /lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dto/TaskListUserDTO.java
    • -43
    • +0
    /lams_tool_task/web/pages/monitoring/daterestriction.jsp
    • -149
    • +159
    /lams_tool_task/web/pages/monitoring/itemsummary.jsp
    • -9
    • +6
    /lams_tool_task/web/pages/monitoring/statistic.jsp
    • -229
    • +112
    /lams_tool_task/web/pages/monitoring/summary.jsp
    • -54
    • +0
    /lams_tool_task/web/pages/monitoring/userlist.jsp
    • -0
    • +109
    /lams_tool_task/web/pages/monitoring/parts/advanceoptions.jsp
    • -0
    • +43
    /lams_tool_task/web/pages/monitoring/parts/daterestriction.jsp
    • -48
    • +0
    /lams_tool_task/web/pages/monitoring/parts/notebook.jsp
    • -0
    • +23
    /lams_tool_task/web/pages/monitoring/parts/reflections.jsp
2:32 am

Andrey Balan

LDEV-3659 Fixed JS error on trying to leave Advanced tab in authoring

Options
    • -5
    • +0
    /lams_tool_task/web/pages/authoring/authoring.jsp
12:08 am

Ernie Ghiglione

LDEV-3575 fixing typo

Options
    • -2
    • +2
    /lams_common/src/java/org/lamsfoundation/lams/commonContext.xml
Tuesday 09 Feb 2016
9:27 pm

fionam

Merging recent changes

Options
    • binary
    /lams_build/lib/lams/lams.jar
8:32 pm

fionam

LDEV-3585: Survey monitor UI to support paging, sort and search for answers. Improving the efficiency of the statistics call.

Options
    • -1
    • +3
    /lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/dao/SurveyUserDAO.java
    • -1
    • +18
    /lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/dao/hibernate/SurveyUserDAOHibernate.java
    • -10
    • +7
    /lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/service/SurveyServiceImpl.java
7:36 pm

fionam

LDEV-3585: Survey monitor UI to support paging, sort and search for answers

Options
    • -2
    • +2
    /lams_tool_survey/conf/language/lams/ApplicationResources.properties
    • -0
    • +9
    /lams_tool_survey/conf/xdoclet/struts-actions.xml
    • -4
    • +6
    /lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/SurveyConstants.java
    • -1
    • +4
    /lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/dao/SurveyAnswerDAO.java
    • -1
    • +5
    /lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/dao/SurveyUserDAO.java
    • -0
    • +23
    /lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/dao/hibernate/SurveyAnswerDAOHibernate.java
    • -1
    • +77
    /lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/dao/hibernate/SurveyUserDAOHibernate.java
    • -0
    • +125
    /lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/dto/SimpleAnswerDTO.java
    • -1
    • +21
    /lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/service/ISurveyService.java
    • -62
    • +59
    /lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/service/SurveyServiceImpl.java
    • -23
    • +72
    /lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/action/MonitoringAction.java
    • -88
    • +181
    /lams_tool_survey/web/pages/monitoring/listanswers.jsp
    • -0
    • +47
    /lams_tool_survey/web/pages/monitoring/listreflections.jsp
    • -45
    • +6
    /lams_tool_survey/web/pages/monitoring/summary.jsp
7:28 pm

Andrey Balan

LDEV-3575 Implement paging and search for "Find users" UI

Options
    • -6
    • +0
    /lams_admin/conf/xdoclet/struts-forms.xml
    • -78
    • +109
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserSearchAction.java
    • -5
    • +4
    /lams_admin/web/error.jsp
    • -22
    • +20
    /lams_admin/web/userorg.jsp
    • -91
    • +168
    /lams_admin/web/usersearchlist.jsp
    • binary
    /lams_build/lib/lams/lams.jar
    • -0
    • +5
    /lams_common/src/java/org/lamsfoundation/lams/commonContext.xml
    • -0
    • +32
    /lams_common/src/java/org/lamsfoundation/lams/usermanagement/IUserDAO.java
    • -0
    • +101
    /lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/UserDAO.java
    • -2
    • +1
    /lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/UserOrganisationDAO.java
    • -1
    • +21
    /lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/IUserManagementService.java
    • -46
    • +64
    /lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java
4:42 am

Andrey Balan

file IUserDAO.java was added on branch lams2_head_wildfly on 2016-02-09 11:28:51 +0000

Options
    • -0
    • +0
    /lams_common/src/java/org/lamsfoundation/lams/usermanagement/IUserDAO.java
4:42 am

Andrey Balan

file UserDAO.java was added on branch lams2_head_wildfly on 2016-02-09 11:28:51 +0000

Options
    • -0
    • +0
    /lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/UserDAO.java
4:41 am

Andrey Balan

LDEV-3575 Implement paging and search for "Find users" UI

Options
    • -6
    • +0
    /lams_admin/conf/xdoclet/struts-forms.xml
    • -78
    • +109
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserSearchAction.java
    • -5
    • +4
    /lams_admin/web/error.jsp
    • -22
    • +20
    /lams_admin/web/userorg.jsp
    • -90
    • +167
    /lams_admin/web/usersearchlist.jsp
    • binary
    /lams_build/lib/lams/lams.jar
    • -0
    • +5
    /lams_common/src/java/org/lamsfoundation/lams/commonContext.xml
    • -0
    • +32
    /lams_common/src/java/org/lamsfoundation/lams/usermanagement/IUserDAO.java
    • -0
    • +107
    /lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/UserDAO.java
    • -2
    • +1
    /lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/UserOrganisationDAO.java
    • -1
    • +21
    /lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/IUserManagementService.java
    • -46
    • +78
    /lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java
Saturday 06 Feb 2016
1:06 am

Marcin Cieslak

LDEV-3658: Do not remove "user" attribute when cleaning up HTTP session by MCQ as this removes vital UserDTO, needed by other modules.

Options
    • -2
    • +1
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McUtils.java
Friday 05 Feb 2016
5:53 pm

Marcin Cieslak

LDEV-3657: Hide FLA, Add Lesson and Monitoring dialogs behind loading screen.

Options
    • -0
    • +8
    /lams_central/web/addLesson.jsp
    • -0
    • +5
    /lams_central/web/authoring/authoring.jsp
    • -0
    • +13
    /lams_central/web/css/addLesson.css
    • -0
    • +13
    /lams_central/web/css/authoring.css
    • -0
    • +3
    /lams_central/web/includes/javascript/authoring/authoringGeneral.js
    • -11
    • +20
    /lams_monitoring/web/monitor.jsp
    • -0
    • +13
    /lams_monitoring/web/css/monitorLesson.css
5:45 pm

Marcin Cieslak

LDEV-3657: Hide FLA, Add Lesson and Monitoring dialogs behind loading screen.

Options
    • -0
    • +8
    /lams_central/web/addLesson.jsp
    • -0
    • +5
    /lams_central/web/authoring/authoring.jsp
    • -0
    • +13
    /lams_central/web/css/addLesson.css
    • -1
    • +13
    /lams_central/web/css/authoring.css
    • -0
    • +3
    /lams_central/web/includes/javascript/authoring/authoringGeneral.js
    • -0
    • +9
    /lams_monitoring/web/monitor.jsp
    • -0
    • +13
    /lams_monitoring/web/css/monitorLesson.css
8:22 am

fionam

LDEV-3588: Modify Notebook monitor UI to support paging, sort and search. Sort by date now working and made a generic Java replacement for the lams:Date tag.

Options
    • binary
    /lams_build/lib/lams/lams.jar
    • -8
    • +10
    /lams_common/src/java/org/lamsfoundation/lams/notebook/service/CoreNotebookService.java
    • -7
    • +84
    /lams_common/src/java/org/lamsfoundation/lams/util/DateUtil.java
    • -3
    • +1
    /lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/dao/INotebookUserDAO.java
    • -6
    • +3
    /lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/dao/hibernate/NotebookUserDAO.java
    • -2
    • +2
    /lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/service/INotebookService.java
    • -10
    • +3
    /lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/actions/MonitoringAction.java
    • -2
    • +2
    /lams_tool_notebook/web/pages/monitoring/summary.jsp
1:46 am

Marcin Cieslak

LDEV-3656: When using LoginAs action or LoginRequestServlet remove session on login JSP page so the new request can be proccessed and not aborted.

Options
    • -1
    • +3
    /lams_central/web/login.jsp
12:27 am

Andrey Balan

file SessionDTO.java was added on branch lams2_head_wildfly on 2016-02-09 18:41:24 +0000

Options
    • -0
    • +0
    /lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dto/SessionDTO.java
12:27 am

Andrey Balan

file daterestriction.jsp was added on branch lams2_head_wildfly on 2016-02-09 18:41:24 +0000

Options
    • -0
    • +0
    /lams_tool_task/web/pages/monitoring/parts/daterestriction.jsp
12:27 am

Andrey Balan

file TaskListUserDTO.java was added on branch lams2_head_wildfly on 2016-02-09 18:41:24 +0000

Options
    • -0
    • +0
    /lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dto/TaskListUserDTO.java
12:27 am

Andrey Balan

LDEV-3587 Modify Tasks monitor UI to support paging, sort and search

Options
    • -5
    • +2
    /lams_tool_task/conf/xdoclet/struts-actions.xml
    • -17
    • +8
    /lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/TaskListConstants.java
    • -11
    • +11
    /lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dao/hibernate/TaskListUserDAOHibernate.java
    • -3
    • +5
    /lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dto/SessionDTO.java
    • -0
    • +10
    /lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dto/TaskListUserDTO.java
    • -17
    • +11
    /lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/service/ITaskListService.java
    • -33
    • +39
    /lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/service/TaskListServiceImpl.java
    • -2
    • +2
    /lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/service/TaskListServiceProxy.java
    • -7
    • +7
    /lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/action/AuthoringAction.java
    • -5
    • +5
    /lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/action/AuthoringTaskListConditionAction.java
    • -8
    • +8
    /lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/action/LearningAction.java
    • -47
    • +127
    /lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/action/MonitoringAction.java
    • -43
    • +0
    /lams_tool_task/web/pages/monitoring/daterestriction.jsp
    • -135
    • +152
    /lams_tool_task/web/pages/monitoring/itemsummary.jsp
    • -9
    • +9
    /lams_tool_task/web/pages/monitoring/summary.jsp
    • -0
    • +43
    /lams_tool_task/web/pages/monitoring/parts/daterestriction.jsp
    • -48
    • +0
    /lams_tool_task/web/pages/monitoring/parts/notebook.jsp
Thursday 04 Feb 2016
8:35 pm

Marcin Cieslak

LDEV-3656: When authenticating, if there is already a session mapped to a user's login, invalidate it. This will abort current authentication process too, so the user will be thrown out from the previous browser, but will not be let in on the current browser. Only subsequent attempt(s) to log in should succeed.

Options
    • binary
    /lams_build/lib/lams/lams.jar
    • -2
    • +7
    /lams_central/src/java/org/lamsfoundation/lams/web/SessionListener.java
    • -0
    • +5
    /lams_common/src/java/org/lamsfoundation/lams/integration/security/SsoHandler.java
    • -8
    • +36
    /lams_common/src/java/org/lamsfoundation/lams/web/session/SessionManager.java
12:26 pm

fionam

LDEV-3588: Modify Notebook monitor UI to support paging, sort and search - making a generic Java replacement for the lams:Date tag.

Options
    • -4
    • +4
    /lams_common/src/java/org/lamsfoundation/lams/util/DateUtil.java
12:04 pm

fionam

LDEV-3588: Modify Notebook monitor UI to support paging, sort and search - making a generic Java replacement for the lams:Date tag.

Options
    • -1
    • +1
    /lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/actions/MonitoringAction.java
11:52 am

fionam

LDEV-3588: Modify Notebook monitor UI to support paging, sort and search - making a generic Java replacement for the lams:Date tag.

Options
    • binary
    /lams_build/lib/lams/lams.jar
    • -7
    • +84
    /lams_common/src/java/org/lamsfoundation/lams/util/DateUtil.java
8:18 am

fionam

LDEV-3588: Modify Notebook monitor UI to support paging, sort and search - sort on modified date now working.

Options
    • -3
    • +6
    /lams_common/src/java/org/lamsfoundation/lams/notebook/service/CoreNotebookService.java
    • -3
    • +1
    /lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/dao/INotebookUserDAO.java
    • -6
    • +3
    /lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/dao/hibernate/NotebookUserDAO.java
    • -2
    • +2
    /lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/service/INotebookService.java
    • -10
    • +3
    /lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/actions/MonitoringAction.java
    • -2
    • +2
    /lams_tool_notebook/web/pages/monitoring/summary.jsp
7:02 am

fionam

LDEV-3588: Modify Notebook monitor UI to support paging, sort and search

Options
    • binary
    /lams_build/lib/lams/lams.jar
3:38 am

Andrey Balan

file advanceoptions.jsp was added on branch lams2_head_wildfly on 2016-02-09 18:41:24 +0000

Options
    • -0
    • +0
    /lams_tool_task/web/pages/monitoring/parts/advanceoptions.jsp
3:38 am

Andrey Balan

file reflections.jsp was added on branch lams2_head_wildfly on 2016-02-09 18:41:24 +0000

Options
    • -0
    • +0
    /lams_tool_task/web/pages/monitoring/parts/reflections.jsp
3:38 am

Andrey Balan

LDEV-3587 Modify Tasks monitor UI to support paging, sort and search

Options
    • -0
    • +5
    /lams_tool_task/.classpath
    • -1
    • +2
    /lams_tool_task/conf/language/lams/ApplicationResources_en_AU.properties
    • -3
    • +2
    /lams_tool_task/conf/xdoclet/struts-actions.xml
    • -3
    • +4
    /lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/TaskListConstants.java
    • -28
    • +33
    /lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dao/TaskListItemVisitDAO.java
    • -26
    • +71
    /lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dao/TaskListUserDAO.java
    • -62
    • +47
    /lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dao/hibernate/TaskListItemVisitDAOHibernate.java
    • -28
    • +160
    /lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dao/hibernate/TaskListUserDAOHibernate.java
    • -56
    • +80
    /lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dto/ReflectDTO.java
    • -0
    • +96
    /lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dto/SessionDTO.java
    • -114
    • +0
    /lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dto/Summary.java
    • -0
    • +49
    /lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dto/TaskListUserDTO.java
    • -76
    • +82
    /lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/model/TaskListItemVisitLog.java
    • -290
    • +351
    /lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/service/ITaskListService.java
    • -32
    • +77
    /lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/service/TaskListServiceImpl.java
  16. … 8 more files in changeset.
Wednesday 03 Feb 2016
12:08 pm

fionam

LDEV-3588: Modify Notebook monitor UI to support paging, sort and search

Options
    • -27
    • +38
    /lams_common/src/java/org/lamsfoundation/lams/notebook/service/CoreNotebookService.java
    • -1
    • +2
    /lams_common/src/java/org/lamsfoundation/lams/notebook/service/ICoreNotebookService.java
    • -1
    • +11
    /lams_common/src/java/org/lamsfoundation/lams/util/DateUtil.java
    • -3
    • +7
    /lams_tool_notebook/conf/language/lams/ApplicationResources.properties
    • -0
    • +15
    /lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/dao/INotebookUserDAO.java
    • -0
    • +128
    /lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/dao/hibernate/NotebookUserDAO.java
    • -0
    • +158
    /lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/dto/NotebookSessionsDTO.java
    • -0
    • +75
    /lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/dto/StatisticDTO.java
    • -1
    • +11
    /lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/service/INotebookService.java
    • -0
    • +13
    /lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/service/NotebookService.java
    • -0
    • +16
    /lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/util/NotebookConstants.java
    • -21
    • +110
    /lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/actions/MonitoringAction.java
    • -1
    • +1
    /lams_tool_notebook/web/pages/learning/notebook.jsp
    • -1
    • +1
    /lams_tool_notebook/web/pages/learning/mobile/notebook.jsp
    • -2
    • +22
    /lams_tool_notebook/web/pages/monitoring/monitoring.jsp
  16. … 3 more files in changeset.
10:12 am

fionam

file statisticpart.jsp was added on branch lams2_head_wildfly on 2016-02-03 04:08:52 +0000

Options
    • -0
    • +0
    /lams_tool_notebook/web/pages/monitoring/statisticpart.jsp