lams-github

lams_admin

Clone Tools

Stats

Commits this week: 0
Total Committers: 23
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 19 Dec 2017
8:47 pm

Marcin Cieslak

Merge remote-tracking branch 'origin/master' into lams31

Conflicts:

lams_build/conf/domain.xml

lams_build/lib/lams/lams.jar

lams_common/src/java/org/lamsfoundation/lams/rating/service/IRatingService.java

lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/EmailNotificationsAction.java

lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/LearningAction.java

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/MonitoringAction.java

lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/service/ChatService.java

lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/service/DokumaranService.java

lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java

lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McService.java

lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaService.java

lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/action/QaMonitoringAction.java

lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java

lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/service/LeaderselectionService.java

lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/service/MindmapService.java

lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/service/NoticeboardService.java

lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/service/NotebookService.java

lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/service/PeerreviewServiceImpl.java

lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java

lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/action/MonitoringAction.java

lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java

lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java

lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/service/ScribeService.java

lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/service/SurveyServiceImpl.java

lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteService.java

lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/service/WikiService.java

Options
    • -3
    • +5
    ./src/java/org/lamsfoundation/lams/admin/web/action/OrgManageAction.java
    • -16
    • +73
    ./src/java/org/lamsfoundation/lams/admin/web/action/OrganisationAction.java
  3. … 44 more files in changeset.
Saturday 16 Dec 2017
6:25 pm

Marcin Cieslak

LDEV-4488 Add "create date" in org details

Options
    • -0
    • +10
    ./web/organisation/list.jsp
6:11 pm

Marcin Cieslak

LDEV-4488 Replace "description" column with "create date" in org list

Options
    • -0
    • +1
    ./conf/language/lams/ApplicationResources.properties
    • -3
    • +5
    ./src/java/org/lamsfoundation/lams/admin/web/action/OrgManageAction.java
    • -2
    • +2
    ./web/organisation/list.jsp
  4. … 1 more file in changeset.
4:44 pm

Marcin Cieslak

LDEV-4486 Prevent user from removing course if there are lessons in it

When sysadming tries to remove a course, he gets warned about lessons

existing in the course or its subcourses. Then he is redirected to a

page where he can remove the lessons. Only if the course and its

subcourses are empty, the course can get removed.

Options
    • -0
    • +2
    ./conf/language/lams/ApplicationResources.properties
    • -6
    • +13
    ./src/java/org/lamsfoundation/lams/admin/web/action/OrganisationAction.java
    • -1
    • +30
    ./web/organisation/createOrEdit.jsp
Tuesday 12 Dec 2017
7:24 pm

Marcin Cieslak

LDEV-4485 Implement deletion of all lessons from a course

Options
    • -2
    • +7
    ./conf/language/lams/ApplicationResources.properties
    • -10
    • +61
    ./src/java/org/lamsfoundation/lams/admin/web/action/OrganisationAction.java
    • -0
    • +5
    ./web/WEB-INF/struts-config.xml
    • -0
    • +5
    ./web/WEB-INF/tiles-defs.xml
    • -0
    • +76
    ./web/organisation/deleteAllLessons.jsp
    • -12
    • +13
    ./web/organisation/list.jsp
4:58 pm

Marcin Cieslak

LDEV-4485 Adjust course heading layout

Options
    • -5
    • +10
    ./web/organisation/list.jsp
    • -1
    • +11
    ./web/userlist.jsp
Monday 27 Nov 2017
7:30 pm

Marcin Cieslak

LDEV-4469 Implement portrait batch upload servlet

Options
    • -0
    • +105
    ./src/java/org/lamsfoundation/lams/admin/web/action/PortraitBatchUploadAction.java
    • -1
    • +4
    ./web/WEB-INF/struts-config.xml
  3. … 5 more files in changeset.
Wednesday 22 Nov 2017
8:55 pm

Andrey Balan

LDEV-4473 Add bootstrap.js when it's not available on page

Options
    • -1
    • +7
    ./web/WEB-INF/tags/Page.tag
  2. … 30 more files in changeset.
Thursday 16 Nov 2017
6:35 pm

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4366: Adding label

Options
    • -2
    • +3
    ./conf/language/lams/ApplicationResources.properties
    • -2
    • +3
    ./conf/language/lams/ApplicationResources_en_AU.properties
4:43 pm

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4054: Updating greek

Options
    • -4
    • +5
    ./conf/language/lams/ApplicationResources_el_GR.properties
4:42 pm

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4436: adding label to i18n

Options
    • -4
    • +3
    ./conf/language/lams/ApplicationResources.properties
    • -3
    • +2
    ./conf/language/lams/ApplicationResources_en_AU.properties
4:54 am

Andrey Balan

LDEV-4436 Ability to change portrait in learner

