lams-github / lams_common

src

Clone Tools

Stats

Commits this week: 0
Total Committers: 35
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 11 Aug 2009
12:46 pm

lfoxton

LDEV-2075 fixing statistics page so you can choose which group to display instead of just displaying them all

Options
    • -77
    • +68
    ./java/org/lamsfoundation/lams/statistics/dto/StatisticsDTO.java
    • -0
    • +21
    ./java/org/lamsfoundation/lams/statistics/service/IStatisticsService.java
    • -35
    • +52
    ./java/org/lamsfoundation/lams/statistics/service/StatisticsService.java
  4. … 1 more file in changeset.
11:23 am

lfoxton

LDEV-2075 creting overall statistics page for admin

Options
    • -0
    • +9
    ./java/org/lamsfoundation/lams/commonContext.xml
    • -0
    • +14
    ./java/org/lamsfoundation/lams/dao/IBaseDAO.java
    • -0
    • +31
    ./java/org/lamsfoundation/lams/dao/hibernate/BaseDAO.java
    • -0
    • +80
    ./java/org/lamsfoundation/lams/statistics/dto/GroupStatisticsDTO.java
    • -0
    • +88
    ./java/org/lamsfoundation/lams/statistics/dto/StatisticsDTO.java
    • -0
    • +8
    ./java/org/lamsfoundation/lams/statistics/service/IStatisticsService.java
    • -0
    • +97
    ./java/org/lamsfoundation/lams/statistics/service/StatisticsService.java
Wednesday 05 Aug 2009
1:58 pm

jliew

using new patch level numbering system

Options
    • -8
    • +0
    ./java/org/lamsfoundation/lams/dbupdates/patch0019_updateFrom231.sql
    • -0
    • +8
    ./java/org/lamsfoundation/lams/dbupdates/patch02040000.sql
Tuesday 04 Aug 2009
8:12 pm

Andrey Balan

LDEV-2372 fixes to testing framework

* closes all windows at the end of each test.

So there is no more need in paying attention to this thing

* solved problem with IE: ability to re-login

* solved problem with timeouts in learning

* new method waitForLearning() introduced

* TestFrameworkException renamed to SeleniumException

TestFrameworkConstants renamed to SeleniumConstants

added several new constants

Options
    • -95
    • +66
    ./java/org/lamsfoundation/lams/selenium/AbstractSeleniumTestCase.java
    • -149
    • +147
    ./java/org/lamsfoundation/lams/selenium/DefaultSeleniumFlex.java
    • -0
    • +53
    ./java/org/lamsfoundation/lams/selenium/SeleniumConstants.java
    • -0
    • +68
    ./java/org/lamsfoundation/lams/selenium/SeleniumException.java
    • -46
    • +0
    ./java/org/lamsfoundation/lams/selenium/TestFrameworkConstants.java
    • -68
    • +0
    ./java/org/lamsfoundation/lams/selenium/TestFrameworkException.java
12:17 pm

jliew

post 2.3.1 patch files - planner.lamscommunity.org is at patch level 18

Options
    • -1
    • +1
    ./java/org/lamsfoundation/lams/dbupdates/patch0018_updateFrom231.sql
    • -0
    • +8
    ./java/org/lamsfoundation/lams/dbupdates/patch0019_updateFrom231.sql
Monday 03 Aug 2009
4:15 am

Marcin Cieslak

LDEV-2374: Added outputs for Data Flow for: * Image gallery (URL to the images uploaded by the students), * Forum (text for the postings for a student in the forum) * Chat (all text postings for a student in the chat) * Pixlr (URL to the image) * Share resources (URL to file/urls uploaded) * Notebook (Text entered by the student) * Submit Files (URL to files uploaded)

Options
    • -0
    • +56
    ./java/org/lamsfoundation/lams/tool/SimpleURL.java
  2. … 32 more files in changeset.
Friday 31 Jul 2009
12:28 pm

lfoxton

Changing webutil to always log requests to external servers

Options
    • -2
    • +2
    ./java/org/lamsfoundation/lams/util/WebUtil.java
12:19 pm

jliew

moving/creating post-2.3.1 db modification statements into new patch file

Options
    • -12
    • +0
    ./java/org/lamsfoundation/lams/dbupdates/patch0017_updateFrom23-231.sql
    • -0
    • +55
    ./java/org/lamsfoundation/lams/dbupdates/patch0018_updateFrom231.sql
Wednesday 29 Jul 2009
10:55 pm

Andrey Balan

LDEV-2372 moving all Selenium core classes from lams_common/test/java --> lams_common/src/java. as these classes are aimed for importing from other projects

