lams-github

lams_central

Clone Tools

Stats

Commits this week: 0
Total Committers: 31
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
Monday 25 Apr 2011
10:03 am

erniegx <ernieg@gmail.com>

LDEV-2670: LAMS doesn't redirect when using https

Options
    • -2
    • +2
    ./src/java/org/lamsfoundation/lams/web/tag/WebAppURLTag.java
  2. … 1 more file in changeset.
Tuesday 12 Apr 2011
11:44 pm

Andrey Balan

LDEV-2657 Date and time restriction in activities

*merge from lams2_3_release

Options
    • -0
    • +12
    ./web/css/defaultHTML.css
    • -0
    • +12
    ./web/css/defaultHTML_rtl.css
    • -7
    • +1
    ./web/css/jquery-ui-timepicker-addon.css
8:19 pm

Andrey Balan

LDEV-2657 Date and time restriction in activities

*merge from lams2_3_release

Options
    • -6
    • +12
    ./web/css/jquery-ui-timepicker-addon.css
    • binary
    ./web/images/css/check48.png
7:01 pm

Andrey Balan

LDEV-2657 Date and time restriction in activities

*merge from lams2_3_release

Options
    • -0
    • +386
    ./web/css/jquery-ui-1.8.11.flick-theme.css
    • -0
    • +6
    ./web/css/jquery-ui-timepicker-addon.css
    • binary
    ./web/images/css/jquery-ui.flick-theme/ui-bg_flat_0_aaaaaa_40x100.png
    • binary
    ./web/images/css/jquery-ui.flick-theme/ui-bg_flat_0_eeeeee_40x100.png
    • binary
    ./web/images/css/jquery-ui.flick-theme/ui-bg_flat_55_ffffff_40x100.png
    • binary
    ./web/images/css/jquery-ui.flick-theme/ui-bg_flat_75_ffffff_40x100.png
    • binary
    ./web/images/css/jquery-ui.flick-theme/ui-bg_glass_65_ffffff_1x400.png
    • binary
    ./web/images/css/jquery-ui.flick-theme/ui-bg_highlight-soft_100_f6f6f6_1x100.png
    • binary
    ./web/images/css/jquery-ui.flick-theme/ui-bg_highlight-soft_25_0073ea_1x100.png
    • binary
    ./web/images/css/jquery-ui.flick-theme/ui-bg_highlight-soft_50_dddddd_1x100.png
    • binary
    ./web/images/css/jquery-ui.flick-theme/ui-icons_0073ea_256x240.png
    • binary
    ./web/images/css/jquery-ui.flick-theme/ui-icons_454545_256x240.png
    • binary
    ./web/images/css/jquery-ui.flick-theme/ui-icons_666666_256x240.png
    • binary
    ./web/images/css/jquery-ui.flick-theme/ui-icons_ff0084_256x240.png
    • binary
    ./web/images/css/jquery-ui.flick-theme/ui-icons_ffffff_256x240.png
    • -0
    • +16
    ./web/includes/javascript/jquery-1.5.1.min.js
    • -0
    • +911
    ./web/includes/javascript/jquery-ui-timepicker-addon.js
Monday 11 Apr 2011
8:36 pm

Andrey Balan

LDEV-2665 Ability to upload user's portrait directly from the webcam

*merge from lams2_3_release

Options
    • -12
    • +70
    ./src/java/org/lamsfoundation/lams/web/PortraitSaveAction.java
    • -0
    • +405
    ./web/css/jquery-ui-1.8.11.redmont-theme.css
    • binary
    ./web/images/css/jquery-ui.redmond-theme/ui-bg_flat_0_aaaaaa_40x100.png
    • binary
    ./web/images/css/jquery-ui.redmond-theme/ui-bg_flat_55_fbec88_40x100.png
    • binary
    ./web/images/css/jquery-ui.redmond-theme/ui-bg_glass_75_d0e5f5_1x400.png
    • binary
    ./web/images/css/jquery-ui.redmond-theme/ui-bg_glass_85_dfeffc_1x400.png
    • binary
    ./web/images/css/jquery-ui.redmond-theme/ui-bg_glass_95_fef1ec_1x400.png
    • binary
    ./web/images/css/jquery-ui.redmond-theme/ui-bg_gloss-wave_55_5c9ccc_500x100.png
    • binary
    ./web/images/css/jquery-ui.redmond-theme/ui-bg_inset-hard_100_f5f8f9_1x100.png
    • binary
    ./web/images/css/jquery-ui.redmond-theme/ui-bg_inset-hard_100_fcfdfd_1x100.png
    • binary
    ./web/images/css/jquery-ui.redmond-theme/ui-icons_217bc0_256x240.png
    • binary
    ./web/images/css/jquery-ui.redmond-theme/ui-icons_2e83ff_256x240.png
    • binary
    ./web/images/css/jquery-ui.redmond-theme/ui-icons_469bdd_256x240.png
    • binary
    ./web/images/css/jquery-ui.redmond-theme/ui-icons_6da8d5_256x240.png
    • binary
    ./web/images/css/jquery-ui.redmond-theme/ui-icons_cd0a0a_256x240.png
  16. … 8 more files in changeset.