Options
    • -12
    • +49
    ./web/WEB-INF/tags/Page.tag
  2. … 33 more files in changeset.
4:47 am

Andrey Balan

LDEV-4436 Add new config setting: display learner's portrait

It controls whether learner's portrait should be displayed in a progress

bar.

Options
    • -0
    • +2
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -30
    • +31
    ./web/config/items.jsp
  3. … 2 more files in changeset.
Wednesday 08 Nov 2017
6:22 am

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4463: Separate first and lastname

Options
    • -2
    • +2
    ./web/user/basiclist.jsp
Tuesday 24 Oct 2017
12:05 am

Marcin Cieslak

LDEV-4447 Toggle Kumalive feature on organisation level

Options
    • -0
    • +1
    ./conf/language/lams/ApplicationResources.properties
    • -0
    • +1
    ./web/WEB-INF/struts-config.xml
    • -0
    • +7
    ./web/organisation/createOrEdit.jsp
  4. … 5 more files in changeset.
Monday 23 Oct 2017
11:34 pm

Marcin Cieslak

LDEV-4447 Toggle Kumalive feature on sysadmin level

Options
    • -0
    • +1
    ./conf/language/lams/ApplicationResources.properties
  2. … 6 more files in changeset.
Sunday 22 Oct 2017
3:09 pm

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4408 adding missing labels

Adding missing label for deleting user sessions

Options
    • -2
    • +3
    ./conf/language/lams/ApplicationResources.properties
    • -2
    • +3
    ./conf/language/lams/ApplicationResources_en_AU.properties
Wednesday 11 Oct 2017
12:40 pm

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4054: Updating translations

Updating Greek and English

Options
    • -8
    • +9
    ./conf/language/lams/ApplicationResources.properties
    • -2
    • +4
    ./conf/language/lams/ApplicationResources_el_GR.properties
    • -2
    • +7
    ./conf/language/lams/ApplicationResources_en_AU.properties
Tuesday 26 Sep 2017
6:52 am

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4054: updating Greek

Updating Greek with latest changes

Options
    • -2
    • +5
    ./conf/language/lams/ApplicationResources_el_GR.properties
Monday 25 Sep 2017
8:23 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4427 System Admin can delete profile pictures

Options
    • -2
    • +2
    ./conf/language/lams/ApplicationResources.properties
    • -0
    • +1
    ./src/java/org/lamsfoundation/lams/admin/web/action/UserAction.java
    • -0
    • +1
    ./web/WEB-INF/struts-config.xml
    • -36
    • +102
    ./web/user.jsp
  5. … 2 more files in changeset.
Monday 18 Sep 2017
8:36 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4425 Adding Portraits in Learner

Included in Grouping, Chat, Peer Review and QA

Options
    • -5
    • +7
    ./web/WEB-INF/tags/StyledRating.tag
  2. … 44 more files in changeset.
Monday 11 Sep 2017
11:59 am

Marcin Cieslak

LDEV-4408 Allow session deletion

Options
    • -1
    • +2
    ./conf/language/lams/ApplicationResources.properties
    • -45
    • +0
    ./src/java/org/lamsfoundation/lams/admin/web/action/SessionListAction.java
    • -0
    • +54
    ./src/java/org/lamsfoundation/lams/admin/web/action/SessionMaintainAction.java
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/admin/web/action/SysAdminStartAction.java
    • -4
    • +5
    ./web/WEB-INF/struts-config.xml
    • -2
    • +2
    ./web/WEB-INF/tiles-defs.xml
    • -16
    • +0
    ./web/sessionlist.jsp
    • -0
    • +22
    ./web/sessionmaintain.jsp
Sunday 10 Sep 2017
12:22 pm

Marcin Cieslak

LDEV-4408 Implement session list in sysadmin

Options
    • -0
    • +3
    ./conf/language/lams/ApplicationResources.properties
    • -0
    • +45
    ./src/java/org/lamsfoundation/lams/admin/web/action/SessionListAction.java
    • -0
    • +1
    ./src/java/org/lamsfoundation/lams/admin/web/action/SysAdminStartAction.java
    • -0
    • +12
    ./web/WEB-INF/struts-config.xml
    • -0
    • +5
    ./web/WEB-INF/tiles-defs.xml
    • -0
    • +16
    ./web/sessionlist.jsp
  7. … 2 more files in changeset.
Wednesday 30 Aug 2017
7:32 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4417 Popover portraits in Monitoring

Implemented in Assessment, Chat, Daco, Forum and Submit.

Options
    • -1
    • +7
    ./web/WEB-INF/tlds/lams/lams.tld
  2. … 73 more files in changeset.
7:32 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4417 Popover portraits in Monitoring

Implemented in Assessment, Chat, Daco, Forum and Submit.

