lams

lams_tool_scratchie

Tools

Line History

Line Count Graph
Line Count Graph

Stats

Commits this week: 0
Total Committers: 6
Last Commit:
Commits this week: 0
Total Lines of Code (LoC): 26,657
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

Changeset MAIN:marcin:20160427132218:2 does not match your current filter (clear filter).

Wednesday 27 Apr 2016
9:22 pm

Marcin Cieslak

file BurningQuestionLike.hbm.xml was initially added on branch lams2_head_wildfly.

Options
    • -0
    • +0
    ./conf/hibernate/mappings/org/lamsfoundation/lams/tool/scratchie/model/BurningQuestionLike.hbm.xml
9:22 pm

Marcin Cieslak

file ScratchieAnswer.hbm.xml was initially added on branch lams2_head_wildfly.

Options
    • -0
    • +0
    ./conf/hibernate/mappings/org/lamsfoundation/lams/tool/scratchie/model/ScratchieAnswer.hbm.xml
9:22 pm

Marcin Cieslak

file Scratchie.hbm.xml was initially added on branch lams2_head_wildfly.

Options
    • -0
    • +0
    ./conf/hibernate/mappings/org/lamsfoundation/lams/tool/scratchie/model/Scratchie.hbm.xml
9:22 pm

Marcin Cieslak

LDEV-3768: Remove XDoclet library and corresponding Ant tasks. Generate and use static configuration files instead.

Options
    • -0
    • +55
    ./conf/hibernate/mappings/org/lamsfoundation/lams/tool/scratchie/model/BurningQuestionLike.hbm.xml
    • -0
    • +146
    ./conf/hibernate/mappings/org/lamsfoundation/lams/tool/scratchie/model/Scratchie.hbm.xml
    • -0
    • +71
    ./conf/hibernate/mappings/org/lamsfoundation/lams/tool/scratchie/model/ScratchieAnswer.hbm.xml
    • -0
    • +63
    ./conf/hibernate/mappings/org/lamsfoundation/lams/tool/scratchie/model/ScratchieAnswerVisitLog.hbm.xml
    • -0
    • +79
    ./conf/hibernate/mappings/org/lamsfoundation/lams/tool/scratchie/model/ScratchieBurningQuestion.hbm.xml
    • -0
    • +58
    ./conf/hibernate/mappings/org/lamsfoundation/lams/tool/scratchie/model/ScratchieConfigItem.hbm.xml
    • -0
    • +97
    ./conf/hibernate/mappings/org/lamsfoundation/lams/tool/scratchie/model/ScratchieItem.hbm.xml
    • -0
    • +137
    ./conf/hibernate/mappings/org/lamsfoundation/lams/tool/scratchie/model/ScratchieSession.hbm.xml
    • -0
    • +100
    ./conf/hibernate/mappings/org/lamsfoundation/lams/tool/scratchie/model/ScratchieUser.hbm.xml
    • -8
    • +0
    ./conf/xdoclet/global-exceptions.xml
    • -6
    • +0
    ./conf/xdoclet/global-forwards.xml
    • -279
    • +0
    ./conf/xdoclet/struts-actions.xml
    • -1
    • +0
    ./conf/xdoclet/struts-forms.xml
    • -1
    • +0
    ./conf/xdoclet/struts-message-resources.xml
    • -1
    • +0
    ./conf/xdoclet/struts-plugins.xml
  16. … 389 more files in changeset.
Saturday 23 Apr 2016
1:57 pm

Andrey Balan

LDEV-3742 Add Like feature for Scratchie

* Implementation is a bit different for WF branch, as GET_BURNING_QUESTIONS_WITH_LIKES SQL query in ScratchieBurningQuestionDAOHibernate.java should be rewritten to comply with SQL92 standard introduced in MySQL 5.7.5

Options
    • -2
    • +2
    ./web/pages/learning/results.jsp
2:31 am

Marcin Cieslak

LDEV-3740: Prevent thread race on activity finish when leader's websocket was the only one and it was already cleared by Send Worker.

Options
    • -1
    • +5
    ./src/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningWebsocketServer.java
Thursday 14 Apr 2016
8:19 pm

Marcin Cieslak

file LearningWebsocketServer.java was initially added on branch lams2_head_wildfly.

Options
    • -0
    • +0
    ./src/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningWebsocketServer.java
8:19 pm

Marcin Cieslak

LDEV-3740: Use websockets to inform Scratche non-leaders of leader actions.

