lp:~tarkisto-dev/tarkisto/coursedataoutput-sprint2

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:tarkisto at revision 24

Anna Kuosmanen: Approve on 2010-06-18

Diff: 425 lines (+129/-64)

18 files modified

app/controllers/dashboard_controller.rb (+4/-0)
app/controllers/exams_controller.rb (+8/-3)
app/views/dashboard/_courses.html.haml (+9/-0)
app/views/dashboard/show.html.haml (+8/-34)
app/views/exams/_table.html.haml (+10/-0)
app/views/exams/generate.html.haml (+2/-2)
app/views/exams/index.html.haml (+3/-6)
app/views/exams/new.html.haml (+2/-2)
app/views/exams/show.html.haml (+2/-2)
app/views/layouts/exams.html.haml (+3/-3)
config/locales/tarkisto.en.yml (+3/-0)
config/locales/tarkisto.fi.yml (+3/-0)
features/manage_dashboard.feature (+10/-0)
features/manage_exams.feature (+13/-9)
features/step_definitions/dashboard_steps.rb (+6/-0)
features/support/paths.rb (+3/-3)
spec/controllers/dashboard_controller_spec.rb (+16/-0)
spec/controllers/exams_controller_spec.rb (+24/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

25. By Sami Saada on 2010-06-18

Merged lastest trunk and added missing tests.

24. By Petri T Karjalainen <ptkarjal@svm-16> on 2010-06-16

Added exam queries from database. TODO: Tests

23. By Petri T Karjalainen <ptkarjal@svm-16> on 2010-06-16

Added database queries for courses on dashboard.

22. By Sami Saada on 2010-06-16

Merged internationalization to trunk.

21. By Sami Saada on 2010-06-15

Merged crumbs in trunk.
Also added rcov gem dependency for test coverage.

20. By Sami Saada on 2010-06-15

Merged database layout to trunk.

19. By Sami Saada on 2010-06-15

Added patch for gems:install to install all requested gems.

18. By Sami Saada on 2010-06-07

Merged tabs to trunk.

17. By Sami Saada on 2010-06-07

Merged authentication ui to trunk.
Fixed identation of auth ui.

16. By Sami Saada on 2010-06-07

Merged search box to trunk.