12:25 am

Marcin Cieslak

LDEV-2646: Several fixes for Planner access control: "Viewing" and "removing" is for whole nodes, not just templates. Node's owner can not remove it if there are subnodes he doesn't have permissions to remove.

Options
    • -24
    • +62
    ./src/java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerAction.java
    • -7
    • +7
    ./src/java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerSequenceNodeForm.java
    • -3
    • +3
    ./web/includes/javascript/pedagogicalPlanner.js
  4. … 2 more files in changeset.
Friday 08 Apr 2011
12:31 pm

erniegx <ernieg@gmail.com>

LDEV-2666: issues with jqgrid and firefox 4

Options
    • -5
    • +1
    ./web/includes/javascript/jqgrid/js/jquery.jqGrid.js
Saturday 02 Apr 2011
5:16 am

Andrey Balan

LDEV-2664 Switch learner interface for learners if they use a mobile device

*merge from lams2_3_release

Options
    • -0
    • +1
    ./build.xml
    • -0
    • +6
    ./conf/xdoclet/filter-mappings.xml
    • -0
    • +5
    ./conf/xdoclet/filters.xml
    • binary
    ./web/WEB-INF/lib/urlrewrite-3.2.0.jar
    • -0
    • +84
    ./web/WEB-INF/urlrewrite.xml
    • -1
    • +2
    ./web/learner.jsp
  7. … 3 more files in changeset.
Sunday 06 Mar 2011
5:56 pm

Marcin Cieslak

LDEV-2642, LDEV-2646: Extend access control for Planner nodes. Add a node's owner field. Fix exporting/importing nodes. Upgrade XStream from 1.1 to 1.1.3.

Options
    • -90
    • +126
    ./src/java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerAction.java
    • -10
    • +141
    ./src/java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerSequenceNodeForm.java
    • -8
    • +46
    ./web/includes/javascript/pedagogicalPlanner.js
  4. … 9 more files in changeset.
Wednesday 16 Feb 2011
6:42 pm

Andrey Balan

LDEV-2628 *introduced new class which maps lessons with integration server

*merge from lams2_3_release

Options
    • -0
    • +3
    ./src/java/org/lamsfoundation/lams/webservice/xml/LessonManagerServlet.java
  2. … 8 more files in changeset.
Monday 14 Feb 2011
7:45 am

Marcin Cieslak

LDEV-2646: Allow access control for viewing/editing a copy/original template in Planner nodes for Teachers. Swap collapse/expand arrows - it seems more right now. Some clean up - move PlannerActivityMetadata to a proper packet, change some labels etc.

Options
    • -25
    • +46
    ./src/java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerAction.java
    • -0
    • +18
    ./src/java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerSequenceNodeForm.java
    • binary
    ./web/images/pedag_collapse.png
    • binary
    ./web/images/pedag_collapse_arrow.png
    • binary
    ./web/images/pedag_expand.png
    • binary
    ./web/images/pedag_expand_arrow.png
    • -0
    • +9
    ./web/includes/javascript/pedagogicalPlanner.js
  8. … 14 more files in changeset.
Sunday 13 Feb 2011
2:38 am

Marcin Cieslak

LDEV-2642, LDEV-2616: Move Planner activity metadata (hidden, collapsed, expanded) to a separate table, as it may grow in the future and we don't want to make ToolActivity too complex. Move Editing Advice content from Online Instructions in activities to the metadata table. Allow editing the Editing Advice straight from the planner. Use jquery_ui instead of cluetip (dispose the last one completely). While creating a node, the Learning Design is imported just once from ZIP into DB, instead of importing it each time someone opens it in Planner. This allows less unnecessary copies of the LD and allows easier modfication of the original design. Change the way a Teacher gets a copy of the design. When opening the template in Planner, a copy is made in common folder ("Planner preview"). When the user saves the design, the same copy is *moved* to user's folder, rather than copying it again. Futhermore, each subsequent save modifies the same LD rather than making another copy.

