lams-github / lams_build

lib

Clone Tools

Stats

Commits this week: 0
Total Committers: 30
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 13 Oct 2017
8:01 pm

Marcin Cieslak

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

Conflicts:

lams_build/lib/lams/lams.jar

lams_central/src/java/org/lamsfoundation/lams/authoring/ObjectExtractor.java

lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java

lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/action/GradebookMonitoringAction.java

Options
    • binary
    ./lams/lams.jar
  2. … 8 more files in changeset.
Wednesday 11 Oct 2017
10:59 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4415 Merging LDEV-4433 changes from Master

Added weighting % markers to the new activity summary.

Options
    • binary
    ./lams/lams.jar
  2. … 2 more files in changeset.
Monday 09 Oct 2017
5:12 pm

Marcin Cieslak

Update LAMS libraries after merge

Options
    • binary
    ./lams/lams-central.jar
    • binary
    ./lams/lams.jar
5:08 pm

Marcin Cieslak

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

Conflicts:

lams_build/lib/lams/lams.jar

lams_common/src/java/org/lamsfoundation/lams/rating/service/RatingService.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/web/actions/LearningWebsocketServer.java

lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/web/action/MonitoringAction.java

lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/MonitoringAction.java

lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/action/McMonitoringAction.java

lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/MonitoringAction.java

lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/actions/MonitoringAction.java

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

lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/web/action/MonitoringAction.java

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

lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/web/action/MonitoringAction.java

lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/action/MonitoringAction.java

lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/action/MonitoringAction.java

lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/action/MonitoringAction.java

Options
    • binary
    ./lams/lams.jar
  2. … 29 more files in changeset.
Tuesday 03 Oct 2017
2:44 am

Marcin Cieslak

LDEV-4366 Kumalive reports export

Allow exporting all and selected Kumalives in Excel format. Use i18n

instead of hardcoded labels. Move free jqGrid library to lams_central.

Minor fixes.

Options
    • binary
    ./lams/lams.jar
  2. … 11 more files in changeset.
Sunday 01 Oct 2017
8:59 pm

Marcin Cieslak

LDEV-4366 Fix JAR broken when merging. Fix batch naming.

Options
    • binary
    ./lams/lams.jar
  2. … 1 more file in changeset.
1:09 am

Marcin Cieslak

Merge remote-tracking branch 'origin/master' into LDEV-4366

Conflicts:

lams_common/src/java/org/lamsfoundation/lams/usermanagement/User.java

lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/UserDAO.java

lams_common/src/java/org/lamsfoundation/lams/usermanagement/dto/UserDTO.java

Options
    • binary
    ./lams/lams.jar
  2. … 3 more files in changeset.
Wednesday 27 Sep 2017
2:30 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4415 Gradebook calculations and UI support weighting

Options
    • binary
    ./lams/lams-gradebook.jar
    • binary
    ./lams/lams.jar
  3. … 15 more files in changeset.
Monday 25 Sep 2017
9:14 pm

Marcin Cieslak

LDEV-4415 Add a title to weights dialog

Options
    • binary
    ./lams/lams.jar
  2. … 3 more files in changeset.
8:45 pm

Marcin Cieslak

Merge remote-tracking branch 'origin/master' into LDEV-4415

Options
    • binary
    ./lams/lams.jar
  2. … 1 more file in changeset.
Thursday 14 Sep 2017
6:08 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4417 branch rebased to master and merge conflict of lams.jar resolved.

Options
    • binary
    ./lams/lams.jar
5:22 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4417 Popover portraits in Monitoring

Implmented in GMap

Options
    • binary
    ./lams/lams.jar
  2. … 3 more files in changeset.
Sunday 10 Sep 2017
12:29 pm

Marcin Cieslak

Merge LDEV-4408 into lams31

Options
    • binary
    ./lams/lams.jar
  2. … 1 more file in changeset.
12:22 pm

Marcin Cieslak

LDEV-4408 Implement session list in sysadmin

Options
    • binary
    ./lams/lams.jar
  2. … 7 more files in changeset.
Saturday 09 Sep 2017
4:45 pm

Marcin Cieslak

LDEV-4402 Reintroduce XML Commons library

The library was supposed to become obsolete after changing XStream cod,

but is still required by Struts and Apache Commons Validator.

Also obsolete entries for JBoss Web and Gson were removed from a

configuration file.

Options
    • binary
    ./xml-commons/xml-apis-ext.jar
    • binary
    ./xml-commons/xml-apis.jar
    • -0
    • +49
    ./xml-commons/xmlcommons.module.xml
  4. … 2 more files in changeset.