Options
    • -0
    • +1
    ./.classpath
    • -1
    • +19
    ./build.xml
    • -13
    • +0
    ./conf/xdoclet/struts-actions.xml
    • -53
    • +24
    ./src/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java
    • -0
    • +234
    ./src/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningWebsocketServer.java
    • -31
    • +17
    ./web/pages/learning/learning.jsp
    • -40
    • +36
    ./web/pages/learning/questionlist.jsp
Saturday 09 Apr 2016
12:38 am

Andrey Balan

LDEV-3747 Redirect to the next method after submitting burning questions/notebook in order to prevent exception on refreshing the frame

Options
    • -3
    • +3
    ./conf/xdoclet/struts-actions.xml
    • -6
    • +12
    ./src/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java
12:32 am

Andrey Balan

LDEV-3747 Redirect to the next method after submitting burning questions/notebook in order to prevent exception on refreshing the frame

Options
    • -3
    • +3
    ./conf/xdoclet/struts-actions.xml
    • -6
    • +12
    ./src/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java
Friday 08 Apr 2016
7:30 pm

Andrey Balan

LDEV-3742 Show multiline burning questions properly

Options
    • -2
    • +2
    ./src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
    • -4
    • +4
    ./web/pages/learning/results.jsp
    • -1
    • +1
    ./web/pages/monitoring/summary.jsp
2:33 am

Andrey Balan

LDEV-3742 Show multiline burning questions properly

Options
    • -3
    • +2
    ./src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
    • -2
    • +2
    ./web/pages/learning/results.jsp
    • -1
    • +1
    ./web/pages/monitoring/summary.jsp
Wednesday 06 Apr 2016
1:24 am

Andrey Balan

LDEV-3742 Add Like feature for Scratchie

* Implementation is a bit different for WF branch, as GET_BURNING_QUESTIONS_WITH_LIKES SQL query in ScratchieBurningQuestionDAOHibernate.java should be rewritten to comply with SQL92 standard introduced in MySQL 5.7.5

Options
    • -0
    • +8
    ./conf/xdoclet/struts-actions.xml
    • -2
    • +4
    ./src/java/org/lamsfoundation/lams/tool/scratchie/ScratchieConstants.java
    • -0
    • +8
    ./src/java/org/lamsfoundation/lams/tool/scratchie/scratchieApplicationContext.xml
    • -0
    • +8
    ./src/java/org/lamsfoundation/lams/tool/scratchie/dao/BurningQuestionLikeDAO.java
    • -2
    • +3
    ./src/java/org/lamsfoundation/lams/tool/scratchie/dao/ScratchieBurningQuestionDAO.java
    • -0
    • +37
    ./src/java/org/lamsfoundation/lams/tool/scratchie/dao/hibernate/BurningQuestionLikeDAOHibernate.java
    • -3
    • +59
    ./src/java/org/lamsfoundation/lams/tool/scratchie/dao/hibernate/ScratchieBurningQuestionDAOHibernate.java
    • -0
    • +22
    ./src/java/org/lamsfoundation/lams/tool/scratchie/dbupdates/patch20160329.sql
    • -14
    • +38
    ./src/java/org/lamsfoundation/lams/tool/scratchie/dto/BurningQuestionDTO.java
    • -0
    • +29
    ./src/java/org/lamsfoundation/lams/tool/scratchie/dto/BurningQuestionItemDTO.java
    • -0
    • +50
    ./src/java/org/lamsfoundation/lams/tool/scratchie/model/BurningQuestionLike.java
    • -3
    • +9
    ./src/java/org/lamsfoundation/lams/tool/scratchie/service/IScratchieService.java
    • -57
    • +82
    ./src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
    • -4
    • +68
    ./src/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java
    • -3
    • +4
    ./src/java/org/lamsfoundation/lams/tool/scratchie/web/action/MonitoringAction.java
    • -45
    • +118
    ./web/pages/learning/results.jsp
    • -22
    • +20
    ./web/pages/monitoring/summary.jsp
Tuesday 05 Apr 2016
6:15 pm

Andrey Balan

LDEV-3742 Show likes count in excel export

Options
    • -3
    • +3
    ./src/java/org/lamsfoundation/lams/tool/scratchie/service/IScratchieService.java
    • -2
    • +11
    ./src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
3:19 am

Andrey Balan

file BurningQuestionLikeDAO.java was added on branch lams2_head_wildfly on 2016-04-05 17:24:33 +0000