Options
    • -0
    • +2
    ./src/java/org/lamsfoundation/lams/util/CentralConstants.java
    • -200
    • +219
    ./src/java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerAction.java
    • -0
    • +13
    ./src/java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerActivityForm.java
    • -14
    • +5
    ./src/java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerSequenceNodeForm.java
    • -7
    • +1
    ./web/css/pedagogicalPlanner.css
    • -0
    • +273
    ./web/includes/javascript/jquery-ui/jquery-ui-1.7.3.custom.min.js
    • -543
    • +0
    ./web/includes/javascript/jquery.cluetip.js
    • -31
    • +30
    ./web/includes/javascript/pedagogicalPlanner.js
  9. … 12 more files in changeset.
Tuesday 08 Feb 2011
1:55 am

Andrey Balan

LDEV-2637 Show public folder when creating a lesson

*merge from lams2_3_release

Options
    • -0
    • +6
    ./src/java/org/lamsfoundation/lams/webservice/xml/LearningDesignRepositoryServlet.java
Sunday 06 Feb 2011
7:29 pm

Andrey Balan

LDEV-2637 Show public folder when creating a lesson

*merge from lams2_3_release

Options
    • -0
    • +7
    ./src/java/org/lamsfoundation/lams/webservice/LearningDesignRepositorySoapBindingImpl.java
Sunday 12 Dec 2010
10:35 pm

Marcin Cieslak

LDEV-2577: Upgraded jQuery Form plugin to the latest version which fixed a bug in file uploading - previously impacting Shared Resources in Planner. The new version is compatible with jQuery 1.3.2 which LAMS currently is using and should be backwards compatible, but it has not been tested in other projects than lams_central - sorry!

Options
    • -485
    • +644
    ./web/includes/javascript/jquery.form.js
  2. … 2 more files in changeset.
10:31 pm

Marcin Cieslak

LDEV-2577: Fixed a bug preventing multiple CKEditor instances on one page to be properly reinitialized after form submit.

Options
    • -24
    • +15
    ./web/WEB-INF/tags/CKEditor.tag
  2. … 27 more files in changeset.
10:17 pm

Marcin Cieslak

LDEV-2614: Added expand activity button. Collapse/expand activity state is now stored on "Save as Sequence" action.

Options
    • -0
    • +2
    ./src/java/org/lamsfoundation/lams/util/CentralConstants.java
    • -26
    • +85
    ./src/java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerAction.java
    • binary
    ./web/images/pedag_collapse.png
    • binary
    ./web/images/pedag_expand.png
    • -9
    • +71
    ./web/includes/javascript/pedagogicalPlanner.js
  6. … 4 more files in changeset.
Monday 06 Dec 2010
4:52 am

Marcin Cieslak

LDEV-2577: Added extra safety measure preventing plain textarea from being show instead of CKEditor instance.

Options
    • -1
    • +1
    ./web/WEB-INF/tags/CKEditor.tag
  2. … 27 more files in changeset.
3:44 am

Marcin Cieslak

LDEV-2615: Added button and code allowing editing a single activity in Full Author.

Options
    • -13
    • +17
    ./src/java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerAction.java
    • -0
    • +1
    ./web/css/pedagogicalPlanner.css
    • binary
    ./web/images/pedag_collapse.png
    • -5
    • +22
    ./web/includes/javascript/pedagogicalPlanner.js
  5. … 1 more file in changeset.
1:18 am

Marcin Cieslak

LDEV-2614: Finding items to hide using common class, rather than id.

Options
    • -8
    • +2
    ./web/includes/javascript/pedagogicalPlanner.js
12:37 am

Marcin Cieslak

LDEV-2614: Added a button to collapse an activity and hyperlink to expand it.

Options
    • -1
    • +11
    ./web/css/pedagogicalPlanner.css
    • binary
    ./web/images/pedag_collapse.png
    • -0
    • +21
    ./web/includes/javascript/pedagogicalPlanner.js
Wednesday 24 Nov 2010
2:36 am

Marcin Cieslak

LDEV-2607: Hardcoded CKEditor width as a fix for Chrome inability to process "100%" width correctly.

Options
    • -1
    • +1
    ./web/WEB-INF/tags/CKEditor.tag
  2. … 26 more files in changeset.
Monday 22 Nov 2010
3:14 pm

Marcin Cieslak