4:39 pm

Marcin Cieslak

LDEV-4293, LDEV-4400 Update domain configuration for WF10

WildFly 10 configuration files are slightly changed compared to WildFly

8 and LAMS custom stuff had to be adjusted too.

Options
    • binary
    ./lams/lams.jar
  2. … 2 more files in changeset.
Friday 08 Sep 2017
12:22 pm

Marcin Cieslak

LDEV-4415 Add front end for weighted outputs

Options
    • binary
    ./lams/lams.jar
  2. … 14 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
    • binary
    ./lams/lams.jar
  2. … 74 more files in changeset.
2:30 am

Marcin Cieslak

LDEV-4415 Add tool output weight. Rewrite activity evaluations.

Activity evaluations have been implemented as a list, even though always

only the first element is meaningful. They were rewritten as one-to-one

association with Activity. The primary key is activity ID now instead of

DB generated UID.

Weight column was added.

Server version was bumped so a filter can pick up activityEvaluations ->

evaluation field rename when importing older LDs.

A convention without date was used for server version as it seems good

enough.

Unnecessary versions of clients were removed from configuration table as

they server the abandoned Flash authoring.

Options
    • binary
    ./lams/lams.jar
  2. … 18 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
    • binary
    ./lams/lams.jar
  2. … 33 more files in changeset.
Friday 18 Aug 2017
3:46 am

Andrey Balan

LDEV-4407 Move lams_contentrepository exceptions to the proper package

lams_contentrepository's exception classes were moved to

contentrepository.exception package.

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

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

Options
    • binary
    ./lams/lams-contentrepository.jar
  2. … 66 more files in changeset.
12:52 am

Marcin Cieslak

LDEV-4366 Use new portrait API

Options
    • binary
    ./lams/lams.jar
  2. … 2 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
    • binary
    ./lams/lams.jar
  2. … 7 more files in changeset.
6:25 pm

Marcin Cieslak

LDEV-4405 Upgrade YUI Compressor library

From version 2.4.8 to 2.4.9

The older version does not handle Windows absolute paths.

Also added the library to the list of libs LAMS uses.

Options
    • binary
    ./yuicompressor/yuicompressor-2.4.8.jar
    • binary
    ./yuicompressor/yuicompressor-2.4.9.jar
  3. … 2 more files in changeset.
5:17 pm

Marcin Cieslak

LDEV-4400 Update dependency for Apache Commons FileUpload

Options
    • -0
    • +1
    ./jakarta-commons/fileupload.module.xml
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
    • binary
    ./jboss/jbossweb.jar
    • -29
    • +0
    ./jboss/jbossweb.module.xml
    • binary
    ./json/gson-2.2.4.jar
    • -29
    • +0
    ./json/gson.module.xml
    • binary
    ./lams/lams-central.jar
    • binary
    ./lams/lams.jar
  7. … 130 more files in changeset.
Wednesday 09 Aug 2017
8:54 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4405 Minify LAMS css files by default

Options
    • binary
    ./yuicompressor/yuicompressor-2.4.8.jar
  2. … 2 more files in changeset.
Monday 07 Aug 2017
7:16 pm

Marcin Cieslak

LDEV-4402 Remove Lucene library

It has only been used for Pedagogical Planner filter feature, which is

not used by clients anyway

Options
    • binary
    ./lucene/lucene-analyzers-common-4.10.2.jar
    • binary
    ./lucene/lucene-core-4.10.2.jar
    • binary
    ./lucene/lucene-queryparser-4.10.2.jar
    • -31
    • +0
    ./lucene/lucene.module.xml
  5. … 5 more files in changeset.
7:03 pm

Marcin Cieslak

LDEV-4402 Upgrade jLaTexMath library

From version 1.0.3 to 1.0.6

Options
    • binary
    ./jlatexmath/jlatexmath-1.0.3.jar
    • binary
    ./jlatexmath/jlatexmath-1.0.6.jar
    • -1
    • +1
    ./jlatexmath/jlatexmath.module.xml
  4. … 2 more files in changeset.
6:58 pm

Marcin Cieslak

LDEV-4402 Upgrade Apache Commons Fileupload

From version 1.0 to version 1.3.3

Options
    • binary
    ./jakarta-commons/commons-fileupload-1.3.3.jar
    • binary
    ./jakarta-commons/commons-fileupload.jar
    • -1
    • +1
    ./jakarta-commons/fileupload.module.xml
  4. … 3 more files in changeset.