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
Tuesday 10 Jul 2018
12:51 am

Joanna Mielczarek <amielczarek.web@gmail.com>

LDEV-4440 Almost finished Task List migration

Options
    • -3
    • +2
    /lams_tool_task/.classpath
    • -11
    • +10
    /lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/controller/AuthoringController.java
    • -34
    • +22
    /lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/controller/AuthoringTaskListConditionController.java
    • -5
    • +7
    /lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/controller/LearningController.java
    • -3
    • +2
    /lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/controller/MonitoringController.java
    • -324
    • +0
    /lams_tool_task/web/WEB-INF/struts-config.xml
    • -3
    • +2
    /lams_tool_task/web/WEB-INF/tags/CommentsAuthor.tag
    • -2
    • +2
    /lams_tool_task/web/WEB-INF/tags/TextSearch.tag
    • -212
    • +0
    /lams_tool_task/web/WEB-INF/tlds/struts/struts-bean-el.tld
    • -382
    • +0
    /lams_tool_task/web/WEB-INF/tlds/struts/struts-bean.tld
    • -3302
    • +0
    /lams_tool_task/web/WEB-INF/tlds/struts/struts-html-el.tld
    • -3302
    • +0
    /lams_tool_task/web/WEB-INF/tlds/struts/struts-html.tld
    • -382
    • +0
    /lams_tool_task/web/WEB-INF/tlds/struts/struts-logic-el.tld
    • -652
    • +0
    /lams_tool_task/web/WEB-INF/tlds/struts/struts-logic.tld
    • -3171
    • +0
    /lams_tool_task/web/WEB-INF/tlds/struts/struts-nested.tld
  16. … 11 more files in changeset.
12:16 am

Andrey Balan

LDEV-4631 Prevent accidental storing of timezone as JVM one

Options
    • -2
    • +1
    /lams_common/src/java/org/lamsfoundation/lams/usermanagement/User.java
Monday 09 Jul 2018
10:25 pm

Michal Kowalski <mickowal@hotmail.com>

LDEV-4440 Survey learning and monitoring

Options
    • -7
    • +4
    /lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/util/SurveyWebUtils.java
    • -17
    • +22
    /lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/controller/AuthoringConditionController.java
    • -2
    • +7
    /lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/controller/AuthoringController.java
    • -104
    • +0
    /lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/controller/ChartAction.java
    • -0
    • +104
    /lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/controller/ChartController.java
    • -751
    • +0
    /lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/controller/LearningAction.java
    • -0
    • +688
    /lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/controller/LearningController.java
    • -597
    • +0
    /lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/controller/MonitoringAction.java
    • -0
    • +546
    /lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/controller/MonitoringController.java
    • -4
    • +5
    /lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/form/SurveyConditionForm.java
    • -50
    • +37
    /lams_tool_survey/web/WEB-INF/tags/TextSearch.tag
    • -1
    • +7
    /lams_tool_survey/web/common/messages.jsp
    • -3
    • +4
    /lams_tool_survey/web/pages/authoring/addCondition.jsp
    • -0
    • +1
    /lams_tool_survey/web/pages/authoring/conditions.jsp
    • -1
    • +3
    /lams_tool_survey/web/pages/authoring/parts/addchoicequestion.jsp
  16. … 1012 more files in changeset.
1:18 am

Marcin Cieslak

Merge branch 'LDEF-4627'

Options
    • -0
    • +2
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/UserAction.java
1:18 am

Marcin Cieslak

LDEV-4627 Accept country in integrations servlet

If a received langIsoCode is just 2 letters, then countryIsoCode stays

the same and country will fall back to default. If langIsoCode is en_AU,

then it gets split to langIsoCode and countryIsoCode and the old value

of countryIsoCode is considered country.

Options
    • binary
    /lams_build/lib/lams/lams.jar
    • -4
    • +4
    /lams_central/src/java/org/lamsfoundation/lams/web/LoginRequestLtiServlet.java
    • -2
    • +14
    /lams_central/src/java/org/lamsfoundation/lams/web/LoginRequestServlet.java
    • -15
    • +27
    /lams_central/src/java/org/lamsfoundation/lams/webservice/xml/LearningDesignRepositoryServlet.java
    • -25
    • +44
    /lams_central/src/java/org/lamsfoundation/lams/webservice/xml/LessonManagerServlet.java
    • -3
    • +3
    /lams_common/src/java/org/lamsfoundation/lams/integration/service/IIntegrationService.java
    • -6
    • +12
    /lams_common/src/java/org/lamsfoundation/lams/integration/service/IntegrationService.java