Options
    • -0
    • +0
    ./src/java/org/lamsfoundation/lams/tool/scratchie/dao/BurningQuestionLikeDAO.java
3:19 am

Andrey Balan

file BurningQuestionLike.java was added on branch lams2_head_wildfly on 2016-04-05 17:24:32 +0000

Options
    • -0
    • +0
    ./src/java/org/lamsfoundation/lams/tool/scratchie/model/BurningQuestionLike.java
3:19 am

Andrey Balan

file BurningQuestionItemDTO.java was added on branch lams2_head_wildfly on 2016-04-05 17:24:33 +0000

Options
    • -0
    • +0
    ./src/java/org/lamsfoundation/lams/tool/scratchie/dto/BurningQuestionItemDTO.java
3:19 am

Andrey Balan

file patch20160329.sql was added on branch lams2_head_wildfly on 2016-04-05 17:24:32 +0000

Options
    • -0
    • +0
    ./src/java/org/lamsfoundation/lams/tool/scratchie/dbupdates/patch20160329.sql
3:19 am

Andrey Balan

file BurningQuestionLikeDAOHibernate.java was added on branch lams2_head_wildfly on 2016-04-05 17:24:33 +0000

Options
    • -0
    • +0
    ./src/java/org/lamsfoundation/lams/tool/scratchie/dao/hibernate/BurningQuestionLikeDAOHibernate.java
3:19 am

Andrey Balan

LDEV-3742 Added Like feature for Scratchie

Options
    • -1
    • +5
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -0
    • +8
    ./conf/xdoclet/struts-actions.xml
    • -2
    • +4
    ./src/java/org/lamsfoundation/lams/tool/scratchie/ScratchieConstants.java
    • -0
    • +8
    ./src/java/org/lamsfoundation/lams/tool/scratchie/scratchieApplicationContext.xml
    • -0
    • +8
    ./src/java/org/lamsfoundation/lams/tool/scratchie/dao/BurningQuestionLikeDAO.java
    • -2
    • +3
    ./src/java/org/lamsfoundation/lams/tool/scratchie/dao/ScratchieBurningQuestionDAO.java
    • -0
    • +37
    ./src/java/org/lamsfoundation/lams/tool/scratchie/dao/hibernate/BurningQuestionLikeDAOHibernate.java
    • -5
    • +48
    ./src/java/org/lamsfoundation/lams/tool/scratchie/dao/hibernate/ScratchieBurningQuestionDAOHibernate.java
    • -0
    • +22
    ./src/java/org/lamsfoundation/lams/tool/scratchie/dbupdates/patch20160329.sql
    • -14
    • +38
    ./src/java/org/lamsfoundation/lams/tool/scratchie/dto/BurningQuestionDTO.java
    • -0
    • +29
    ./src/java/org/lamsfoundation/lams/tool/scratchie/dto/BurningQuestionItemDTO.java
    • -0
    • +50
    ./src/java/org/lamsfoundation/lams/tool/scratchie/model/BurningQuestionLike.java
    • -2
    • +8
    ./src/java/org/lamsfoundation/lams/tool/scratchie/service/IScratchieService.java
    • -51
    • +68
    ./src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
    • -4
    • +68
    ./src/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java
  16. … 3 more files in changeset.
Wednesday 30 Mar 2016
8:40 pm

Marcin Cieslak

LDEV-3735, LDEV-3674: Rewrite LD import using JDK XML tools. Remove cglib library which does not seem to be used by XStream anymore. Remove Axis and wsdl4j libraries, and several Java classes made obsolete by Flash removal.

Fix LD import in FLA and several Tools.

Options
    • -12
    • +12
    ./src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieImportContentVersionFilter.java
  2. … 38 more files in changeset.
Wednesday 16 Mar 2016
8:12 pm

Marcin Cieslak

LDEV-3674: Remove multiple Flash elements: Authoring, icons, themes, i18n files, WDDX libraries and classes, methods, servlets etc.

Rename/rewrite methods for Flashless use.

Options
    • -1
    • +1
    ./db/sql/activity_insert.sql
    • binary
    ./web/images/icon_scratchie.swf
  3. … 419 more files in changeset.
Tuesday 08 Mar 2016
7:22 am

Ernie Ghiglione

LDEV-3717: updating scratchie learner to bootstrap

