Merge lp://staging/~aelkner/schooltool.gradebook/april_fixes into lp://staging/schooltool.gradebook/0.9
Proposed by
Alan Elkner
| Status: | Merged | ||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| Merged at revision: | 158 | ||||||||||||
| Proposed branch: | lp://staging/~aelkner/schooltool.gradebook/april_fixes | ||||||||||||
| Merge into: | lp://staging/schooltool.gradebook/0.9 | ||||||||||||
| Diff against target: |
1010 lines (+427/-217) (has conflicts) 13 files modified
CHANGES.txt (+7/-0) src/schooltool/gradebook/browser/README.txt (+11/-4) src/schooltool/gradebook/browser/gradebook.css (+30/-0) src/schooltool/gradebook/browser/gradebook.py (+52/-7) src/schooltool/gradebook/browser/gradebook_column_preferences.pt (+71/-57) src/schooltool/gradebook/browser/gradebook_overview.pt (+22/-20) src/schooltool/gradebook/browser/gradebook_rml.pt (+35/-14) src/schooltool/gradebook/browser/mygrades.pt (+20/-10) src/schooltool/gradebook/browser/pdf_views.py (+58/-9) src/schooltool/gradebook/browser/request_absences_by_day.pt (+7/-3) src/schooltool/gradebook/browser/request_failing_report.pt (+65/-55) src/schooltool/gradebook/browser/request_student_report.pt (+4/-2) src/schooltool/gradebook/browser/weight_categories.pt (+45/-36) Text conflict in CHANGES.txt |
||||||||||||
| To merge this branch: | bzr merge lp://staging/~aelkner/schooltool.gradebook/april_fixes | ||||||||||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Gediminas Paulauskas (community) | Approve | ||
|
Review via email:
|
|||
To post a comment you must log in.
Revision history for this message
| Gediminas Paulauskas (menesis) | # |
review:
Approve
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