Sunday 08 Jul 2018
7:41 pm

Andrey Balan

LDEV-4608 Burning qs: collapse/expand to work in coordination

Options
    • -1
    • +8
    /lams_tool_scratchie/web/pages/learning/results.jsp
7:20 pm

Andrey Balan

LDEV-4628 Set default timezone when creating a user

* Also fix an issue with storing server'd timezone containing

"+", e.g. "ETC+4"

Options
    • -1
    • +6
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/UserAction.java
    • -1
    • +2
    /lams_admin/web/timezoneServerManagement.jsp
5:30 pm

Marcin Cieslak

LDEV-4625 Use the default country when creating a new user by sysadmin

Options
    • -0
    • +2
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/UserAction.java
5:27 pm

Marcin Cieslak

LDEV-4625 Make server country configurable

Also use default country in integrations

Options
    • -0
    • +1
    /lams_admin/conf/language/lams/ApplicationResources.properties
    • -1
    • +3
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/ConfigAction.java
    • -0
    • +9
    /lams_admin/web/config/items.jsp
    • binary
    /lams_build/lib/lams/lams.jar
    • -0
    • +15
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20180708.sql
    • -6
    • +3
    /lams_common/src/java/org/lamsfoundation/lams/integration/service/IntegrationService.java
    • -1
    • +1
    /lams_common/src/java/org/lamsfoundation/lams/signup/service/SignupService.java
    • -2
    • +2
    /lams_common/src/java/org/lamsfoundation/lams/util/LanguageUtil.java
4:31 pm

Marcin Cieslak

LDEV-4625 Use default country configured on server

Options
    • -1
    • +1
    /lams_admin/src/java/org/lamsfoundation/lams/admin/service/ImportService.java
    • -1
    • +1
    /lams_common/src/java/org/lamsfoundation/lams/signup/service/SignupService.java
    • -0
    • +5
    /lams_common/src/java/org/lamsfoundation/lams/util/ConfigurationKeys.java
    • -16
    • +23
    /lams_common/src/java/org/lamsfoundation/lams/util/LanguageUtil.java
4:15 pm

Marcin Cieslak

Merge branch 'LDEV-4626'

Options
4:12 pm

Marcin Cieslak

LDEV-4626 Use default country when importing users

Options
    • -1
    • +5
    /lams_admin/src/java/org/lamsfoundation/lams/admin/service/ImportService.java
3:50 pm

Marcin Cieslak

LDEV-4616 Do not look for removed locale when saving an org

Options
    • -23
    • +19
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/OrgSaveAction.java
9:24 am

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4624: adding lams.jar

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

Andrey Balan

Merge branch 'LDEV-4624'

Options
3:58 am

Andrey Balan

LDEV-4624 Signup page to use system language for country list

Options
    • -1
    • +1
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/UserAction.java
    • -1
    • +1
    /lams_central/src/java/org/lamsfoundation/lams/web/ProfileAction.java
    • -1
    • +1
    /lams_central/src/java/org/lamsfoundation/lams/web/action/SignupAction.java
    • -2
    • +8
    /lams_common/src/java/org/lamsfoundation/lams/util/LanguageUtil.java
    • -0
    • +22
    /lams_common/src/java/org/lamsfoundation/lams/util/MessageService.java
2:04 am

Andrey Balan

LDEV-4610 Remove testing message

Options
    • -1
    • +1
    /lams_gradebook/web/gradebookMonitor.jsp
Saturday 07 Jul 2018
11:52 pm

Marcin Cieslak

Merge branch 'LDEV-4616'

Options
11:51 pm

Marcin Cieslak

LDEV-4616 Remove locale from courses

