Skip to content


Subversion checkout URL

You can clone with
Download ZIP

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: Nifter/Markus
head fork: Nifter/Markus
Commits on Oct 20, 2011
Bertrand Fixed routing bug for automated_test_controller f52a91b
Bertrand Merge branch 'master' of git:// into d…
Bertrand Fixed bug #563, with better code comprehension ad4f7c5
Bertrand Fixed bug #563, with better code comprehension 2 c3e4b4c
Commits on Nov 13, 2011
@etraikov etraikov Fixed problems on the group page: assigning, unassigning, and global …
…validation, unvalidation, and deletion
Commits on Nov 14, 2011
Bertrand Patched files for tests (Patch from Benjamin_V ff49314
Bertrand Fixed error 404 while updating configuration file for test framework b2ae476
Bertrand updated Automated_tests_controller_test.rb to fix last error in tests 4a6b982
Commits on Nov 17, 2011
Bertrand Fixed routing bug for Graders and Admins while looking at submissions…
… when students has hosted some files
Bertrand Fixed routing issue for render_test_result and in _test_selector 2fa7a59
Commits on Nov 20, 2011
@benjaminvialle benjaminvialle Merge pull request #576 from Sitcocolita/depotOfficiel
Merge request from students of École Centrale de Nantes : Bertrand Magnien, Guillaume Bugnet, Claire Veiniere, Charline Allilaire, Eddarbouch Karim, Wallez Benjamin.

Reviewed by Nelle and Benjamin V.
@benjaminvialle benjaminvialle Merge pull request #585 from etraikov/group_students
Fixed broken functionality on groups page
Commits on Nov 21, 2011
@rvlaicu rvlaicu Added a link to the markus issues list in the about page 89cbe14
@rvlaicu rvlaicu Changed phrasing in french 9435324
Commits on Nov 23, 2011
@lkysow lkysow Fixed some spelling and grammar errors 106ef06
Commits on Nov 24, 2011
@rvlaicu rvlaicu Fixed delete button for single annotation texts 0db29c3
@rvlaicu rvlaicu Trying to fix the annotation edit functionality a52a6df
@rvlaicu rvlaicu Edit now properly works for annotation texts 6563859
@rvlaicu rvlaicu Changed to the proper routing call 5176572
@rvlaicu rvlaicu Made sure assignment is set when adding new annotation category 720b376
@rvlaicu rvlaicu Fixed delete, but got rid of some error handling 015cb9d
@rvlaicu rvlaicu Readded the inline if statement 1970506
@rvlaicu rvlaicu Taking out the inline if statement again 871b691
@rvlaicu rvlaicu edit and delete are now on the same line fcdfcb3
@rvlaicu rvlaicu Links now look like buttons 692ee67
@rvlaicu rvlaicu reimplemented add_annotation with js 4c6db05
@rvlaicu rvlaicu Fixed tests 6322cf0
Commits on Nov 28, 2011
@Nifter Fixes #426. Changes all uploads to post instead of get. 532fd31
@Nifter Changed unit and functional tests to send files instead of strings fo…
…r CSV import tests.
@Nifter Cleaned up code changes. d50cf0f
@Nifter Added some functional tests. 330a9cd
@Nifter Added missing regression tests for uploading file routing fixes. ed9d515
@Nifter Cleaned up code. 25b12cc
@Nifter Added a flexible_criteria regression test. db56f7f
@Nifter Fixes #284. Allows uploading of all Admin related files in multiple e…
…ncoding formats using drop down menu.
@Nifter Added localization to the encoding upload selection. 37dbe65
@Nifter Modified some unit tests to pass in the required number of arguments. 71a79d5
@Nifter Merge branch 'csv-encoding-feature-2' of int…
…o csv-encoding-feature-2
Something went wrong with that request. Please try again.