• last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Fixing format of file

    • -3
    • +9
    ./lams/themes/service/IThemeService.java
    • -214
    • +219
    ./lams/themes/service/ThemeService.java
oauth support functional but not production ready (tokens currently stored in address columns of lams_user). added new share resource type for google docs which are retrieved via oauth and saved as html files in content repository.

  1. … 24 more files in changeset.
LDEV-2417 merged from head

LDEV-2417 trim returned string config values

LDEV-2420 Merging the stylesheets so there is only one defaultHTML.css file, to make it easier to implement themes

  1. … 3 more files in changeset.
LDEV-2374: Added a parameter to override repository security constraints. Now the Tool Content Handler name can be passed and a ticket will be taken from there, instead of the current tool.

Changed the way Pixlr Tool provides output for Data Flow.

  1. … 7 more files in changeset.
LDEV-2075 fixing statistics page so you can choose which group to display instead of just displaying them all

    • -77
    • +68
    ./lams/statistics/dto/StatisticsDTO.java
    • -0
    • +21
    ./lams/statistics/service/IStatisticsService.java
    • -35
    • +52
    ./lams/statistics/service/StatisticsService.java
  1. … 3 more files in changeset.
LDEV-2075 creting overall statistics page for admin

    • -0
    • +80
    ./lams/statistics/dto/GroupStatisticsDTO.java
    • -0
    • +88
    ./lams/statistics/dto/StatisticsDTO.java
    • -0
    • +8
    ./lams/statistics/service/IStatisticsService.java
    • -0
    • +97
    ./lams/statistics/service/StatisticsService.java
using new patch level numbering system

    • -0
    • +8
    ./lams/dbupdates/patch02040000.sql
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

    • -149
    • +147
    ./lams/selenium/DefaultSeleniumFlex.java
    • -0
    • +53
    ./lams/selenium/SeleniumConstants.java
    • -0
    • +68
    ./lams/selenium/SeleniumException.java
post 2.3.1 patch files - planner.lamscommunity.org is at patch level 18

    • -0
    • +8
    ./lams/dbupdates/patch0019_updateFrom231.sql
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)

    • -0
    • +56
    ./lams/tool/SimpleURL.java
  1. … 32 more files in changeset.
Changing webutil to always log requests to external servers

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

    • -0
    • +55
    ./lams/dbupdates/patch0018_updateFrom231.sql
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

    • -0
    • +592
    ./lams/selenium/AbstractSeleniumTestCase.java
    • -0
    • +182
    ./lams/selenium/DefaultSeleniumFlex.java
    • -0
    • +69
    ./lams/selenium/SeleniumTestSuite.java
    • -0
    • +46
    ./lams/selenium/TestFrameworkConstants.java
    • -0
    • +68
    ./lams/selenium/TestFrameworkException.java
  1. … 5 more files in changeset.
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.

    • -1
    • +13
    ./lams/tool/ToolOutputDefinition.java
  1. … 45 more files in changeset.
file shouldn't have been merged (was deleted on branch)

LDEV-2372 testing framework

*there is no more need in removing .hbm.xml files

LDEV-2380: Added some code comments.

  1. … 1 more file in changeset.
LDEV-2380: Added recently edited LDs list on the first Ped Planner page.

  1. … 6 more files in changeset.
change to ascii

  1. … 22 more files in changeset.
LDEV-2375: Added "Back" button in Planner Template editor.

  1. … 4 more files in changeset.
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.

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

Recreated/updated several resources removed by previous merge.

  1. … 5 more files in changeset.
LDEV-2372 Lams Testing framework works with JBoss 5 now

    • -44
    • +229
    ./lams/localCommonContext.xml
  1. … 1 more file in changeset.
LDEV-2374: Data flow between tools: framework and example for Q&A -> Vote.

    • -0
    • +143
    ./lams/learningdesign/DataFlowObject.java
    • -0
    • +74
    ./lams/learningdesign/DataTransition.java
    • -235
    • +259
    ./lams/learningdesign/Transition.java
    • -0
    • +55
    ./lams/learningdesign/dao/IDataFlowDAO.java
    • -0
    • +73
    ./lams/learningdesign/dao/hibernate/DataFlowDAO.java
    • -0
    • +101
    ./lams/learningdesign/dto/DataFlowObjectDTO.java
    • -175
    • +246
    ./lams/learningdesign/dto/TransitionDTO.java
    • -126
    • +86
    ./lams/tool/OutputFactory.java
    • -88
    • +99
    ./lams/tool/ToolContentManager.java
    • -45
    • +45
    ./lams/tool/ToolOutputDefinition.java
  1. … 71 more files in changeset.
more merging lams2_3 into head

  1. … 37 more files in changeset.
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)

    • -0
    • +10
    ./lams/notebook/model/NotebookEntry.java
    • -0
    • +34
    ./lams/notebook/service/CoreNotebookService.java
    • -256
    • +355
    ./lams/tool/OutputFactory.java
    • -130
    • +156
    ./lams/tool/ToolOutputDefinition.java
    • -31
    • +54
    ./lams/tool/dto/ToolOutputDefinitionDTO.java
    • -38
    • +44
    ./lams/web/action/LamsDispatchAction.java
  1. … 200 more files in changeset.
Merge lams2_3 into head

    • -43
    • +70
    ./lams/cache/CacheDebugListener.java
    • -197
    • +237
    ./lams/cache/CacheManager.java
    • -149
    • +126
    ./lams/integration/ExtServerOrgMap.java
    • -330
    • +337
    ./lams/integration/service/IntegrationService.java
    • -12
    • +14
    ./lams/learningdesign/GroupUser.java
  1. … 148 more files in changeset.