Options
    • -1
    • +0
    /lams_admin/conf/language/lams/ApplicationResources.properties
    • -15
    • +4
    /lams_admin/src/java/org/lamsfoundation/lams/admin/service/ImportService.java
    • -21
    • +0
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/OrgSaveAction.java
    • -14
    • +4
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/OrganisationAction.java
    • -1
    • +0
    /lams_admin/web/WEB-INF/struts-config.xml
    • -12
    • +0
    /lams_admin/web/organisation/courseAdminEdit.jsp
    • -12
    • +0
    /lams_admin/web/organisation/createOrEdit.jsp
    • -8
    • +0
    /lams_admin/web/organisation/list.jsp
    • binary
    /lams_build/lib/lams/lams.jar
    • -11
    • +0
    /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/Organisation.hbm.xml
    • -0
    • +15
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20180707.sql
    • -3
    • +2
    /lams_common/src/java/org/lamsfoundation/lams/integration/service/IntegrationService.java
    • -10
    • +0
    /lams_common/src/java/org/lamsfoundation/lams/usermanagement/Organisation.java
10:28 pm

Andrey Balan

Merge branch 'LDEV-4621'

Options
10:17 pm

Andrey Balan

LDEV-4621 Release marks auto pushes marks to gradebook now

* Release marks needs to be a "state" within the tool rather than

something that is transient. If this option is marks are already

released, then marks entered in Forum monitor should be auto pushed to

monitor and disclosed to students via forum learner.

* Also once you release marks you should not be able to unrelease them.

* Log mark released event

Options
    • -8
    • +0
    /lams_tool_forum/conf/hibernate/mappings/org/lamsfoundation/lams/tool/forum/persistence/ForumReport.hbm.xml
    • -0
    • +1
    /lams_tool_forum/conf/language/lams/ApplicationResources_en_AU.properties
    • -0
    • +15
    /lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/dbupdates/patch20180707.sql
    • -2
    • +2
    /lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/dto/MessageDTO.java
    • -4
    • +16
    /lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/dto/SessionDTO.java
    • -21
    • +0
    /lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/ForumReport.java
    • -35
    • +40
    /lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java
    • -3
    • +3
    /lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/IForumService.java
    • -100
    • +20
    /lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/MonitoringAction.java
    • -21
    • +39
    /lams_tool_forum/web/jsps/monitoring/summary.jsp
    • -37
    • +43
    /lams_tool_forum/web/jsps/monitoring/viewmarks.jsp
10:15 pm

Andrey Balan

LDEV-4621 Minor code formatting

Options
    • -4
    • +0
    /lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/Message.java
    • -119
    • +20
    /lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/LearningAction.java
    • -21
    • +16
    /lams_tool_forum/web/jsps/learning/message/msgviewwrapper.jsp
    • -2
    • +1
    /lams_tool_forum/web/jsps/learning/message/topicview.jsp
    • -18
    • +16
    /lams_tool_forum/web/jsps/learning/viewtopic.jsp
3:46 pm

Marcin Cieslak

Merge branch 'LDEV-4622'

Options
3:45 pm

Marcin Cieslak

LDEV-4622 Prevent double submit of sign up page

Options
    • -2
    • +9
    /lams_central/web/signup/singupTab.jsp
3:21 pm

Marcin Cieslak

Merge branch 'LDEV-4615'

Options
3:20 pm

Marcin Cieslak

LDEV-4615 Add create date on user page in admin

Options
    • -0
    • +1
    /lams_admin/conf/language/lams/ApplicationResources.properties
    • -1
    • +3
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/UserAction.java
    • -0
    • +12
    /lams_admin/web/user.jsp
1:54 pm

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4605: Adding missing labels

Options
    • -3
    • +4
    /lams_central/conf/language/lams/ApplicationResources.properties
    • -2
    • +6
    /lams_central/conf/language/lams/ApplicationResources_en_AU.properties
    • -2
    • +4
    /lams_central/conf/language/lams/ApplicationResources_es_ES.properties
Friday 06 Jul 2018
6:57 pm

Andrey Balan

LDEV-4619 Encode properly inline files

It seems, setting charset=UTF-8 makes sense only for txt files.

However, we will set it for files of all mime types.

Options
    • -1
    • +1
    /lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/client/Download.java
6:25 pm

Joanna Mielczarek <amielczarek.web@gmail.com>

LDEV-4440 Finished learning migration

Options
    • -6
    • +8
    /lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/controller/LearningController.java
6:21 pm

Andrey Balan

LDEV-4623 Remove duplicate checkbox

Options
    • -8
    • +0
    /lams_tool_sbmt/web/authoring/advance.jsp