Options
    • -0
    • +592
    ./java/org/lamsfoundation/lams/selenium/AbstractSeleniumTestCase.java
    • -0
    • +182
    ./java/org/lamsfoundation/lams/selenium/DefaultSeleniumFlex.java
    • -0
    • +69
    ./java/org/lamsfoundation/lams/selenium/SeleniumTestSuite.java
    • -0
    • +46
    ./java/org/lamsfoundation/lams/selenium/TestFrameworkConstants.java
    • -0
    • +68
    ./java/org/lamsfoundation/lams/selenium/TestFrameworkException.java
  6. … 5 more files in changeset.
Monday 27 Jul 2009
6:21 am

Marcin Cieslak

LDEV-2374: - Vote now accepts nominations created by Teacher as well as ones derived from input. - Teacher can now limit number of Learners contributing to Vote's nomination pool. - Each tool now declares which DataOutputDefinitions it can accept for Data Flow.

Options
    • -15
    • +33
    ./java/org/lamsfoundation/lams/tool/OutputFactory.java
    • -1
    • +2
    ./java/org/lamsfoundation/lams/tool/ToolContentManager.java
    • -0
    • +12
    ./java/org/lamsfoundation/lams/tool/ToolOutputDefinition.java
    • -0
    • +13
    ./java/org/lamsfoundation/lams/tool/service/ILamsCoreToolService.java
    • -0
    • +74
    ./java/org/lamsfoundation/lams/tool/service/LamsCoreToolService.java
  6. … 45 more files in changeset.
Friday 10 Jul 2009
11:41 am

jliew

file shouldn't have been merged (was deleted on branch)

Options
    • -15
    • +0
    ./java/org/lamsfoundation/lams/dbupdates/patch0017_updateFrom23.sql
6:15 am

Andrey Balan

LDEV-2372 testing framework *there is no more need in removing .hbm.xml files

Options
    • -177
    • +1
    ./java/org/lamsfoundation/lams/localCommonContext.xml
Wednesday 08 Jul 2009
2:55 pm

Marcin Cieslak

LDEV-2380: Added some code comments.

Options
    • -0
    • +3
    ./java/org/lamsfoundation/lams/planner/dto/PedagogicalPlannerSequenceNodeDTO.java
    • -0
    • +1
    ./java/org/lamsfoundation/lams/usermanagement/User.java
  3. … 1 more file in changeset.
2:24 pm

Marcin Cieslak

LDEV-2380: Added recently edited LDs list on the first Ped Planner page.

Options
    • -0
    • +12
    ./java/org/lamsfoundation/lams/dbupdates/patch0017_updateFrom23-231.sql
    • -0
    • +6
    ./java/org/lamsfoundation/lams/planner/dao/hibernate/PedagogicalPlannerDAOHibernate.java
    • -0
    • +18
    ./java/org/lamsfoundation/lams/planner/dto/PedagogicalPlannerSequenceNodeDTO.java
    • -0
    • +18
    ./java/org/lamsfoundation/lams/usermanagement/User.java
  5. … 6 more files in changeset.
Tuesday 07 Jul 2009
8:52 am

jliew

change to ascii

Options
    • -156
    • +156
    ./java/org/lamsfoundation/lams/dbupdates/patch0015_updateFrom22.sql
    • -39
    • +39
    ./java/org/lamsfoundation/lams/dbupdates/patch0017_updateFrom23-231.sql
    • -14
    • +14
    ./java/org/lamsfoundation/lams/dbupdates/patch0017_updateFrom23.sql
  4. … 47 more files in changeset.
Monday 06 Jul 2009
10:20 pm

Marcin Cieslak

LDEV-2375: Added "Back" button in Planner Template editor.

Options
    • -0
    • +9
    ./java/org/lamsfoundation/lams/planner/dto/PedagogicalPlannerTemplateDTO.java
  2. … 4 more files in changeset.
10:15 pm

Marcin Cieslak

LDEV-2202: Added a workaround for imported Hibernate collections. The way extra fields in XML document are located was altered - the class name does not have to be a tag name anymore, attribute "class" is also supported now.

Options
    • -118
    • +131
    ./java/org/lamsfoundation/lams/learningdesign/service/ToolContentVersionFilter.java
10:14 pm

Marcin Cieslak

LDEV-2374: Fixed a small bug occuring when importing LD.

Options
    • -2
    • +4
    ./java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java
7:04 pm

Marcin Cieslak

Recreated/updated several resources removed by previous merge.

