Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDEV-2475 Changing the implementation to use the temp dir specified in the config table instead of the java default. This means that the temp dir has to be cleaned for every restart of the lams server

    • -0
    • +88
    ./org/lamsfoundation/lams/web/LamsStartupServlet.java
  1. … 2 more files in changeset.
LDEV-2461 only display monitor link if user is staff for that lesson

  1. … 2 more files in changeset.
autoformat

LDEV-1616 configuration to allow profile editing

  1. … 10 more files in changeset.
format

LDEV-1617 add validation message

  1. … 2 more files in changeset.
LDEV-2448 merged from branch

  1. … 2 more files in changeset.
LDEV-1875 don't allow a folder to become it's own parent

merge LDEV-2439 from branch

merge LDEV-2438 from branch

LDEV-2430 update public folder name from Configuration, not workspaceManagementService; use server default locale, not user locale

  1. … 6 more files in changeset.
LDEV-2420 Work on adding theme options to the add and edit user pages

  1. … 6 more files in changeset.
LDEV-2420 Removing uneccessary data structures and tables from the db, as well as implementing the same theme settings for flash themes

    • -11
    • +30
    ./org/lamsfoundation/lams/web/ProfileAction.java
  1. … 47 more files in changeset.
LDEV-2420 Adding functionality to add new themes to the database. All that is left now is to remove the defunct tables that are not used

  1. … 19 more files in changeset.
LDEV-2420 Merging the stylesheets so there is only one defaultHTML.css file, to make it easier to implement themes

    • -13
    • +6
    ./org/lamsfoundation/lams/web/tag/CssTag.java
  1. … 3 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. … 47 more files in changeset.
Merging changes to head from the branch

Committing changes for grades integration servlet somehow lost during 2.2-2.3

LDEV-2380: Changed number of displayed LDs to 10. Made the list show/hidden.

LDEV-2382: Fixing a bug causing only the first activity in branches in Planner to be displayed.

immediately return false if login blank

LDEV-2380: Added some code comments.

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

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

  1. … 4 more files in changeset.
Recreated/updated several resources removed by previous merge.

    • -0
    • +173
    ./org/lamsfoundation/lams/web/TutorialAction.java
  1. … 5 more files in changeset.
LDEV-2374: Data flow between tools: framework and example for Q&A -> Vote.

  1. … 81 more files in changeset.
more merging lams2_3 into head

  1. … 29 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)

    • -2
    • +13
    ./org/lamsfoundation/lams/web/tag/UserTag.java
  1. … 161 more files in changeset.
Merge lams2_3 into head

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

    • -1
    • +22
    ./org/lamsfoundation/lams/web/IndexAction.java
  1. … 17 more files in changeset.