LDEV-2577: Readded movieplayer plugin for CKEditor 3.x

Options
    • -0
    • +25
    ./web/ckeditor/plugins/movieplayer/LICENSE.TXT
    • binary
    ./web/ckeditor/plugins/movieplayer/filmreel.gif
    • binary
    ./web/ckeditor/plugins/movieplayer/filmreel.png
    • -0
    • +13
    ./web/ckeditor/plugins/movieplayer/lang/en.js
    • -0
    • +1
    ./web/ckeditor/plugins/movieplayer/movieplayer.html
    • -0
    • +1
    ./web/ckeditor/plugins/movieplayer/movieplayer.js
    • binary
    ./web/ckeditor/plugins/movieplayer/player_flv_maxi.swf
    • binary
    ./web/ckeditor/plugins/movieplayer/player_mp3_maxi.swf
    • -0
    • +5
    ./web/ckeditor/plugins/movieplayer/plugin.js
    • -2
    • +1
    ./web/includes/javascript/ckconfig_custom.js
3:13 pm

Marcin Cieslak

LDEV-2577: Set default height for CKEditor instances, as in IE it was minimal.

Options
    • -0
    • +4
    ./web/WEB-INF/tags/CKEditor.tag
  2. … 27 more files in changeset.
Thursday 18 Nov 2010
6:28 am

Marcin Cieslak

LDEV-2595: As CSS parameter "display: none" does not work in IE, the initial textarea for CKEditor has height = 0px which does the trick instead.

Options
    • -1
    • +1
    ./web/WEB-INF/tags/CKEditor.tag
  2. … 27 more files in changeset.
3:45 am

Andrey Balan

LDEV-2603 adding tool's images that will be used for SVG creation

*merging from lams2_3_release

Options
    • binary
    ./web/images/svg/icon_assessment.png
    • binary
    ./web/images/svg/icon_branching.png
    • binary
    ./web/images/svg/icon_chat.png
    • binary
    ./web/images/svg/icon_daco.png
    • binary
    ./web/images/svg/icon_dimdim.png
    • binary
    ./web/images/svg/icon_dotLRNForum.png
    • binary
    ./web/images/svg/icon_eAdventure2.png
    • binary
    ./web/images/svg/icon_forum.png
    • binary
    ./web/images/svg/icon_forum_and_scribe.png
    • binary
    ./web/images/svg/icon_gate.png
    • binary
    ./web/images/svg/icon_gmap.png
    • binary
    ./web/images/svg/icon_grouping.png
    • binary
    ./web/images/svg/icon_groupreporting.png
    • binary
    ./web/images/svg/icon_htmlnb.png
    • binary
    ./web/images/svg/icon_imageGallery.png
  16. … 16 more files in changeset.
Saturday 13 Nov 2010
5:30 pm

Marcin Cieslak

LDEV-2577: Modified Equation plugin so it opens an existing image.

Options
    • -12
    • +49
    ./web/ckeditor/plugins/equation_html/plugin.js
Wednesday 10 Nov 2010
2:24 am

Marcin Cieslak

LDEV-2600: Committed missing changes for Paint plugin.

Options
    • -2
    • +2
    ./web/ckeditor/plugins/paint/content.jsp
    • -9
    • +14
    ./web/ckeditor/plugins/paint/plugin.js
Monday 08 Nov 2010
1:14 am

Marcin Cieslak

LDEV-2577: Readded Paint plugin.

Options
    • binary
    ./web/ckeditor/plugins/paint/CK Paint.swf
    • -0
    • +64
    ./web/ckeditor/plugins/paint/content.jsp
    • binary
    ./web/ckeditor/plugins/paint/icon.png
    • -0
    • +22
    ./web/ckeditor/plugins/paint/lang/en.js
    • -0
    • +43
    ./web/ckeditor/plugins/paint/plugin.js
    • -0
    • +5
    ./web/ckeditor/plugins/paint/swfobject.js
    • -1
    • +1
    ./web/includes/javascript/ckconfig_custom.js
Sunday 07 Nov 2010
4:40 pm

Marcin Cieslak

LDEV-2577: Added a new version of equation plugin. This version requires a connection to the plugin's home page.

Options
    • binary
    ./web/ckeditor/plugins/equation_html/equation.gif
    • -0
    • +4
    ./web/ckeditor/plugins/equation_html/lang/en.js
    • -0
    • +67
    ./web/ckeditor/plugins/equation_html/plugin.js
    • -1
    • +1
    ./web/includes/javascript/ckconfig_custom.js