lams-github

lams_central

Clone Tools

Stats

Commits this week: 0
Total Committers: 31
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
Friday 22 Dec 2017
9:39 pm

Andrey Balan

LDEV-4492 Fix wrong casting activityDAO to ActivityDAO

It has to be IActivityDAO instead.

Options
    • -38
    • +24
    ./src/java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerAction.java
Tuesday 19 Dec 2017
1: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
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/authoring/web/AuthoringAction.java
    • -0
    • +1
    ./src/java/org/lamsfoundation/lams/web/OrganisationGroupAction.java
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/web/action/LtiAction.java
  4. … 43 more files in changeset.
Wednesday 06 Dec 2017
3:23 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4457 Tweaking screen size for iPad

Options
    • -1
    • +1
    ./web/includes/javascript/main.js
3:02 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4457 Monitor can do group upload, course grouping has upload

Fixed the security so that Monitor role users can use the groups

spreadsheet upload feature. Added upload support for the course

grouping screen.

Options
    • -2
    • +2
    ./web/includes/javascript/main.js
    • -45
    • +117
    ./web/includes/javascript/orgGroup.js
    • -2
    • +1
    ./web/includes/javascript/orgGrouping.js
    • -35
    • +36
    ./web/orgGroup.jsp
  5. … 1 more file in changeset.
10:42 am

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4054: Updating Greek

Updating Greek

Options
    • -3
    • +16
    ./conf/language/lams/ApplicationResources_el_GR.properties
Tuesday 05 Dec 2017
3:03 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4484 Print Grouping Page

Options
    • -0
    • +1
    ./conf/language/lams/ApplicationResources.properties
    • -0
    • +5
    ./web/css/orgGroup.scss
    • -0
    • +15
    ./web/includes/javascript/orgGroup.js
    • -0
    • +1
    ./web/includes/javascript/orgGrouping.js
    • -0
    • +1
    ./web/orgGroup.jsp
  6. … 6 more files in changeset.
Sunday 03 Dec 2017
1:24 am

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4446: display bigger picture

Display bigger picture when changing portrait

Options
    • -2
    • +2
    ./web/portrait.jsp
Saturday 02 Dec 2017
4:54 am

SanjanaPabsetti <Sanjana.pabsetti@gmail.com>

LDEV-4480 Acknowledgement when submitting a comment for a Q&A response

Options
    • -0
    • +2
    ./web/includes/javascript/rating.js
Friday 01 Dec 2017
3:39 am

tkkaung@ntu.edu.sg <tkkaung@ntu.edu.sg>

LDEV-4475 Missing information in Legend for Pie Chart when more than 7 items

Options
    • -1
    • +1
    ./web/includes/javascript/chart.js
2:50 am

tkkaung@ntu.edu.sg <tkkaung@ntu.edu.sg>

LDEV-4475 Missing information in Legend for Pie Chart when more than 7 items

Options
    • -1
    • +3
    ./web/includes/javascript/chart.js
Thursday 30 Nov 2017
6:53 pm

Andrey Balan

LDEV-4478 Make sure user has GROUP_MANAGER role

When displaying GRADEBOOK_MONITOR_ORGANISATION_URL we need to make

sure user has GROUP_MANAGER role

Options
    • -18
    • +29
    ./src/java/org/lamsfoundation/lams/web/GradebookServlet.java
Wednesday 29 Nov 2017
9:26 pm

Andrey Balan

LDEV-4479 Switch portrait images format to JPG

As long as JPG files are much more compact and we expect a lot of

