lp://staging/~replaceafill/schooltool/schooltool_588645

Branch merges

Propose for merging

No branches dependent on this one.

Rejected for merging into lp://staging/schooltool/1.7

Gediminas Paulauskas (community): Abstain on 2010-06-03

Diff: 311 lines (+146/-80)

8 files modified

CHANGES.txt (+1/-0)
src/schooltool/basicperson/browser/configure.zcml (+0/-10)
src/schooltool/basicperson/browser/resources/jstree/script.js (+0/-23)
src/schooltool/basicperson/browser/resources/jstree/style.css (+0/-34)
src/schooltool/basicperson/browser/templates/person_view.pt (+65/-4)
src/schooltool/person/browser/home.pt (+65/-4)
src/schooltool/schoolyear/browser/templates/schoolyear_add.pt (+9/-5)
src/schooltool/skin/configure.zcml (+6/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #588645: Update included jQuery to 1.4

High

Fix Released

Link a bug report

Related blueprints

2686. By Douglas Cerna on 2010-06-02

Updated CHANGES.txt

2685. By Douglas Cerna on 2010-06-02

Removed old empty resources directory

2684. By Douglas Cerna on 2010-06-02

Registered jQuery 1.4 and the JSTree library under the skin package

2683. By Douglas Cerna on 2010-06-02

Registered jQuery 1.4 under a different resource name and used jQuery's noConflict option in the person view

2682. By Douglas Cerna on 2010-05-31

Copy courses, timetable schemas, groups and their members from previous school year (LP: #541673)

2681. By Gediminas Paulauskas on 2010-05-25

Update copyright year

2680. By Gediminas Paulauskas on 2010-05-21

Bump version to 1.4.1dev

2679. By Gediminas Paulauskas on 2010-05-21

Release 1.4.0

2678. By Gediminas Paulauskas on 2010-05-21

Fix a test for Confirm label change.

2677. By Gediminas Paulauskas on 2010-05-21

Translate "Confirm" button in delete forms correctly.