Options
    • -0
    • +11
    ./java/org/lamsfoundation/lams/dbupdates/patch0017_updateFrom23-231.sql
  2. … 5 more files in changeset.
Friday 03 Jul 2009
9:17 am

Andrey Balan

LDEV-2372 Lams Testing framework works with JBoss 5 now

Options
    • -44
    • +229
    ./java/org/lamsfoundation/lams/localCommonContext.xml
  2. … 1 more file in changeset.
Thursday 02 Jul 2009
9:06 pm

Marcin Cieslak

LDEV-2374: Data flow between tools: framework and example for Q&A -> Vote.

Options
    • -1
    • +7
    ./java/org/lamsfoundation/lams/commonContext.xml
    • -0
    • +143
    ./java/org/lamsfoundation/lams/learningdesign/DataFlowObject.java
    • -0
    • +42
    ./java/org/lamsfoundation/lams/learningdesign/DataFlowObjectComparator.java
    • -0
    • +74
    ./java/org/lamsfoundation/lams/learningdesign/DataTransition.java
    • -233
    • +257
    ./java/org/lamsfoundation/lams/learningdesign/Transition.java
    • -0
    • +55
    ./java/org/lamsfoundation/lams/learningdesign/dao/IDataFlowDAO.java
    • -0
    • +73
    ./java/org/lamsfoundation/lams/learningdesign/dao/hibernate/DataFlowDAO.java
    • -0
    • +101
    ./java/org/lamsfoundation/lams/learningdesign/dto/DataFlowObjectDTO.java
    • -164
    • +235
    ./java/org/lamsfoundation/lams/learningdesign/dto/TransitionDTO.java
    • -56
    • +89
    ./java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java
    • -125
    • +85
    ./java/org/lamsfoundation/lams/tool/OutputFactory.java
    • -69
    • +80
    ./java/org/lamsfoundation/lams/tool/ToolContentManager.java
    • -44
    • +44
    ./java/org/lamsfoundation/lams/tool/ToolOutputDefinition.java
    • -1
    • +1
    ./java/org/lamsfoundation/lams/tool/service/ILamsCoreToolService.java
    • -2
    • +2
    ./java/org/lamsfoundation/lams/tool/service/LamsCoreToolService.java
  16. … 71 more files in changeset.
5:59 pm

jliew

more merging lams2_3 into head

Options
    • -0
    • +1
    ./java/org/lamsfoundation/lams/beanRefContext.xml
    • -1
    • +1
    ./java/org/lamsfoundation/lams/dbupdates/patch0015_updateFrom22.sql
    • -0
    • +16
    ./java/org/lamsfoundation/lams/gradebook/GradebookUserActivity.java
  4. … 30 more files in changeset.
4:19 pm

jliew

