Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDEV-2392 Wrong work of thickbox in ImageGallery tool fixed

there are no chances of using unified thickbox.patched.js in ImageGallery tool

as it was previously dramatically modified specially for this tool

so rolled back to the previous version of thickbox.js + jQuery.browser.version bug fixed

    • binary
    ./includes/images/loadingAnimation.gif
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)

  1. … 167 more files in changeset.
Merge lams2_3 into head

    • -265
    • +265
    ./includes/javascript/thickbox.js
  1. … 124 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. … 17 more files in changeset.
merging improvements from lams2_3_spring_jboss_tune branch

  1. … 118 more files in changeset.
LDEV-2152: includes next activity icon

  1. … 42 more files in changeset.
LDEV-2150: added icons to save/cancel buttons

  1. … 25 more files in changeset.
LDEV-2005: updating FCKEditor.tag to pass contentfolder id to video reorder fckeditor plugin

  1. … 21 more files in changeset.
LDEV-2111 Upgraded FCKEditor to version 2.6.4 and FCKEditor.java (taglibs) to 2.4.1 - displayExpanded default set to true

  1. … 25 more files in changeset.
LDEV-2111 Upgraded FCKEditor to version 2.6.4 and FCKEditor.java (taglibs) to 2.4.1

    • -200
    • +114
    ./WEB-INF/tlds/fckeditor/FCKeditor.tld
  1. … 83 more files in changeset.
LDEV-2113: Update FCKEditor.tag

  1. … 21 more files in changeset.
LDEV-2070 Ability to upload multiple images at once

*a bit of renaming in authoring

    • -0
    • +17
    ./includes/javascript/imageGalleryitem.js
    • -65
    • +0
    ./pages/authoring/parts/addfile.jsp
    • -0
    • +73
    ./pages/authoring/parts/addimage.jsp
    • -0
    • +64
    ./pages/authoring/parts/addmultipleimages.jsp
    • -0
    • +45
    ./pages/authoring/parts/imagefile.jsp
    • -45
    • +0
    ./pages/authoring/parts/itemattachment.jsp
    • -0
    • +73
    ./pages/learning/parts/addmultipleimages.jsp
    • -0
    • +73
    ./pages/monitoring/parts/addmultipleimages.jsp
  1. … 10 more files in changeset.
LDEV-2069 Groups votes(and comments) are not shared across sessions anymore

    • -2
    • +2
    ./pages/learning/parts/commentsarea.jsp
  1. … 8 more files in changeset.
LDEV-2065 Notification for monitors when student uploads image

  1. … 10 more files in changeset.
LDEV-1961 Export Portfolio

* now it looks like mock up on this page http://wiki.lamsfoundation.org/display/lams/Image+Gallery

* also export portfolio is group aware now

    • -0
    • +92
    ./pages/export/exportimagelearner.jsp
    • -0
    • +142
    ./pages/export/exportimageteacher.jsp
  1. … 7 more files in changeset.
LDEV-2062 ability to vote for several images

    • -2
    • +1
    ./pages/learning/parts/commentsarea.jsp
  1. … 22 more files in changeset.
LDEV-2063 Added ability to add an image from Monitor

    • -0
    • +70
    ./pages/monitoring/parts/addimage.jsp
  1. … 6 more files in changeset.
LDEV-2064 average rating or number of votes included on summary page

LDEV-2034

* images has correct dimensions in IE now

* also switched from lightbox.js to another implemetation which is called - lytebox

    • -0
    • +93
    ./includes/css/lytebox.css
    • binary
    ./includes/images/close_grey.png
    • -2
    • +12
    ./includes/javascript/jquery.galleria.js
    • -427
    • +0
    ./includes/javascript/lightbox.js
    • -0
    • +850
    ./includes/javascript/lytebox.js
    • -3
    • +19
    ./pages/authoring/parts/itemlist.jsp
    • -0
    • +2
    ./pages/learning/parts/commentsarea.jsp
  1. … 10 more files in changeset.
LDEV-1957

*removed reviewItem action

    • -115
    • +0
    ./pages/itemreview/instructionsnav.jsp
  1. … 2 more files in changeset.
LDEV-1961 Export Portfolio

    • -0
    • +114
    ./pages/export/exportimage.jsp
    • -213
    • +64
    ./pages/export/exportportfolio.jsp
  1. … 9 more files in changeset.
LDEV-2032

* created tool outputs

* correcting names in ApplicationContext

* deleted eventNotificationService

  1. … 18 more files in changeset.
LDEV-1960 Monitor

* added pop up dialog on comment deletion

    • -4
    • +13
    ./pages/monitoring/imagesummary.jsp
  1. … 1 more file in changeset.
LDEV-1958 Authoring

* added pop up dialog on image deletion

* style of the links improved

LDEV-1960 Monitor

* if it is group, rankings calculated all separate for each groups.

* fixed displaying ratings on imageSummary page

* notebook fixed

* edit comment page works ok

* decided to move statistic on voting/rating to the statistics page instead of displaying them on summary one

    • -6
    • +35
    ./pages/monitoring/imagesummary.jsp
    • -5
    • +9
    ./pages/monitoring/parts/editcomment.jsp
    • -0
    • +15
    ./pages/monitoring/startimagesummary.jsp
    • -25
    • +39
    ./pages/monitoring/statistic.jsp
  1. … 10 more files in changeset.
LDEV-1960 Monitor

* all the work is done except for saving updated comments

* fix for the rating mechanism (rate is unique for each user now)

    • binary
    ./includes/images/completeitem.gif
    • binary
    ./includes/images/dash.gif
    • -0
    • +145
    ./pages/monitoring/imagesummary.jsp
    • -37
    • +49
    ./pages/monitoring/monitoring.jsp
    • -0
    • +70
    ./pages/monitoring/parts/editcomment.jsp
    • -0
    • +16
    ./pages/monitoring/start.jsp
    • -240
    • +259
    ./pages/monitoring/summary.jsp
  1. … 23 more files in changeset.
LDEV-2009 * if the size of the image doesn't require zooming then this image will be assigned with close button * also removed wrong forwarding from close area in thickbox layer

  1. … 1 more file in changeset.
LDEV-1959 * image list is now adjustable to the thumbnailImageDimensions from configuration settings

    • -13
    • +0
    ./includes/css/jquery.jcarousel.skin.css
LDEV-2009 Added the "open original size" link under each picture

    • -0
    • +2
    ./pages/learning/parts/commentsarea.jsp
  1. … 1 more file in changeset.
LDEV-1959 * ability to disable star rating (finish_lock now works fine) * rendering of star rating improved * position of image description fixed * support for mediumImageDimensions from configuration settings * reflection fixed * define_later and run_offline fixed

    • -23
    • +29
    ./includes/javascript/jquery.rating.1.1.js
    • -1
    • +1
    ./pages/learning/parts/commentlist.jsp
    • -18
    • +19
    ./pages/learning/parts/commentsarea.jsp
  1. … 3 more files in changeset.