Options
    • -0
    • +46
    ./web/WEB-INF/tags/Alert.tag
    • -7
    • +15
    ./web/WEB-INF/tags/DefineLater.tag
    • -0
    • +36
    ./web/WEB-INF/tags/Page.tag
    • -0
    • +8
    ./web/WEB-INF/tlds/lams/lams.tld
    • -1
    • +2
    ./web/common/header.jsp
    • -2
    • +2
    ./web/common/messages.jsp
    • -70
    • +76
    ./web/pages/learning/burningQuestions.jsp
    • -12
    • +14
    ./web/pages/learning/definelater.jsp
    • -36
    • +46
    ./web/pages/learning/learning.jsp
    • -22
    • +27
    ./web/pages/learning/notebook.jsp
    • -44
    • +51
    ./web/pages/learning/questionlist.jsp
    • -89
    • +92
    ./web/pages/learning/results.jsp
    • -13
    • +7
    ./web/pages/learning/submissionDeadline.jsp
    • -23
    • +21
    ./web/pages/learning/waitforleader.jsp
7:22 am

Ernie Ghiglione

file Alert.tag was initially added on branch lams2_head_wildfly.

Options
    • -0
    • +0
    ./web/WEB-INF/tags/Alert.tag
7:22 am

Ernie Ghiglione

file Page.tag was initially added on branch lams2_head_wildfly.

Options
    • -0
    • +0
    ./web/WEB-INF/tags/Page.tag
Friday 26 Feb 2016
3:17 pm

Marcin Cieslak

LDEV-2917: Change DOCTYPE tag of files which have not been picked up by previous runs as they had this tag broken into 2 lines and regex had not detected them.

Options
    • -2
    • +2
    ./web/error.jsp
    • -2
    • +2
    ./web/pages/authoring/pedagogicalPlannerForm.jsp
    • -2
    • +2
    ./web/pages/authoring/parts/additem.jsp
    • -2
    • +2
    ./web/pages/learning/finish.jsp
    • -2
    • +2
    ./web/pages/learning/notebook.jsp
    • -2
    • +2
    ./web/pages/learning/start.jsp
    • -2
    • +2
    ./web/pages/learning/submissionDeadline.jsp
    • -2
    • +2
    ./web/pages/monitoring/monitoring.jsp
    • -2
    • +2
    ./web/pages/monitoring/notebook.jsp
    • -2
    • +2
    ./web/pages/monitoring/parts/itemSummary.jsp
  11. … 331 more files in changeset.
Wednesday 24 Feb 2016
8:35 pm

Marcin Cieslak

LDEV-3660: Remove export potfolio resources: Java classes, JPS, DB entries and labels.

Remove localLinkPath attribute from CSS tag as it was only used for export portfolio.

Options
    • -2
    • +1
    ./conf/language/lams/ApplicationResources.properties
    • -4
    • +0
    ./db/sql/tool_insert.sql
    • -54
    • +13
    ./src/java/org/lamsfoundation/lams/tool/scratchie/dto/Summary.java
    • -139
    • +0
    ./src/java/org/lamsfoundation/lams/tool/scratchie/util/ScratchieBundler.java
    • -173
    • +0
    ./src/java/org/lamsfoundation/lams/tool/scratchie/web/servlet/ExportServlet.java
    • -9
    • +0
    ./web/WEB-INF/web.xml
    • -8
    • +0
    ./web/WEB-INF/tlds/lams/lams.tld
    • -18
    • +0
    ./web/pages/export/exportportfolio.jsp
    • -64
    • +0
    ./web/pages/export/parts/exportLearner.jsp
    • -107
    • +0
    ./web/pages/export/parts/exportTeacher.jsp
  11. … 362 more files in changeset.
Thursday 18 Feb 2016
11:44 pm

Marcin Cieslak

LDEV-3556: Remove LAMS 1 methods for importing Tool content.

Options
    • -33
    • +7
    ./src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
  2. … 27 more files in changeset.
Wednesday 10 Feb 2016
6:01 pm

Marcin Cieslak

LDEV-2918: Get rid of IE, "main" and "tabbed" styles as they are obsolete and only blur CSS tag work.

Options
    • -1
    • +1
    ./web/WEB-INF/tags/headItems.tag
    • -1
    • +1
    ./web/common/tabbedheader.jsp
  3. … 101 more files in changeset.
4:53 pm

Andrey Balan

LDEV-3650 Include the burning questions in a new tab in the .xls export file

Options
    • -2
    • +2
    ./src/java/org/lamsfoundation/lams/tool/scratchie/dao/hibernate/ScratchieAnswerVisitDAOHibernate.java
    • -1
    • +34
    ./src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java