them to be stored in LAMS (users' portraits primarily), there is

a need to switch to JPG.

Options
    • -7
    • +7
    ./src/java/org/lamsfoundation/lams/web/PortraitSaveAction.java
    • -1
    • +4
    ./web/includes/javascript/webrtc-capturestill.js
    • -27
    • +29
    ./web/portrait.jsp
  4. … 2 more files in changeset.
Monday 27 Nov 2017
12:30 pm

Marcin Cieslak

LDEV-4469 Implement portrait batch upload servlet

Options
    • -18
    • +19
    ./src/java/org/lamsfoundation/lams/web/PortraitSaveAction.java
  2. … 6 more files in changeset.
12:29 pm

Marcin Cieslak

LDEV-4469 Remove obsolete file

Options
    • -165
    • +0
    ./src/java/org/lamsfoundation/lams/util/PortraitUtils.java
Thursday 23 Nov 2017
3:37 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4457: Chosen Grouping screen layout tweaked

Options
    • -5
    • +8
    ./web/css/orgGroup.scss
    • -3
    • +3
    ./web/orgGroup.jsp
Wednesday 22 Nov 2017
10:06 pm

Marcin Cieslak

LDEV-4454 Add bar chart

Options
    • -0
    • +6
    ./web/includes/javascript/chart.js
  2. … 4 more files in changeset.
9:14 pm

Marcin Cieslak

LDEV-4454 Add pie chart, colours to badges and missing voters.

Options
    • -65
    • +92
    ./web/includes/javascript/chart.js
  2. … 5 more files in changeset.
1: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.
Tuesday 21 Nov 2017
12:23 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4457 Create groupings based on file upload

Options
    • -0
    • +16
    ./conf/language/lams/ApplicationResources.properties
    • -0
    • +1
    ./src/java/org/lamsfoundation/lams/web/OrganisationGroupAction.java
    • -1
    • +17
    ./web/WEB-INF/struts-config.xml
    • -1
    • +13
    ./web/css/orgGroup.scss
    • -0
    • +126
    ./web/includes/javascript/orgGroup.js
    • -6
    • +71
    ./web/orgGroup.jsp
  7. … 10 more files in changeset.
Monday 20 Nov 2017
4:43 pm

Andrey Balan

LDEV-4436 Fixing progress bar css

Removed 'min-height' parameter as it was causing nav.sidebar to

appear larger than its descendant .container-fluid div.

Besides, removed box-shadow parameter from .container-fluid as

its parent already has it.

Options
    • -2
    • +0
    ./web/css/_learner_base.scss
Thursday 16 Nov 2017
2:34 pm

Marcin Cieslak

LDEV-4454 Add Kumalive poll setup front end

Options
    • -2
    • +2
    ./conf/scss/_bootstrap-variables.scss
  2. … 4 more files in changeset.
Wednesday 15 Nov 2017
9:54 pm

Andrey Balan

LDEV-4436 Ability to change portrait in learner

Options
    • -12
    • +49
    ./web/WEB-INF/tags/Page.tag
    • -6
    • +33
    ./web/css/_learner_base.scss
    • -0
    • +25
    ./web/includes/javascript/dialog.js
    • -6
    • +8
    ./web/portrait.jsp
  5. … 30 more files in changeset.
9:50 pm

Andrey Balan

LDEV-4436 Dialog CSS rules to be available in learning as well

Options
    • -0
    • +70
    ./web/css/_dialogs.scss
    • -71
    • +0
    ./web/css/_main_base.scss
    • -0
    • +1
    ./web/css/defaultHTML_learner.scss
    • -0
    • +1
    ./web/css/defaultHTML_main.scss
10:09 am

Marcin Cieslak

LDEV-4453 Fix weights calculation on LD save when output changed

Options
    • -1
    • +2
    ./web/includes/javascript/authoring/authoringGeneral.js
    • -0
    • +4
    ./web/includes/javascript/authoring/authoringProperty.js
Thursday 09 Nov 2017
5:57 pm

Marcin Cieslak

LDEV-4453 Mark chosen activity outputs as weightable

Activity outputs without max score are not eligible for weighting as we

can not calculate percent in which the activity is completed. They must

not appear in weighting dialog and they must always have 0% weight.

Options
    • -0
    • +1
    ./conf/language/lams/ApplicationResources.properties
    • -0
    • +3
    ./web/authoring/authoring.jsp
    • -0
    • +2
    ./web/includes/javascript/authoring/authoringActivity.js
    • -43
    • +47
    ./web/includes/javascript/authoring/authoringGeneral.js
    • -0
    • +1
    ./web/includes/javascript/authoring/authoringProperty.js
  6. … 6 more files in changeset.
4:40 am

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4366: adding labels

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

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4453: adding labels

Adding labels to central and learning

Options
    • -8
    • +3
    ./conf/language/lams/ApplicationResources.properties
    • -2
    • +3
    ./conf/language/lams/ApplicationResources_en_AU.properties
  3. … 2 more files in changeset.
Wednesday 08 Nov 2017
4:45 pm

Andrey Balan

LDEV-4451 Add scss files and fix their names

Options
    • -0
    • +1
    ./.gitignore
    • -0
    • +1
    ./web/css/jqGrid.confidenceLevelFormattter.css
    • -0
    • +41
    ./web/css/jquery.jqGrid.confidence-level-formattter.scss
    • -34
    • +0
    ./web/includes/javascript/jqGrid.confidenceLevelFormattter.js
    • -0
    • +34
    ./web/includes/javascript/jquery.jqGrid.confidence-level-formattter.js
  6. … 5 more files in changeset.
Tuesday 07 Nov 2017
10:32 pm

Andrey Balan

LDEV-4451 Display confidence level as percentage rather than number

Options
    • -29
    • +29
    ./web/includes/javascript/jqGrid.confidenceLevelFormattter.js
9:57 am

Marcin Cieslak

LDEV-4453 Fix method calls after signature changes

Options
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/authoring/web/AuthoringAction.java
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/web/action/LtiAction.java
    • -2
    • +2
    ./src/java/org/lamsfoundation/lams/webservice/xml/LessonManagerServlet.java
  4. … 1 more file in changeset.