Merge lp://staging/~replaceafill/schooltool/schooltool.virginia_done_links into lp://staging/schooltool/flourish
Proposed by
Douglas Cerna
| Status: | Superseded |
|---|---|
| Proposed branch: | lp://staging/~replaceafill/schooltool/schooltool.virginia_done_links |
| Merge into: | lp://staging/schooltool/flourish |
| Diff against target: |
5702 lines (+5469/-0) (has conflicts) 42 files modified
.bzrignore (+10/-0) CHANGES.txt (+39/-0) GPL.txt (+340/-0) MANIFEST.in (+20/-0) Makefile (+163/-0) base.cfg (+37/-0) bootstrap.py (+260/-0) buildout.cfg (+13/-0) setup.py (+76/-0) src/schooltool/__init__.py (+1/-0) src/schooltool/virginia/__init__.py (+22/-0) src/schooltool/virginia/browser/__init__.py (+1/-0) src/schooltool/virginia/browser/configure.zcml (+357/-0) src/schooltool/virginia/browser/importer.py (+240/-0) src/schooltool/virginia/browser/report.py (+878/-0) src/schooltool/virginia/browser/resources/d3.v2.min.js (+4/-0) src/schooltool/virginia/browser/resources/virginia.css (+110/-0) src/schooltool/virginia/browser/resources/virginia.js (+163/-0) src/schooltool/virginia/browser/stests/__init__.py (+1/-0) src/schooltool/virginia/browser/stests/section_summary_report.txt (+867/-0) src/schooltool/virginia/browser/stests/test_selenium.py (+33/-0) src/schooltool/virginia/browser/stests/va_section_report.txt (+358/-0) src/schooltool/virginia/browser/templates/section_report_charts_column.pt (+40/-0) src/schooltool/virginia/browser/templates/section_report_details.pt (+26/-0) src/schooltool/virginia/browser/templates/section_report_score_colors.pt (+38/-0) src/schooltool/virginia/browser/templates/section_report_score_colors_column.pt (+21/-0) src/schooltool/virginia/browser/templates/section_report_script.pt (+31/-0) src/schooltool/virginia/browser/templates/va_section_report_chart.pt (+276/-0) src/schooltool/virginia/browser/templates/va_section_report_details.pt (+21/-0) src/schooltool/virginia/browser/templates/va_section_report_passing_score.pt (+28/-0) src/schooltool/virginia/browser/templates/va_section_report_tables.pt (+80/-0) src/schooltool/virginia/configure.zcml (+18/-0) src/schooltool/virginia/locales/__init__.py (+1/-0) src/schooltool/virginia/locales/en.po (+29/-0) src/schooltool/virginia/locales/schooltool.virginia.pot (+28/-0) src/schooltool/virginia/plugin.zcml (+6/-0) src/schooltool/virginia/scripts/getverso_xls.py (+708/-0) src/schooltool/virginia/stesting.py (+31/-0) src/schooltool/virginia/stesting.zcml (+10/-0) src/schooltool/virginia/translations.zcml (+13/-0) src/schooltool/virginia/virginia.py (+70/-0) version.txt.in (+1/-0) Conflict adding file .bzrignore. Moved existing file to .bzrignore.moved. Conflict adding file CHANGES.txt. Moved existing file to CHANGES.txt.moved. Conflict adding file GPL.txt. Moved existing file to GPL.txt.moved. Conflict adding file MANIFEST.in. Moved existing file to MANIFEST.in.moved. Conflict adding file Makefile. Moved existing file to Makefile.moved. Conflict adding file README.txt. Moved existing file to README.txt.moved. Conflict adding file base.cfg. Moved existing file to base.cfg.moved. Conflict adding file bootstrap.py. Moved existing file to bootstrap.py.moved. Conflict adding file buildout.cfg. Moved existing file to buildout.cfg.moved. Conflict adding file setup.py. Moved existing file to setup.py.moved. Conflict adding file src. Moved existing file to src.moved. Conflict adding file version.txt.in. Moved existing file to version.txt.in.moved. |
| To merge this branch: | bzr merge lp://staging/~replaceafill/schooltool/schooltool.virginia_done_links |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Gediminas Paulauskas | Pending | ||
|
Review via email:
|
|||
This proposal has been superseded by a proposal from 2012-10-08.
To post a comment you must log in.
Unmerged revisions
- 87. By Douglas Cerna
-
Changed Done links styles
- 86. By Gediminas Paulauskas
-
Back to development: 0.2.3
- 85. By Gediminas Paulauskas
-
Preparing release 0.2.2
- 84. By Douglas Cerna
-
Fixed Section Summary report for students with no evaluations
- 83. By Douglas Cerna
-
Changed VA Section Report view to use a table formatter
Fixed calculation bug in attainment tables of the VA Section Report
Fixed calculation bug in scores below minimum passing in Section Summary report
Fixed breadcrumbs/active viewlets for the reports
Added header classes to the report table formatters
Moved report filters logic to base view class
Added stest infrastructure and stests for the reports
Removed unused browser extesion - 82. By Gediminas Paulauskas
-
Fix make extract-
translations - 81. By Gediminas Paulauskas
-
Back to development: 0.2.2
- 80. By Gediminas Paulauskas
-
Preparing release 0.2.1
- 79. By Douglas Cerna
-
Fixed column header in VA Section report
- 78. By Douglas Cerna
-
Added Evaluated option to skill Type filter in Section Summary view
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