Options
    • -1
    • +7
    ./web/WEB-INF/tlds/lams/lams.tld
  2. … 74 more files in changeset.
Saturday 26 Aug 2017
4:04 pm

Marcin Cieslak

Merge remote-tracking branch 'origin/master' into lams31

Multiple conflicts resolved with JSON replace and class move to

packages.

Options
    • -0
    • +232
    ./src/java/org/lamsfoundation/lams/admin/web/action/OrgManageAction.java
    • -0
    • +328
    ./src/java/org/lamsfoundation/lams/admin/web/action/ToolContentListAction.java
    • -0
    • +157
    ./src/java/org/lamsfoundation/lams/admin/web/action/UserSearchAction.java
  4. … 31 more files in changeset.
Friday 18 Aug 2017
3:10 am

Andrey Balan

LDEV-4407 Remove obsolete OrgManageBean class

Options
    • -130
    • +0
    ./src/java/org/lamsfoundation/lams/admin/web/dto/OrgManageBean.java
    • -3
    • +2
    ./src/java/org/lamsfoundation/lams/admin/web/dto/UserBean.java
    • -24
    • +0
    ./src/java/org/lamsfoundation/lams/admin/web/form/OrgManageForm.java
2:43 am

Andrey Balan

LDEV-4407 Move classes to the proper packages

Action classes were moved to admin.web.action package; forms to

admin.web.form; DTOs to admin.web.dto.

(To access files' earlier history use Eclipse's Show in History feature

or run 'git log --follow ./path/to/file')

Options
    • -141
    • +0
    ./src/java/org/lamsfoundation/lams/admin/web/ConfigAction.java
    • -73
    • +0
    ./src/java/org/lamsfoundation/lams/admin/web/DisabledUserManageAction.java
    • -60
    • +0
    ./src/java/org/lamsfoundation/lams/admin/web/ImportExcelAction.java
    • -55
    • +0
    ./src/java/org/lamsfoundation/lams/admin/web/ImportExcelForm.java
    • -108
    • +0
    ./src/java/org/lamsfoundation/lams/admin/web/ImportExcelSaveAction.java
    • -95
    • +0
    ./src/java/org/lamsfoundation/lams/admin/web/LoginMaintainAction.java
    • -78
    • +0
    ./src/java/org/lamsfoundation/lams/admin/web/LoginSaveAction.java
    • -232
    • +0
    ./src/java/org/lamsfoundation/lams/admin/web/OrgManageAction.java
    • -130
    • +0
    ./src/java/org/lamsfoundation/lams/admin/web/OrgManageBean.java
    • -265
    • +0
    ./src/java/org/lamsfoundation/lams/admin/web/OrgSaveAction.java
    • -179
    • +0
    ./src/java/org/lamsfoundation/lams/admin/web/OrganisationAction.java
    • -62
    • +0
    ./src/java/org/lamsfoundation/lams/admin/web/ScheduledJobDTO.java
    • -111
    • +0
    ./src/java/org/lamsfoundation/lams/admin/web/ScheduledJobListAction.java
    • -55
    • +0
    ./src/java/org/lamsfoundation/lams/admin/web/ServerListAction.java
    • -88
    • +0
    ./src/java/org/lamsfoundation/lams/admin/web/ServerMaintainAction.java
  16. … 62 more files in changeset.
Monday 14 Aug 2017
11:37 pm

Andrey Balan

LDEV-4401 Remove deprecated parameters for integrations

We no longer use External server URL and Timeout URL settings. So they

can be removed.

Options
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/admin/web/ServerSaveAction.java
    • -1
    • +0
    ./src/java/org/lamsfoundation/lams/admin/web/action/LtiConsumerManagementAction.java
    • -2
    • +0
    ./web/WEB-INF/struts-config.xml
    • -10
    • +0
    ./web/servermaintain.jsp
  5. … 4 more files in changeset.
Thursday 10 Aug 2017
12:28 am

Marcin Cieslak

LDEV-4402 Substitute Gson and Apache JSON with Jackson

Jackson is a top JSON library shipped with WF10.

Apache JSON resides in an ancient library which we do not need for

anything else.

We use GSon only for serializing Java objects to JSON, which Jackson can

do too.

Options
    • -24
    • +26
    ./.classpath
    • -13
    • +13
    ./src/java/org/lamsfoundation/lams/admin/web/OrgManageAction.java
    • -35
    • +29
    ./src/java/org/lamsfoundation/lams/admin/web/ToolContentListAction.java
    • -11
    • +12
    ./src/java/org/lamsfoundation/lams/admin/web/UserSearchAction.java
    • -4
    • +3
    ./src/java/org/lamsfoundation/lams/admin/web/action/CleanupPreviewLessonsAction.java
  6. … 131 more files in changeset.