Merge lams2_3 to head (including things not merged last time due to eclipse's merge wizard not handling the lams2_3 start point as expected)

Options
    • -1
    • +1
    ./java/org/lamsfoundation/lams/commonContext.xml
    • -2
    • +20
    ./java/org/lamsfoundation/lams/dbupdates/patch0015_updateFrom22.sql
    • -2
    • +2
    ./java/org/lamsfoundation/lams/events/Event.java
    • -9
    • +0
    ./java/org/lamsfoundation/lams/learningdesign/TextSearchCondition.java
    • -0
    • +1
    ./java/org/lamsfoundation/lams/lesson/Lesson.java
    • -4
    • +6
    ./java/org/lamsfoundation/lams/lesson/dao/hibernate/LearnerProgressDAO.java
    • -0
    • +10
    ./java/org/lamsfoundation/lams/notebook/model/NotebookEntry.java
    • -0
    • +34
    ./java/org/lamsfoundation/lams/notebook/service/CoreNotebookService.java
    • -0
    • +3
    ./java/org/lamsfoundation/lams/notebook/service/ICoreNotebookService.java
    • -236
    • +335
    ./java/org/lamsfoundation/lams/tool/OutputFactory.java
    • -128
    • +154
    ./java/org/lamsfoundation/lams/tool/ToolOutputDefinition.java
    • -29
    • +52
    ./java/org/lamsfoundation/lams/tool/dto/ToolOutputDefinitionDTO.java
    • -0
    • +28
    ./java/org/lamsfoundation/lams/util/DateUtil.java
    • -99
    • +104
    ./java/org/lamsfoundation/lams/util/WebUtil.java
    • -36
    • +42
    ./java/org/lamsfoundation/lams/web/action/LamsDispatchAction.java
  16. … 153 more files in changeset.
Wednesday 01 Jul 2009
10:48 am

jliew

Merge lams2_3 into head

Options
    • -10
    • +24
    ./java/org/lamsfoundation/lams/applicationContext.xml
    • -2
    • +34
    ./java/org/lamsfoundation/lams/beanRefContext.xml
    • -42
    • +69
    ./java/org/lamsfoundation/lams/cache/CacheDebugListener.java
    • -176
    • +216
    ./java/org/lamsfoundation/lams/cache/CacheManager.java
    • -7
    • +184
    ./java/org/lamsfoundation/lams/commonContext.xml
    • -0
    • +29
    ./java/org/lamsfoundation/lams/dbupdates/patch0017_updateFrom23-231.sql
    • -26
    • +26
    ./java/org/lamsfoundation/lams/events/dao/hibernate/EventDAOHibernate.java
    • -147
    • +124
    ./java/org/lamsfoundation/lams/integration/ExtServerOrgMap.java
    • -0
    • +84
    ./java/org/lamsfoundation/lams/integration/ExtServerToolAdapterMap.java
    • -0
    • +9
    ./java/org/lamsfoundation/lams/integration/service/IIntegrationService.java
    • -312
    • +319
    ./java/org/lamsfoundation/lams/integration/service/IntegrationService.java
    • -11
    • +13
    ./java/org/lamsfoundation/lams/learningdesign/GroupUser.java
    • -95
    • +98
    ./java/org/lamsfoundation/lams/learningdesign/LearningDesignProcessor.java
    • -1
    • +24
    ./java/org/lamsfoundation/lams/learningdesign/dto/LibraryActivityDTO.java
    • -426
    • +438
    ./java/org/lamsfoundation/lams/learningdesign/service/LearningDesignValidator.java
  16. … 111 more files in changeset.
Friday 19 Jun 2009
6:54 pm

Marcin Cieslak

LDEV-2369: Added tutorial video functionality to HEAD (previously removed from 2.3 branch). Fixed IE > 6 bug preventing Thickbox to be centered on the screen.

Options
    • -4
    • +53
    ./java/org/lamsfoundation/lams/usermanagement/User.java
    • -22
    • +54
    ./java/org/lamsfoundation/lams/usermanagement/dto/UserDTO.java
    • -1
    • +6
    ./java/org/lamsfoundation/lams/web/util/AttributeNames.java
  4. … 16 more files in changeset.
Thursday 07 May 2009
2:15 pm

paulg

LDEV-2254 Safari and VR Author fixed

LDEV-2286

VR tool now deployed as archived .war

LDEV-2281

Lessons with VR tool activities are now exported correctly

Author recordings are held locally on LAMS server

LDEV-2289

Popup now shown if EITHER media server settings are blank (both required for VR to work)

LDEV-2005

Export for learner/teacher working

Conditions tab removed

Author recordings added to FCK content folder

Preview images uploaded to own content folder for each VR session

Options
    • -0
    • +18
    ./java/org/lamsfoundation/lams/dbupdates/patch0015_updateFrom22.sql
    • -2
    • +4
    ./java/org/lamsfoundation/lams/util/Base64StringToImageUtil.java
  3. … 161 more files in changeset.
Tuesday 28 Apr 2009
4:57 pm

Marcin Cieslak

LDEV-2125: If user's time zone is not set, it defaults to server's time zone (if in the list of supported time zones) or GMT (if not in the list).

Options
    • -4
    • +27
    ./java/org/lamsfoundation/lams/usermanagement/User.java
1:19 pm

dcarlier

LDEV-2149 Competence mappings now imported properly

Options
    • -44
    • +26
    ./java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java
3:37 am

Marcin Cieslak

LDEV-2125: User profile has now an option to choose a time zone. This choice is later used in LocaleFilter and allows JSP pages to adjust displayed dates accordingly.

Options
    • -0
    • +15
    ./java/org/lamsfoundation/lams/dbupdates/patch0017_updateFrom23.sql
    • -68
    • +90
    ./java/org/lamsfoundation/lams/usermanagement/User.java
    • -1
    • +1
    ./java/org/lamsfoundation/lams/usermanagement/dto/UserDTO.java
    • -89
    • +91
    ./java/org/lamsfoundation/lams/web/filter/LocaleFilter.java
  5. … 6 more files in changeset.
Tuesday 21 Apr 2009
7:42 am

lfoxton

Merging lams_gradebook changes with head

LDEV-2213

LDEV-2214

LDEV-2212

LDEV-2207

Options
    • -0
    • +68
    ./java/org/lamsfoundation/lams/learningdesign/GroupUser.java