[prev in list] [next in list] [prev in thread] [next in thread]
List: markus-dev
Subject: [MarkUsProject/Markus] 4d694e: Fixed require's path for unit tests
From: noreply () github ! com
Date: 2011-08-05 22:15:06
Message-ID: 20110805221506.6F23A425C4 () smtp1 ! rs ! github ! com
[Download RAW message or body]
Branch: refs/heads/rails_3_migration
Home: https://github.com/MarkUsProject/Markus
Commit: 4d694ea7a9c4abc59a384e3b31efbf20df150403
https://github.com/MarkUsProject/Markus/commit/4d694ea7a9c4abc59a384e3b31efbf20df150403
Author: Nelle Varoquaux <nelle.varoquaux@gmail.com>
Date: 2011-04-30 (Sat, 30 Apr 2011)
Changed paths:
M test/unit/admin_test.rb
M test/unit/annotation_category_test.rb
M test/unit/annotation_test.rb
M test/unit/annotation_text_test.rb
M test/unit/assignment_file_test.rb
M test/unit/extra_mark_test.rb
M test/unit/flexible_criterion_test.rb
M test/unit/grace_period_deduction_test.rb
M test/unit/grace_period_submission_rule_test.rb
M test/unit/grade_entry_form_test.rb
M test/unit/grade_test.rb
M test/unit/group_test.rb
M test/unit/grouping_test.rb
M test/unit/image_annotation_test.rb
M test/unit/mark_test.rb
M test/unit/markus_logger_test.rb
M test/unit/membership_test.rb
M test/unit/no_late_submission_rule_test.rb
M test/unit/note_test.rb
M test/unit/penalty_decay_period_submission_rule_test.rb
M test/unit/penalty_period_submission_rule_test.rb
M test/unit/period_test.rb
M test/unit/result_test.rb
M test/unit/rubric_criteria_test.rb
M test/unit/section_due_date_test.rb
M test/unit/section_test.rb
M test/unit/student_membership_test.rb
M test/unit/student_test.rb
M test/unit/submission_collector_test.rb
M test/unit/submission_file_test.rb
M test/unit/submission_rule_test.rb
M test/unit/submission_test.rb
M test/unit/ta_membership_test.rb
M test/unit/ta_test.rb
M test/unit/test_file_test.rb
M test/unit/test_result_test.rb
M test/unit/text_annotation_test.rb
M test/unit/token_test.rb
M test/unit/user_test.rb
Log Message:
-----------
Fixed require's path for unit tests
Commit: 4bd7fe3de31a640ddd498f34f6d1225c3dfaafcd
https://github.com/MarkUsProject/Markus/commit/4bd7fe3de31a640ddd498f34f6d1225c3dfaafcd
Author: Severin Gehwolf <jerboaa@gmail.com>
Date: 2011-04-30 (Sat, 30 Apr 2011)
Changed paths:
M test/unit/admin_test.rb
M test/unit/annotation_category_test.rb
M test/unit/annotation_test.rb
M test/unit/annotation_text_test.rb
M test/unit/assignment_file_test.rb
M test/unit/extra_mark_test.rb
M test/unit/flexible_criterion_test.rb
M test/unit/grace_period_deduction_test.rb
M test/unit/grace_period_submission_rule_test.rb
M test/unit/grade_entry_form_test.rb
M test/unit/grade_test.rb
M test/unit/group_test.rb
M test/unit/grouping_test.rb
M test/unit/image_annotation_test.rb
M test/unit/mark_test.rb
M test/unit/markus_logger_test.rb
M test/unit/membership_test.rb
M test/unit/no_late_submission_rule_test.rb
M test/unit/note_test.rb
M test/unit/penalty_decay_period_submission_rule_test.rb
M test/unit/penalty_period_submission_rule_test.rb
M test/unit/period_test.rb
M test/unit/result_test.rb
M test/unit/rubric_criteria_test.rb
M test/unit/section_due_date_test.rb
M test/unit/section_test.rb
M test/unit/student_membership_test.rb
M test/unit/student_test.rb
M test/unit/submission_collector_test.rb
M test/unit/submission_file_test.rb
M test/unit/submission_rule_test.rb
M test/unit/submission_test.rb
M test/unit/ta_membership_test.rb
M test/unit/ta_test.rb
M test/unit/test_file_test.rb
M test/unit/test_result_test.rb
M test/unit/text_annotation_test.rb
M test/unit/token_test.rb
M test/unit/user_test.rb
Log Message:
-----------
Merge pull request #328 from NelleV/path.
Fixed require's path for unit tests
Commit: a2639020ba603e64cc154b9db8914f230fb500b6
https://github.com/MarkUsProject/Markus/commit/a2639020ba603e64cc154b9db8914f230fb500b6
Author: Vivien Suen <viviensuen@Vivien-Suens-MacBook-Pro.local>
Date: 2011-05-01 (Sun, 01 May 2011)
Changed paths:
M app/controllers/assignments_controller.rb
M app/controllers/results_controller.rb
M app/models/assignment.rb
M app/models/submission.rb
M app/views/results/common/_rubric_criterion.html.erb
M app/views/results/marker/_marker_panes.html.erb
M app/views/results/marker/_marker_rubric_criterion_li.html.erb
M app/views/results/marker/_marker_summary.html.erb
M app/views/results/student/_student_panes.html.erb
M app/views/results/student/_student_rubric_criterion_li.html.erb
M app/views/results/student/_student_summary.html.erb
M app/views/submissions/submissions_table_row/_table_row.html.erb
M config/locales/en.yml
M config/locales/fr.yml
M public/javascripts/application.js
Log Message:
-----------
Implemented remark summaries: mark summaries now show old marks and the new \
remarked marks
Commit: e88ee7a9a2c86300f67cfa1e2e765b977e3c15ba
https://github.com/MarkUsProject/Markus/commit/e88ee7a9a2c86300f67cfa1e2e765b977e3c15ba
Author: Benjamin Vialle <benjaminvialle@gmail.com>
Date: 2011-05-02 (Mon, 02 May 2011)
Changed paths:
M test/unit/admin_test.rb
M test/unit/annotation_category_test.rb
M test/unit/annotation_test.rb
M test/unit/annotation_text_test.rb
M test/unit/assignment_file_test.rb
M test/unit/extra_mark_test.rb
M test/unit/flexible_criterion_test.rb
M test/unit/grace_period_deduction_test.rb
M test/unit/grace_period_submission_rule_test.rb
M test/unit/grade_entry_form_test.rb
M test/unit/grade_test.rb
M test/unit/group_test.rb
M test/unit/grouping_test.rb
M test/unit/image_annotation_test.rb
M test/unit/mark_test.rb
M test/unit/markus_logger_test.rb
M test/unit/membership_test.rb
M test/unit/no_late_submission_rule_test.rb
M test/unit/note_test.rb
M test/unit/penalty_decay_period_submission_rule_test.rb
M test/unit/penalty_period_submission_rule_test.rb
M test/unit/period_test.rb
M test/unit/result_test.rb
M test/unit/rubric_criteria_test.rb
M test/unit/section_due_date_test.rb
M test/unit/section_test.rb
M test/unit/student_membership_test.rb
M test/unit/student_test.rb
M test/unit/submission_collector_test.rb
M test/unit/submission_file_test.rb
M test/unit/submission_rule_test.rb
M test/unit/submission_test.rb
M test/unit/ta_membership_test.rb
M test/unit/ta_test.rb
M test/unit/test_file_test.rb
M test/unit/test_result_test.rb
M test/unit/text_annotation_test.rb
M test/unit/token_test.rb
M test/unit/user_test.rb
Log Message:
-----------
Merge branch 'master' of github.com:MarkUsProject/Markus into rails_3_migration
Commit: c37df7a32e715a3e5d9709ccba67cfac394ac063
https://github.com/MarkUsProject/Markus/commit/c37df7a32e715a3e5d9709ccba67cfac394ac063
Author: Benjamin Vialle <benjaminvialle@gmail.com>
Date: 2011-05-02 (Mon, 02 May 2011)
Changed paths:
M config/locales/en.yml
M config/locales/fr.yml
Log Message:
-----------
Added missing French Translations
Commit: 4109c52659a9e2ab169b6b4932ee136937dc7a60
https://github.com/MarkUsProject/Markus/commit/4109c52659a9e2ab169b6b4932ee136937dc7a60
Author: Benjamin Vialle <benjaminvialle@gmail.com>
Date: 2011-05-02 (Mon, 02 May 2011)
Changed paths:
M config/locales/fr.yml
Log Message:
-----------
Fixed french translation
Commit: 5d03cf50edc3994a70f394f248c2c5a460fe1aa4
https://github.com/MarkUsProject/Markus/commit/5d03cf50edc3994a70f394f248c2c5a460fe1aa4
Author: Vivien Suen <viviensuen@Vivien-Suens-MacBook-Pro.local>
Date: 2011-05-02 (Mon, 02 May 2011)
Changed paths:
M app/controllers/assignments_controller.rb
M app/controllers/results_controller.rb
M app/models/assignment.rb
M app/models/submission.rb
A app/views/results/common/_old_marks_view_functions.html.erb
M app/views/results/common/_rubric_criterion.html.erb
M app/views/results/edit.html.erb
M app/views/results/marker/_marker_panes.html.erb
M app/views/results/marker/_marker_rubric_criterion_li.html.erb
M app/views/results/marker/_marker_summary.html.erb
M app/views/results/student/_student_panes.html.erb
M app/views/results/student/_student_rubric_criterion_li.html.erb
M app/views/results/student/_student_summary.html.erb
M app/views/results/view_marks.html.erb
M config/locales/en.yml
M config/locales/fr.yml
M public/javascripts/application.js
M public/stylesheets/grader.css
M test/unit/submission_test.rb
Log Message:
-----------
Remark implementation complete
Commit: e14505586bf0cebd4e100898cf36ea3178bc04bf
https://github.com/MarkUsProject/Markus/commit/e14505586bf0cebd4e100898cf36ea3178bc04bf
Author: Benjamin Vialle <benjaminvialle@gmail.com>
Date: 2011-05-03 (Tue, 03 May 2011)
Changed paths:
M config/locales/en.yml
M config/locales/fr.yml
Log Message:
-----------
Merge branch 'master' of github.com:MarkUsProject/Markus into rails_3_migration
Commit: 40f4c4f57439bb10ef3a0999c29d98faf57cb9f6
https://github.com/MarkUsProject/Markus/commit/40f4c4f57439bb10ef3a0999c29d98faf57cb9f6
Author: Benjamin Vialle <benjaminvialle@gmail.com>
Date: 2011-05-04 (Wed, 04 May 2011)
Changed paths:
M app/models/annotation_text.rb
M test/unit/annotation_text_test.rb
M test/unit/token_test.rb
Log Message:
-----------
Prepare context for tests.
Commit: 6b58b7d723e84808bb7ccf34b1564ec107069232
https://github.com/MarkUsProject/Markus/commit/6b58b7d723e84808bb7ccf34b1564ec107069232
Author: Benjamin Vialle <benjaminvialle@gmail.com>
Date: 2011-05-04 (Wed, 04 May 2011)
Changed paths:
M app/models/annotation_category.rb
M test/test_helper.rb
M test/unit/annotation_category_test.rb
Log Message:
-----------
Removed fixtures from AnnotationCategory. Closes #242
Commit: 1f995919ad7082e48ccbc0e59c8b428fc7428668
https://github.com/MarkUsProject/Markus/commit/1f995919ad7082e48ccbc0e59c8b428fc7428668
Author: Benjamin Vialle <benjaminvialle@gmail.com>
Date: 2011-05-04 (Wed, 04 May 2011)
Changed paths:
M test/unit/membership_test.rb
Log Message:
-----------
Removed fixtures from memberships and added contexts and blueprints
Closes #254
Commit: 9a7d01aee8a444d835081b50fcf84c97aa5f42f6
https://github.com/MarkUsProject/Markus/commit/9a7d01aee8a444d835081b50fcf84c97aa5f42f6
Author: Severin Gehwolf <Severin.Gehwolf@utoronto.ca>
Date: 2011-05-04 (Wed, 04 May 2011)
Changed paths:
M test/unit/annotation_category_test.rb
Log Message:
-----------
Fix failing annotation category test. Closes #334.
I think it was failing since should calls where in no context
block.
Commit: d151b00f398c5c999a32bf020c2a0e36a56e4889
https://github.com/MarkUsProject/Markus/commit/d151b00f398c5c999a32bf020c2a0e36a56e4889
Author: Benjamin Vialle <benjaminvialle@gmail.com>
Date: 2011-05-06 (Fri, 06 May 2011)
Changed paths:
M app/models/annotation_category.rb
M app/models/annotation_text.rb
M config/locales/en.yml
M config/locales/fr.yml
M test/test_helper.rb
M test/unit/annotation_category_test.rb
M test/unit/annotation_text_test.rb
M test/unit/membership_test.rb
M test/unit/token_test.rb
Log Message:
-----------
Merge branch 'master' of github.com:MarkUsProject/Markus into rails_3_migration
Commit: b8452a48cc9e03bebe9ab40d30c6f6ea16147031
https://github.com/MarkUsProject/Markus/commit/b8452a48cc9e03bebe9ab40d30c6f6ea16147031
Author: Benjamin Vialle <benjaminvialle@gmail.com>
Date: 2011-05-06 (Fri, 06 May 2011)
Log Message:
-----------
Merge branch 'rails_3_migration' of github.com:benjaminvialle/Markus into \
rails_3_migration
Commit: 99fb58c239c189e9d29f61de86728b30bd2ebdc7
https://github.com/MarkUsProject/Markus/commit/99fb58c239c189e9d29f61de86728b30bd2ebdc7
Author: Benjamin Vialle <benjaminvialle@gmail.com>
Date: 2011-05-06 (Fri, 06 May 2011)
Changed paths:
M test/unit/annotation_category_test.rb
Log Message:
-----------
Merge pull request #335 from jerboaa/fix_annotation_category_test
Fix failing annotation category test. Closes #334.
Commit: 6c11a851052a561f489814393e9770262d392b28
https://github.com/MarkUsProject/Markus/commit/6c11a851052a561f489814393e9770262d392b28
Author: Benjamin Vialle <benjaminvialle@gmail.com>
Date: 2011-05-06 (Fri, 06 May 2011)
Changed paths:
M test/unit/annotation_category_test.rb
Log Message:
-----------
Merge branch 'master' of github.com:MarkUsProject/Markus into rails_3_migration
Commit: e14091a8999576bd26aac8c09f27f7041cce0afb
https://github.com/MarkUsProject/Markus/commit/e14091a8999576bd26aac8c09f27f7041cce0afb
Author: Benjamin Vialle <benjaminvialle@gmail.com>
Date: 2011-05-06 (Fri, 06 May 2011)
Changed paths:
M test/test_helper.rb
Log Message:
-----------
Disable data_preloader
Commit: 2af5ddf29f82f549ef8c3a781f3cea9e16d63b44
https://github.com/MarkUsProject/Markus/commit/2af5ddf29f82f549ef8c3a781f3cea9e16d63b44
Author: Benjamin Vialle <benjaminvialle@gmail.com>
Date: 2011-05-06 (Fri, 06 May 2011)
Changed paths:
M config/boot.rb
M public/javascripts/rails.js
Log Message:
-----------
Ran rails:update
Commit: 2f2339186d710a3b3c12878ed001f0f724404daa
https://github.com/MarkUsProject/Markus/commit/2f2339186d710a3b3c12878ed001f0f724404daa
Author: Benjamin Vialle <benjaminvialle@gmail.com>
Date: 2011-05-08 (Sun, 08 May 2011)
Changed paths:
M app/models/assignment.rb
M app/models/assignment_file.rb
M app/models/grade_entry_form.rb
M app/models/mark.rb
M app/models/student_membership.rb
M app/models/ta_membership.rb
M app/models/token.rb
Log Message:
-----------
Use Rails3 callback definition
Commit: fc7d184eba1578938295d9650b121f935d42845f
https://github.com/MarkUsProject/Markus/commit/fc7d184eba1578938295d9650b121f935d42845f
Author: Benjamin Vialle <benjaminvialle@gmail.com>
Date: 2011-05-08 (Sun, 08 May 2011)
Changed paths:
M app/models/annotation_category.rb
M app/models/annotation_text.rb
M test/test_helper.rb
M test/unit/annotation_category_test.rb
M test/unit/annotation_text_test.rb
M test/unit/membership_test.rb
M test/unit/token_test.rb
Log Message:
-----------
Merge branch 'master' of github.com:benjaminvialle/Markus into rails_3_migration
Commit: 47461703678ae974214868a0bdd21c468c296381
https://github.com/MarkUsProject/Markus/commit/47461703678ae974214868a0bdd21c468c296381
Author: Benjamin Vialle <benjaminvialle@gmail.com>
Date: 2011-05-08 (Sun, 08 May 2011)
Changed paths:
M config/boot.rb
M public/javascripts/rails.js
Log Message:
-----------
Merge branch 'rails_3_migration' of github.com:benjaminvialle/Markus into \
rails_3_migration
Commit: 677e5bfcf40584159beeaa780cf587a652d61e94
https://github.com/MarkUsProject/Markus/commit/677e5bfcf40584159beeaa780cf587a652d61e94
Author: Benjamin Vialle <benjaminvialle@gmail.com>
Date: 2011-05-08 (Sun, 08 May 2011)
Changed paths:
M app/models/assignment.rb
M app/models/assignment_file.rb
M app/models/grade_entry_form.rb
M test/unit/assignment_test.rb
M test/unit/grade_entry_form_test.rb
Log Message:
-----------
Added some tests and validators for future migration to Rails3
Commit: f67dfab7cba20f3084290ae1e24eb83664d0d334
https://github.com/MarkUsProject/Markus/commit/f67dfab7cba20f3084290ae1e24eb83664d0d334
Author: Benjamin Vialle <benjaminvialle@gmail.com>
Date: 2011-05-08 (Sun, 08 May 2011)
Changed paths:
M app/helpers/submissions_helper.rb
M app/models/assignment_file.rb
M app/models/mark.rb
M app/models/student_membership.rb
M app/models/ta_membership.rb
M app/models/token.rb
Log Message:
-----------
Changed before_validation callbacks to validate ones.
Moved two functions of sanitization into only one
Commit: 3661485ad25f3e2a96bab1a1a1833de3b2233655
https://github.com/MarkUsProject/Markus/commit/3661485ad25f3e2a96bab1a1a1833de3b2233655
Author: Benjamin Vialle <benjaminvialle@gmail.com>
Date: 2011-05-09 (Mon, 09 May 2011)
Changed paths:
M app/helpers/submissions_helper.rb
M app/models/assignment_file.rb
Log Message:
-----------
Rollback concerning file sanitization
Commit: b93426e7402dedfa26aa4e5e5a6c6b8f14ea4d70
https://github.com/MarkUsProject/Markus/commit/b93426e7402dedfa26aa4e5e5a6c6b8f14ea4d70
Author: Benjamin Vialle <benjaminvialle@gmail.com>
Date: 2011-05-09 (Mon, 09 May 2011)
Changed paths:
M app/models/assignment_file.rb
Log Message:
-----------
Remvode sanitization in Assignment_file, as we already check the format
with the callback
Commit: 6046179806cc008c7c3aaac62666cd4759cdebd7
https://github.com/MarkUsProject/Markus/commit/6046179806cc008c7c3aaac62666cd4759cdebd7
Author: Severin Gehwolf <Severin.Gehwolf@utoronto.ca>
Date: 2011-05-09 (Mon, 09 May 2011)
Changed paths:
A db/sample_submission_files/HelloWorld.java
A db/sample_submission_files/hello.py
M lib/tasks/results.rake
Log Message:
-----------
Fix load:results rake task. Closes #294.
The rake tasks for loading results into the database was broken due to
assignment_stat objects not being created. This fixes the issue. Also,
sample submission files being used are in db/sample_submission_files.
Commit: 4f3992c06724362cba3699d6b2a6e41f7e9e9894
https://github.com/MarkUsProject/Markus/commit/4f3992c06724362cba3699d6b2a6e41f7e9e9894
Author: Severin Gehwolf <Severin.Gehwolf@utoronto.ca>
Date: 2011-05-09 (Mon, 09 May 2011)
Changed paths:
M app/models/assignment.rb
M test/unit/assignment_test.rb
Log Message:
-----------
Closes #321. Flexible based detailed CSV report.
Fix detailed CSV report for assignments using flexible criteria
marking scheme. It was erroneously using rubric criteria based data.
Commit: 5f8ca664f714ceb07ec1c54b4796573d1afd3d4a
https://github.com/MarkUsProject/Markus/commit/5f8ca664f714ceb07ec1c54b4796573d1afd3d4a
Author: Severin Gehwolf <Severin.Gehwolf@utoronto.ca>
Date: 2011-05-09 (Mon, 09 May 2011)
Changed paths:
M app/controllers/results_controller.rb
M app/views/results/marker/_update_mark.rjs
M test/functional/results_controller_test.rb
Log Message:
-----------
Closes #156. Extra marks left total mark unchanged
When adding/removing extra marks in the "Summary" pane of the grader
view, the total mark was not updated. We missed calls to
result.update_total_mark. Regression tests have been added to account
for this case.
Commit: 6381d89aa206d5d347d0e88cec933b94a2a7a5a6
https://github.com/MarkUsProject/Markus/commit/6381d89aa206d5d347d0e88cec933b94a2a7a5a6
Author: Benjamin Vialle <benjaminvialle@gmail.com>
Date: 2011-05-09 (Mon, 09 May 2011)
Changed paths:
A db/sample_submission_files/HelloWorld.java
A db/sample_submission_files/hello.py
M lib/tasks/results.rake
Log Message:
-----------
Merge pull request #343 from jerboaa/results_rake
Fix load:results rake task. Closes #294.
Commit: 0581d93948aed261ba0737a311b3ef31e9dc3f44
https://github.com/MarkUsProject/Markus/commit/0581d93948aed261ba0737a311b3ef31e9dc3f44
Author: Benjamin Vialle <benjaminvialle@gmail.com>
Date: 2011-05-09 (Mon, 09 May 2011)
Changed paths:
M app/models/assignment.rb
M test/unit/assignment_test.rb
Log Message:
-----------
Merge pull request #337 from jerboaa/flexible_cvs_export
Closes #321. Flexible based detailed CSV report.
Commit: 5d941b00e332836eccd0501c72ba50581054008d
https://github.com/MarkUsProject/Markus/commit/5d941b00e332836eccd0501c72ba50581054008d
Author: Benjamin Vialle <benjaminvialle@gmail.com>
Date: 2011-05-09 (Mon, 09 May 2011)
Changed paths:
M app/controllers/results_controller.rb
M app/views/results/marker/_update_mark.rjs
M test/functional/results_controller_test.rb
Log Message:
-----------
Merge pull request #336 from jerboaa/extra_mark_fix
Closes #156. Extra marks left total mark unchanged
Commit: 6b29edca4d2507ce48b066eea5e318784b3bcab0
https://github.com/MarkUsProject/Markus/commit/6b29edca4d2507ce48b066eea5e318784b3bcab0
Author: Benjamin Vialle <benjaminvialle@gmail.com>
Date: 2011-05-10 (Tue, 10 May 2011)
Changed paths:
M app/controllers/results_controller.rb
M app/models/assignment.rb
M app/models/assignment_file.rb
M app/models/grade_entry_form.rb
M app/models/mark.rb
M app/models/student_membership.rb
M app/models/ta_membership.rb
M app/models/token.rb
M app/views/results/marker/_update_mark.rjs
A db/sample_submission_files/HelloWorld.java
A db/sample_submission_files/hello.py
M lib/tasks/results.rake
M test/functional/results_controller_test.rb
M test/unit/assignment_test.rb
M test/unit/grade_entry_form_test.rb
Log Message:
-----------
Merge branch 'master' of github.com:benjaminvialle/Markus into rails_3_migration
Commit: 5612a667d45d79dd3a62d7aced6002bdc3983cfc
https://github.com/MarkUsProject/Markus/commit/5612a667d45d79dd3a62d7aced6002bdc3983cfc
Author: Benjamin Vialle <benjaminvialle@gmail.com>
Date: 2011-05-10 (Tue, 10 May 2011)
Changed paths:
M app/controllers/assignments_controller.rb
M app/controllers/results_controller.rb
M app/models/assignment.rb
M app/models/submission.rb
A app/views/results/common/_old_marks_view_functions.html.erb
M app/views/results/common/_rubric_criterion.html.erb
M app/views/results/edit.html.erb
M app/views/results/marker/_marker_panes.html.erb
M app/views/results/marker/_marker_rubric_criterion_li.html.erb
M app/views/results/marker/_marker_summary.html.erb
M app/views/results/student/_student_panes.html.erb
M app/views/results/student/_student_rubric_criterion_li.html.erb
M app/views/results/student/_student_summary.html.erb
M app/views/results/view_marks.html.erb
M app/views/submissions/submissions_table_row/_table_row.html.erb
M config/locales/en.yml
M config/locales/fr.yml
M public/stylesheets/grader.css
M test/unit/submission_test.rb
Log Message:
-----------
Merge pull request #346 from viviensuen/RemarkSummaries
Remark Implementation Complete
Commit: fd6551b6f0a7b93e55b2207c451aad7aa80aeb9a
https://github.com/MarkUsProject/Markus/commit/fd6551b6f0a7b93e55b2207c451aad7aa80aeb9a
Author: Danesh Dadachanji <g9dadach@cdf.toronto.edu>
Date: 2011-05-10 (Tue, 10 May 2011)
Changed paths:
M app/controllers/main_controller.rb
M config/routes.rb
Log Message:
-----------
Random commit
Commit: 16015d95851b7d81d63084299766c99aded1bc5f
https://github.com/MarkUsProject/Markus/commit/16015d95851b7d81d63084299766c99aded1bc5f
Author: Danesh Dadachanji <g9dadach@cdf.toronto.edu>
Date: 2011-05-10 (Tue, 10 May 2011)
Changed paths:
A app/controllers/api/users_controller.rb
A public/409.html
A public/409.xml
Log Message:
-----------
Added a User create method using HTTP POST request.
Commit: b946cab5f59caaef2f950624032de31cd2ed6127
https://github.com/MarkUsProject/Markus/commit/b946cab5f59caaef2f950624032de31cd2ed6127
Author: Danesh Dadachanji <g9dadach@cdf.toronto.edu>
Date: 2011-05-10 (Tue, 10 May 2011)
Changed paths:
M config/routes.rb
Log Message:
-----------
Forgot to add routes config.
Commit: 953b5f816dfbf46b7ab28a35775fd07942ede677
https://github.com/MarkUsProject/Markus/commit/953b5f816dfbf46b7ab28a35775fd07942ede677
Author: Danesh Dadachanji <g9dadach@cdf.toronto.edu>
Date: 2011-05-10 (Tue, 10 May 2011)
Changed paths:
M app/controllers/api/users_controller.rb
M public/409.html
Log Message:
-----------
Modified 409 to show relavent message, also changed the create function to throw an \
error if an unknown user class is made.
Commit: 9ccefc5e72775dc642c6028d981add0b65d33438
https://github.com/MarkUsProject/Markus/commit/9ccefc5e72775dc642c6028d981add0b65d33438
Author: Danesh Dadachanji <g9dadach@cdf.toronto.edu>
Date: 2011-05-10 (Tue, 10 May 2011)
Changed paths:
M app/controllers/api/users_controller.rb
Log Message:
-----------
Finalized show and create methods.
Commit: 19af7a298802a3a036905c5ef9964b0aa1b2c72f
https://github.com/MarkUsProject/Markus/commit/19af7a298802a3a036905c5ef9964b0aa1b2c72f
Author: Danesh Dadachanji <g9dadach@cdf.toronto.edu>
Date: 2011-05-10 (Tue, 10 May 2011)
Changed paths:
M app/controllers/api/users_controller.rb
Log Message:
-----------
Created a dummy update method that renders a 404 and returns
Commit: ff50a0fa6fddb2e7c6e9ba41308e5a444b51b0d6
https://github.com/MarkUsProject/Markus/commit/ff50a0fa6fddb2e7c6e9ba41308e5a444b51b0d6
Author: Danesh Dadachanji <g9dadach@cdf.toronto.edu>
Date: 2011-05-10 (Tue, 10 May 2011)
Changed paths:
M app/controllers/api/users_controller.rb
Log Message:
-----------
Implemented update, modified create to use user_type instead of user_class.
Commit: ae3a00623ade8e15d4091bad5058b8e52b61a217
https://github.com/MarkUsProject/Markus/commit/ae3a00623ade8e15d4091bad5058b8e52b61a217
Author: Danesh Dadachanji <g9dadach@cdf.toronto.edu>
Date: 2011-05-10 (Tue, 10 May 2011)
Changed paths:
M app/controllers/api/users_controller.rb
Log Message:
-----------
Changed if cases a bit.
Commit: 068a78e9810505335db37bd50d8e32c932c5a450
https://github.com/MarkUsProject/Markus/commit/068a78e9810505335db37bd50d8e32c932c5a450
Author: Danesh Dadachanji <g9dadach@cdf.toronto.edu>
Date: 2011-05-10 (Tue, 10 May 2011)
Changed paths:
M app/controllers/api/users_controller.rb
Log Message:
-----------
Update complete.
Commit: 8032ae0f9772330f9995b5ad446c8376120b6564
https://github.com/MarkUsProject/Markus/commit/8032ae0f9772330f9995b5ad446c8376120b6564
Author: Danesh Dadachanji <g9dadach@cdf.toronto.edu>
Date: 2011-05-10 (Tue, 10 May 2011)
Changed paths:
M app/controllers/api/users_controller.rb
Log Message:
-----------
adding updates to user_controller
Commit: 74d5456c1aa568e43b78b7afff667c954e98e1a3
https://github.com/MarkUsProject/Markus/commit/74d5456c1aa568e43b78b7afff667c954e98e1a3
Author: Danesh Dadachanji <g9dadach@cdf.toronto.edu>
Date: 2011-05-10 (Tue, 10 May 2011)
Changed paths:
A test/functional/api/users_controller_test.rb
Log Message:
-----------
Adding API test file.
Commit: 6e4881d980c1a555fe8b318f98dfce1925a84637
https://github.com/MarkUsProject/Markus/commit/6e4881d980c1a555fe8b318f98dfce1925a84637
Author: Danesh Dadachanji <g9dadach@cdf.toronto.edu>
Date: 2011-05-10 (Tue, 10 May 2011)
Changed paths:
M app/controllers/api/users_controller.rb
M test/functional/api/users_controller_test.rb
Log Message:
-----------
Commiting Users API tester
Commit: e6db631673a71a4a415d11703e0c7949d6f08c79
https://github.com/MarkUsProject/Markus/commit/e6db631673a71a4a415d11703e0c7949d6f08c79
Author: Danesh Dadachanji <g9dadach@cdf.toronto.edu>
Date: 2011-05-10 (Tue, 10 May 2011)
Changed paths:
M app/controllers/api/users_controller.rb
M config/locales/en.yml
M config/locales/fr.yml
M test/functional/api/users_controller_test.rb
Log Message:
-----------
Added some tests, implemented internationalization
Commit: d841d5c17b0bafb295ec02c39b154bd080950b01
https://github.com/MarkUsProject/Markus/commit/d841d5c17b0bafb295ec02c39b154bd080950b01
Author: Danesh Dadachanji <g9dadach@cdf.toronto.edu>
Date: 2011-05-10 (Tue, 10 May 2011)
Changed paths:
M test/functional/api/users_controller_test.rb
Log Message:
-----------
Facing the 'repo_name is null' bug still
Commit: a43d8cc7acb8e4d1674d38a638f3ddaff52ddd3c
https://github.com/MarkUsProject/Markus/commit/a43d8cc7acb8e4d1674d38a638f3ddaff52ddd3c
Author: Danesh Dadachanji <g9dadach@cdf.toronto.edu>
Date: 2011-05-10 (Tue, 10 May 2011)
Changed paths:
M app/controllers/api/users_controller.rb
M test/functional/api/users_controller_test.rb
Log Message:
-----------
Removed fixtures, added nested contexts and finalized tests for Users API.
Commit: 2550b279d081fa09575283e9a885b16c2e79f014
https://github.com/MarkUsProject/Markus/commit/2550b279d081fa09575283e9a885b16c2e79f014
Author: Danesh Dadachanji <g9dadach@cdf.toronto.edu>
Date: 2011-05-10 (Tue, 10 May 2011)
Changed paths:
R public/409.html
Log Message:
-----------
Deleted 409.html
Commit: 2788f4936854d6373b72edf681739ac59f6a184b
https://github.com/MarkUsProject/Markus/commit/2788f4936854d6373b72edf681739ac59f6a184b
Author: Danesh Dadachanji <g9dadach@cdf.toronto.edu>
Date: 2011-05-10 (Tue, 10 May 2011)
Changed paths:
M app/controllers/api/users_controller.rb
Log Message:
-----------
Changed 'NOTE's to 'FIXME/TODO's
Commit: e87daa82cd155c47bf9d2a3b563bfaa30e0a3ee3
https://github.com/MarkUsProject/Markus/commit/e87daa82cd155c47bf9d2a3b563bfaa30e0a3ee3
Author: Danesh Dadachanji <g9dadach@cdf.toronto.edu>
Date: 2011-05-10 (Tue, 10 May 2011)
Changed paths:
M test/functional/api/users_controller_test.rb
Log Message:
-----------
Refactored tests into a more understandable order. Added a DELETE test.
Commit: ed512fc1735624e7c3545626c5143fcfcdc21bf1
https://github.com/MarkUsProject/Markus/commit/ed512fc1735624e7c3545626c5143fcfcdc21bf1
Author: Danesh Dadachanji <g9dadach@cdf.toronto.edu>
Date: 2011-05-10 (Tue, 10 May 2011)
Changed paths:
M test/functional/api/users_controller_test.rb
Log Message:
-----------
Refactored unauthenticated tests into seperate contexts
Commit: 05ed9904fa3ded3f5e50632b33c185af393bf48f
https://github.com/MarkUsProject/Markus/commit/05ed9904fa3ded3f5e50632b33c185af393bf48f
Author: Danesh Dadachanji <g9dadach@cdf.toronto.edu>
Date: 2011-05-10 (Tue, 10 May 2011)
Changed paths:
M test/functional/api/users_controller_test.rb
Log Message:
-----------
Refactored some create tests into seperate contexts as well
Commit: bf628e89b2173f1ff1eee64bd35b4628d7219982
https://github.com/MarkUsProject/Markus/commit/bf628e89b2173f1ff1eee64bd35b4628d7219982
Author: Danesh Dadachanji <g9dadach@cdf.toronto.edu>
Date: 2011-05-10 (Tue, 10 May 2011)
Changed paths:
M app/controllers/api/users_controller.rb
M test/functional/api/users_controller_test.rb
Log Message:
-----------
Removed useless select paramater in User.find. Changed require file paths to use \
File.join instead. Refactored clear_fixtures into authenticated context.
Commit: d135f6998dea491e45a0fb95abaa476f68bb9b9d
https://github.com/MarkUsProject/Markus/commit/d135f6998dea491e45a0fb95abaa476f68bb9b9d
Author: Severin Gehwolf <Severin.Gehwolf@utoronto.ca>
Date: 2011-05-11 (Wed, 11 May 2011)
Changed paths:
M app/helpers/submissions_helper.rb
M app/models/submission_file.rb
M app/views/submissions/_file_manager_boot.js.erb
M config/locales/en.yml
M public/javascripts/file_manager.js
A test/unit/submission_helper_test.rb
Log Message:
-----------
Fix sanitation of submitted files. Closes #341.
Earlier, filenames such as "garbage-äß-.txt" were allowed, since we used
the \w character class on the call to gsub. However, this allows more
characters to be valid than we'd like to be. The reason for this is that
Ruby 1.8 when run in UTF-8 mode defines \w different from [0-9a-zA-Z].
This commit should fix this problem and tries to use the same regexp in
all places.
Commit: 61a0405d641e39b4a2b68f1c443c0f9b417590a2
https://github.com/MarkUsProject/Markus/commit/61a0405d641e39b4a2b68f1c443c0f9b417590a2
Author: Severin Gehwolf <Severin.Gehwolf@utoronto.ca>
Date: 2011-05-11 (Wed, 11 May 2011)
Changed paths:
M app/helpers/submissions_helper.rb
M app/models/assignment_file.rb
M app/models/submission_file.rb
M app/views/submissions/_file_manager_boot.js.erb
M config/locales/en.yml
M config/locales/fr.yml
M test/unit/submission_helper_test.rb
Log Message:
-----------
Fixed typo. Added more tests. Fix assignment file validation.
I had the word sanitization spelled wrong. Added two more testcases to
the sanitization test and changed assignment_file.rb's format_of
validation to account for similar things as we do for submission files.
Thanks to Benjamin for the French locales.
Commit: 2e4fb96f5ab30f15fc8fb8a8838233a47189846c
https://github.com/MarkUsProject/Markus/commit/2e4fb96f5ab30f15fc8fb8a8838233a47189846c
Author: Severin Gehwolf <Severin.Gehwolf@utoronto.ca>
Date: 2011-05-11 (Wed, 11 May 2011)
Changed paths:
M config/locales/fr.yml
Log Message:
-----------
Fixed french translation of assignment file format
Commit: 5fab11d92d08b9a11a742efcbba98cfd0a386c35
https://github.com/MarkUsProject/Markus/commit/5fab11d92d08b9a11a742efcbba98cfd0a386c35
Author: Danesh Dadachanji <g9dadach@cdf.toronto.edu>
Date: 2011-05-11 (Wed, 11 May 2011)
Changed paths:
M config/locales/fr.yml
Log Message:
-----------
Added user_type to fr.yml
Commit: 7589af395816b5607e99a07ef2fc540ff9ff6194
https://github.com/MarkUsProject/Markus/commit/7589af395816b5607e99a07ef2fc540ff9ff6194
Author: Benjamin Vialle <benjaminvialle@gmail.com>
Date: 2011-05-12 (Thu, 12 May 2011)
Changed paths:
M app/helpers/submissions_helper.rb
M app/models/assignment_file.rb
M app/models/submission_file.rb
M app/views/submissions/_file_manager_boot.js.erb
M config/locales/en.yml
M config/locales/fr.yml
M public/javascripts/file_manager.js
A test/unit/submission_helper_test.rb
Log Message:
-----------
Merge branch 'fix_filename_sanitation'
Commit: 8d80d7a229b30fbf931ed7cf895b9e342477c8ec
https://github.com/MarkUsProject/Markus/commit/8d80d7a229b30fbf931ed7cf895b9e342477c8ec
Author: Benjamin Vialle <benjaminvialle@gmail.com>
Date: 2011-05-15 (Sun, 15 May 2011)
Changed paths:
A app/controllers/api/users_controller.rb
M app/controllers/assignments_controller.rb
M app/controllers/main_controller.rb
M app/controllers/results_controller.rb
M app/helpers/submissions_helper.rb
M app/models/assignment.rb
M app/models/assignment_file.rb
M app/models/submission.rb
M app/models/submission_file.rb
A app/views/results/common/_old_marks_view_functions.html.erb
M app/views/results/common/_rubric_criterion.html.erb
M app/views/results/edit.html.erb
M app/views/results/marker/_marker_panes.html.erb
M app/views/results/marker/_marker_rubric_criterion_li.html.erb
M app/views/results/marker/_marker_summary.html.erb
M app/views/results/student/_student_panes.html.erb
M app/views/results/student/_student_rubric_criterion_li.html.erb
M app/views/results/student/_student_summary.html.erb
M app/views/results/view_marks.html.erb
M app/views/submissions/_file_manager_boot.js.erb
M app/views/submissions/submissions_table_row/_table_row.html.erb
M config/locales/en.yml
M config/locales/fr.yml
M config/routes.rb
A public/409.xml
M public/javascripts/file_manager.js
M public/stylesheets/grader.css
A test/functional/api/users_controller_test.rb
A test/unit/submission_helper_test.rb
M test/unit/submission_test.rb
Log Message:
-----------
Merge branch 'master' of github.com:MarkUsProject/Markus into rails_3_migration
Commit: 59f171e9dde765857972e41e028e8ddc233459a8
https://github.com/MarkUsProject/Markus/commit/59f171e9dde765857972e41e028e8ddc233459a8
Author: Severin Gehwolf <Severin.Gehwolf@utoronto.ca>
Date: 2011-05-15 (Sun, 15 May 2011)
Changed paths:
M app/views/results/common/_annotations.js.erb
M public/stylesheets/grader.css
M public/stylesheets/main.css
Log Message:
-----------
Fix a few styles and undefined id. Closes #324.
I needed to turn caching on in order to reproduce. Once turned on an
additional scroll bar was showing up in the grader view. More details of
this problem are described in the ticket. This commit fixes this issue.
Commit: 3cf97e21ce7f784d941b24bc348c9ca2c8bdccd9
https://github.com/MarkUsProject/Markus/commit/3cf97e21ce7f784d941b24bc348c9ca2c8bdccd9
Author: Severin Gehwolf <Severin.Gehwolf@utoronto.ca>
Date: 2011-05-15 (Sun, 15 May 2011)
Changed paths:
M app/controllers/submissions_controller.rb
M app/views/submissions/file_manager.html.erb
M test/functional/submissions_controller_test.rb
Log Message:
-----------
Closes #30. Cookie overflow error in file manager.
When attempting to upload a file with the same filename, which had
already been uploaded, MarkUs threw an Internal Server Error. This was
caused by using the flash (i.e. the cookie) as a vehicle to carry over
state from the update_files action to the file_manager view. Now we
aren't using redirect_to, thus saving a rather expensive redirect, and
just use render instead.
I've updated submission_controller_test.rb accordingly.
Commit: f17ff9d9f62fd4f895cd648b1d02bff28970e373
https://github.com/MarkUsProject/Markus/commit/f17ff9d9f62fd4f895cd648b1d02bff28970e373
Author: Benjamin Vialle <benjaminvialle@gmail.com>
Date: 2011-05-15 (Sun, 15 May 2011)
Changed paths:
M app/views/results/common/_annotations.js.erb
M public/stylesheets/grader.css
M public/stylesheets/main.css
Log Message:
-----------
Merge pull request #349 from jerboaa/issue_324_scrollbar
Fix a few styles and undefined id. Closes #324.
Commit: 509484ae5d387cf8e17b3f31bf05929ab4c1a8ea
https://github.com/MarkUsProject/Markus/commit/509484ae5d387cf8e17b3f31bf05929ab4c1a8ea
Author: Benjamin Vialle <benjaminvialle@gmail.com>
Date: 2011-05-15 (Sun, 15 May 2011)
Changed paths:
M app/controllers/submissions_controller.rb
M app/views/submissions/file_manager.html.erb
M test/functional/submissions_controller_test.rb
Log Message:
-----------
Merge pull request #350 from jerboaa/duplicate_upload_cookie_error
Closes #30. Cookie overflow error in file manager.
Commit: 019085bed17ffec93360ade3817c635557f75a3c
https://github.com/MarkUsProject/Markus/commit/019085bed17ffec93360ade3817c635557f75a3c
Author: Severin Gehwolf <Severin.Gehwolf@utoronto.ca>
Date: 2011-05-15 (Sun, 15 May 2011)
Changed paths:
M app/views/annotation_categories/index.html.erb
M app/views/assignments/student_interface.html.erb
M app/views/flexible_criteria/index.html.erb
M app/views/groups/student_interface.html.erb
M app/views/main/index.html.erb
M app/views/results/edit.html.erb
M app/views/results/view_marks.html.erb
M app/views/rubrics/index.html.erb
Log Message:
-----------
Remove javascript :cache statements.
On Github issue 192 we discussed a few options. For now disable caching
and revisit this for 1.0.
Commit: 4765233320a56d7dcac07cdba4b908ff7aff2fc3
https://github.com/MarkUsProject/Markus/commit/4765233320a56d7dcac07cdba4b908ff7aff2fc3
Author: Severin Gehwolf <Severin.Gehwolf@utoronto.ca>
Date: 2011-05-15 (Sun, 15 May 2011)
Changed paths:
M config/locales/en.yml
M config/locales/fr.yml
Log Message:
-----------
Fix copyright year range.
Commit: 94ec9fa95d1b87d1309a22c14c8b6113310181e7
https://github.com/MarkUsProject/Markus/commit/94ec9fa95d1b87d1309a22c14c8b6113310181e7
Author: Benjamin Vialle <benjaminvialle@gmail.com>
Date: 2011-05-20 (Fri, 20 May 2011)
Changed paths:
M config/locales/en.yml
M config/locales/fr.yml
Log Message:
-----------
Merge pull request #352 from jerboaa/fix_year
Fix copyright year range.
Commit: 09ef617fcc2402d024856464b0c84fa0f5ff6cd3
https://github.com/MarkUsProject/Markus/commit/09ef617fcc2402d024856464b0c84fa0f5ff6cd3
Author: Benjamin Vialle <benjaminvialle@gmail.com>
Date: 2011-05-23 (Mon, 23 May 2011)
Changed paths:
M app/controllers/submissions_controller.rb
M app/views/results/common/_annotations.js.erb
M app/views/submissions/file_manager.html.erb
M config/locales/en.yml
M config/locales/fr.yml
M public/stylesheets/grader.css
M public/stylesheets/main.css
M test/functional/submissions_controller_test.rb
Log Message:
-----------
Merge branch 'master' of github.com:MarkUsProject/Markus into rails_3_migration
Commit: ee274519ae73a45a20deb6163dd5b8cbc5761406
https://github.com/MarkUsProject/Markus/commit/ee274519ae73a45a20deb6163dd5b8cbc5761406
Author: Benjamin Vialle <benjaminvialle@gmail.com>
Date: 2011-05-23 (Mon, 23 May 2011)
Changed paths:
M app/views/annotation_categories/index.html.erb
M app/views/assignments/student_interface.html.erb
M app/views/flexible_criteria/index.html.erb
M app/views/groups/student_interface.html.erb
M app/views/main/index.html.erb
M app/views/results/edit.html.erb
M app/views/results/view_marks.html.erb
M app/views/rubrics/index.html.erb
Log Message:
-----------
Merge pull request #351 from jerboaa/remove_javascript_cache
Remove javascript :cache statements.
Commit: a383483f8998ab927de540546fd3003d468a574e
https://github.com/MarkUsProject/Markus/commit/a383483f8998ab927de540546fd3003d468a574e
Author: Benjamin Vialle <benjaminvialle@gmail.com>
Date: 2011-05-23 (Mon, 23 May 2011)
Changed paths:
M app/views/annotation_categories/index.html.erb
M app/views/assignments/student_interface.html.erb
M app/views/flexible_criteria/index.html.erb
M app/views/groups/student_interface.html.erb
M app/views/main/index.html.erb
M app/views/results/edit.html.erb
M app/views/results/view_marks.html.erb
M app/views/rubrics/index.html.erb
Log Message:
-----------
Merge branch 'master' of github.com:MarkUsProject/Markus into rails_3_migration
Commit: bb8137b8aafe199743454dec0c0a0352b6882e08
https://github.com/MarkUsProject/Markus/commit/bb8137b8aafe199743454dec0c0a0352b6882e08
Author: Benjamin Vialle <benjaminvialle@gmail.com>
Date: 2011-05-24 (Tue, 24 May 2011)
Changed paths:
M Gemfile
M Gemfile.lock
Log Message:
-----------
Udpated Rake and downgraded Rails
Commit: bae468a17c5406249e7de53979668ef72c3772d5
https://github.com/MarkUsProject/Markus/commit/bae468a17c5406249e7de53979668ef72c3772d5
Author: Benjamin Vialle <benjaminvialle@gmail.com>
Date: 2011-05-24 (Tue, 24 May 2011)
Changed paths:
M Rakefile
Log Message:
-----------
Fix: Bug with new version of Rake
Commit: 5e1d167b54a11fb14e75dbbabbd45a9a99786b1a
https://github.com/MarkUsProject/Markus/commit/5e1d167b54a11fb14e75dbbabbd45a9a99786b1a
Author: Benjamin Vialle <benjaminvialle@gmail.com>
Date: 2011-05-24 (Tue, 24 May 2011)
Changed paths:
A test/files/README
A test/files/Shapes.java
A test/files/TestShapes.java
A test/files/classlist.csv
R test/fixtures/files/README
R test/fixtures/files/Shapes.java
R test/fixtures/files/TestShapes.java
R test/fixtures/files/classlist.csv
M test/functional/submissions_controller_test.rb
Log Message:
-----------
Moved test files to test/files instead of test/fixtures/files
Closes #354
Commit: 4fedaebb5421cbc6392fac4993b465ee5e7bb786
https://github.com/MarkUsProject/Markus/commit/4fedaebb5421cbc6392fac4993b465ee5e7bb786
Author: Benjamin Vialle <benjaminvialle@gmail.com>
Date: 2011-05-24 (Tue, 24 May 2011)
Changed paths:
M test/unit/result_test.rb
Log Message:
-----------
It seems we don't have extra_marks fixture
Commit: ba93797b999c4c9983ef63a3775745f60f48c177
https://github.com/MarkUsProject/Markus/commit/ba93797b999c4c9983ef63a3775745f60f48c177
Author: Benjamin Vialle <benjaminvialle@gmail.com>
Date: 2011-05-24 (Tue, 24 May 2011)
Changed paths:
M app/models/student_membership.rb
Log Message:
-----------
Fix: Deprecated warning about named_scope
Commit: 581bb9dbdddef8c71446aeb07dd86a72b1ec175c
https://github.com/MarkUsProject/Markus/commit/581bb9dbdddef8c71446aeb07dd86a72b1ec175c
Author: Danesh Dadachanji <g9dadach@cdf.toronto.edu>
Date: 2011-06-04 (Sat, 04 Jun 2011)
Changed paths:
M app/controllers/results_controller.rb
M app/views/results/common/_submission_selector.html.erb
M config/locales/en.yml
Log Message:
-----------
Added padding to the div to make it fit in its parent div.
Commit: e4fb90e49eb5c2d01b8405adf0b5c804397a5ee7
https://github.com/MarkUsProject/Markus/commit/e4fb90e49eb5c2d01b8405adf0b5c804397a5ee7
Author: Danesh Dadachanji <g9dadach@cdf.toronto.edu>
Date: 2011-06-04 (Sat, 04 Jun 2011)
Changed paths:
M config/locales/en.yml
M config/locales/fr.yml
Log Message:
-----------
Added French translation.
Commit: 6c7b9e9472c92d05f11347f9e5e45a00d479845f
https://github.com/MarkUsProject/Markus/commit/6c7b9e9472c92d05f11347f9e5e45a00d479845f
Author: Danesh Dadachanji <g9dadach@cdf.toronto.edu>
Date: 2011-06-04 (Sat, 04 Jun 2011)
Changed paths:
M app/controllers/results_controller.rb
A app/views/results/marker/update_criteria_message.rjs
Log Message:
-----------
Implemented it using .rjs file to render the view and handle what is displayed \
outside controller. Not complete yet though.
Commit: 10aa0acc3ad8e90b7dd693a199c0109940d7189a
https://github.com/MarkUsProject/Markus/commit/10aa0acc3ad8e90b7dd693a199c0109940d7189a
Author: Danesh Dadachanji <g9dadach@cdf.toronto.edu>
Date: 2011-06-04 (Sat, 04 Jun 2011)
Changed paths:
M app/controllers/results_controller.rb
R app/views/results/marker/update_criteria_message.rjs
Log Message:
-----------
After elections, rendering view but immediately hiding message. Need to fix that.
Commit: bd036f11b87bb5a6e891f77d68b0a7803cc0c3ff
https://github.com/MarkUsProject/Markus/commit/bd036f11b87bb5a6e891f77d68b0a7803cc0c3ff
Author: Danesh Dadachanji <g9dadach@cdf.toronto.edu>
Date: 2011-06-04 (Sat, 04 Jun 2011)
Changed paths:
M app/controllers/results_controller.rb
Log Message:
-----------
Added a function to swap the marking state to partial in show_criteria_error. Moved \
the call to render hide into the check for marking in the complete state.
Commit: df31a431a4e82f7ab4d4f1cba3761e0b959a1c8e
https://github.com/MarkUsProject/Markus/commit/df31a431a4e82f7ab4d4f1cba3761e0b959a1c8e
Author: Danesh Dadachanji <g9dadach@cdf.toronto.edu>
Date: 2011-06-04 (Sat, 04 Jun 2011)
Changed paths:
M app/controllers/results_controller.rb
M app/views/results/common/_submission_selector.html.erb
A app/views/results/marker/hide_criteria_error.rjs
A app/views/results/marker/show_criteria_error.rjs
M public/stylesheets/main.css
Log Message:
-----------
Moved CSS class for error from span tag to div tag. Reverted main.css to master \
copy as my changes are now useless.
Commit: 6ea7a516035035191cd2db2a0deaec0972fda0bc
https://github.com/MarkUsProject/Markus/commit/6ea7a516035035191cd2db2a0deaec0972fda0bc
Author: Danesh Dadachanji <g9dadach@cdf.toronto.edu>
Date: 2011-06-04 (Sat, 04 Jun 2011)
Changed paths:
M app/views/results/common/_submission_selector.html.erb
Log Message:
-----------
Included class for t().
Commit: f3a87bea4ccd631fde9cb61b782a443e3528d210
https://github.com/MarkUsProject/Markus/commit/f3a87bea4ccd631fde9cb61b782a443e3528d210
Author: Danesh Dadachanji <g9dadach@cdf.toronto.edu>
Date: 2011-06-04 (Sat, 04 Jun 2011)
Changed paths:
M app/controllers/results_controller.rb
M app/models/result.rb
R app/views/results/marker/show_criteria_error.rjs
M app/views/results/update_marking_state.rjs
Log Message:
-----------
Revamped update_marking_state to use validation in the result model, then showing \
an error depending on the result.save passing.
Commit: f9739e206390cf68a6418f29b92ceca0779b9b12
https://github.com/MarkUsProject/Markus/commit/f9739e206390cf68a6418f29b92ceca0779b9b12
Author: Danesh Dadachanji <g9dadach@cdf.toronto.edu>
Date: 2011-06-04 (Sat, 04 Jun 2011)
Changed paths:
A app/views/results/marker/show_result_error.rjs
Log Message:
-----------
Renamed file (originally show_criterion_error) as result.save could error because \
of other reasons
Commit: 7d8fad51957c6cabd11bbbcfb6c962b1198cda7c
https://github.com/MarkUsProject/Markus/commit/7d8fad51957c6cabd11bbbcfb6c962b1198cda7c
Author: Danesh Dadachanji <g9dadach@cdf.toronto.edu>
Date: 2011-06-04 (Sat, 04 Jun 2011)
Changed paths:
M app/controllers/results_controller.rb
M app/models/result.rb
R app/views/results/marker/hide_criteria_error.rjs
Log Message:
-----------
Fixed released checkbox bug through validate function in result model.
Deleting unneccessary rjs view
Commit: e0da744bfbb2cb966179b3a146648cdbeefe27a1
https://github.com/MarkUsProject/Markus/commit/e0da744bfbb2cb966179b3a146648cdbeefe27a1
Author: Danesh Dadachanji <g9dadach@cdf.toronto.edu>
Date: 2011-06-04 (Sat, 04 Jun 2011)
Changed paths:
M app/models/result.rb
M app/views/results/common/_submission_selector.html.erb
M app/views/results/marker/show_result_error.rjs
M config/locales/en.yml
M config/locales/fr.yml
Log Message:
-----------
Changed validate method into callback method that automatically gets called right \
before Result is saved. Also added internationalization to error message.
Commit: 42b0d3c1023f88f32fe83fa98bbb5893f60320db
https://github.com/MarkUsProject/Markus/commit/42b0d3c1023f88f32fe83fa98bbb5893f60320db
Author: Benjamin Vialle <benjaminvialle@gmail.com>
Date: 2011-06-06 (Mon, 06 Jun 2011)
Changed paths:
M app/controllers/results_controller.rb
M app/models/result.rb
M app/views/results/common/_submission_selector.html.erb
A app/views/results/marker/show_result_error.rjs
M app/views/results/update_marking_state.rjs
M config/locales/en.yml
M config/locales/fr.yml
M public/stylesheets/main.css
Log Message:
-----------
Merge branch 'master' of github.com:benjaminvialle/Markus into rails_3_migration
Commit: a10ec116ba8f96e222c8ef366c5fa596c26c9ebb
https://github.com/MarkUsProject/Markus/commit/a10ec116ba8f96e222c8ef366c5fa596c26c9ebb
Author: Benjamin Vialle <benjaminvialle@gmail.com>
Date: 2011-06-08 (Wed, 08 Jun 2011)
Changed paths:
M config/locales/fr.yml
Log Message:
-----------
Fix: French typo
Commit: bc996419b4876390385eb16aad04d75d2cb41683
https://github.com/MarkUsProject/Markus/commit/bc996419b4876390385eb16aad04d75d2cb41683
Author: Varoquaux <nelle.varoquaux@gmail.com>
Date: 2011-06-08 (Wed, 08 Jun 2011)
Changed paths:
M config/locales/fr.yml
Log Message:
-----------
Merge pull request #357 from benjaminvialle/typo
Fix: French typo
Commit: 9ccf699ac851c8d2ae18ad88b7ab5367203da818
https://github.com/MarkUsProject/Markus/commit/9ccf699ac851c8d2ae18ad88b7ab5367203da818
Author: Benjamin Vialle <benjaminvialle@gmail.com>
Date: 2011-06-08 (Wed, 08 Jun 2011)
Changed paths:
M config/locales/fr.yml
Log Message:
-----------
Merge branch 'master' of github.com:MarkUsProject/Markus into rails_3_migration
Commit: 41ecaa21dba855ae8a66019fe04e388cb18a0b16
https://github.com/MarkUsProject/Markus/commit/41ecaa21dba855ae8a66019fe04e388cb18a0b16
Author: Nelle Varoquaux <nelle.varoquaux@gmail.com>
Date: 2011-06-08 (Wed, 08 Jun 2011)
Changed paths:
M test/test_helper.rb
Log Message:
-----------
FIX RAILS_ENV was not set properly to test in the test_helper
Commit: 26e87d7e3b1e38dc1bf5e5abc7fcc9a082e83635
https://github.com/MarkUsProject/Markus/commit/26e87d7e3b1e38dc1bf5e5abc7fcc9a082e83635
Author: Benjamin Vialle <benjaminvialle@gmail.com>
Date: 2011-06-08 (Wed, 08 Jun 2011)
Changed paths:
M test/test_helper.rb
Log Message:
-----------
Merge pull request #2 from NelleV/rails_3
RAILS_ENV
Commit: fbbd6476232d2919ff88c5dba1448a5c2a029096
https://github.com/MarkUsProject/Markus/commit/fbbd6476232d2919ff88c5dba1448a5c2a029096
Author: Benjamin Vialle <benjaminvialle@gmail.com>
Date: 2011-06-09 (Thu, 09 Jun 2011)
Changed paths:
M Gemfile.lock
Log Message:
-----------
Updated Gemfile.lock
Commit: 9c7703ca33f1033eee0bb476c1aa5225427100b5
https://github.com/MarkUsProject/Markus/commit/9c7703ca33f1033eee0bb476c1aa5225427100b5
Author: Benjamin Vialle <benjaminvialle@gmail.com>
Date: 2011-06-09 (Thu, 09 Jun 2011)
Changed paths:
M test/unit/flexible_criterion_test.rb
Log Message:
-----------
ActiveRecord::Errors is now ActiveModel::Errors
Commit: 715fd93df6dcd44b94dae3399cb497c292c4e114
https://github.com/MarkUsProject/Markus/commit/715fd93df6dcd44b94dae3399cb497c292c4e114
Author: Benjamin Vialle <benjaminvialle@gmail.com>
Date: 2011-06-10 (Fri, 10 Jun 2011)
Changed paths:
M INSTALL
Log Message:
-----------
Updated install file for 0.10.0 release
Commit: 1880b699b5fb3b9313c5b674e87830e4d38d8007
https://github.com/MarkUsProject/Markus/commit/1880b699b5fb3b9313c5b674e87830e4d38d8007
Author: Benjamin Vialle <benjaminvialle@gmail.com>
Date: 2011-06-10 (Fri, 10 Jun 2011)
Changed paths:
R README
A README.rst
Log Message:
-----------
The website is now also available as the README file
Commit: 46b19e633940f8e273402d4b8e22e322e6d128e7
https://github.com/MarkUsProject/Markus/commit/46b19e633940f8e273402d4b8e22e322e6d128e7
Author: Varoquaux <nelle.varoquaux@gmail.com>
Date: 2011-06-10 (Fri, 10 Jun 2011)
Changed paths:
M INSTALL
R README
A README.rst
Log Message:
-----------
Merge pull request #360 from benjaminvialle/documentation
Documentation
Commit: 4ecd18f057f852fd0006904c0dbeff961c4d5543
https://github.com/MarkUsProject/Markus/commit/4ecd18f057f852fd0006904c0dbeff961c4d5543
Author: Benjamin Vialle <benjaminvialle@gmail.com>
Date: 2011-06-10 (Fri, 10 Jun 2011)
Changed paths:
A LICENSE
Log Message:
-----------
Added MIT-LICENSE file to the project.
Closes #322
Commit: 027b1b6cb24d878ba08e473ee3886a272029d94e
https://github.com/MarkUsProject/Markus/commit/027b1b6cb24d878ba08e473ee3886a272029d94e
Author: Varoquaux <nelle.varoquaux@gmail.com>
Date: 2011-06-10 (Fri, 10 Jun 2011)
Changed paths:
A LICENSE
Log Message:
-----------
Merge pull request #361 from benjaminvialle/license
Added MIT-LICENSE file to the project.
Commit: 9da2c17eaf9f1c37629005fcc185e3cd82d7fad5
https://github.com/MarkUsProject/Markus/commit/9da2c17eaf9f1c37629005fcc185e3cd82d7fad5
Author: mikeconley <mike.d.conley@gmail.com>
Date: 2011-06-11 (Sat, 11 Jun 2011)
Changed paths:
M public/stylesheets/main.css
Log Message:
-----------
Closing Bug #355 - fixing alignment of Marking State icon in Submissions Table.
Commit: eefba96ad69dceff8c274f2e1249ca136e311e82
https://github.com/MarkUsProject/Markus/commit/eefba96ad69dceff8c274f2e1249ca136e311e82
Author: Severin Gehwolf <jerboaa@gmail.com>
Date: 2011-06-11 (Sat, 11 Jun 2011)
Changed paths:
M public/stylesheets/main.css
Log Message:
-----------
Merge pull request #362 from mikeconley/355-fix-align
Closing Bug #355 - fixing alignment of Marking State icon in Submissions
Commit: 3de4d7a403707bc7caee52548fa577eda1075561
https://github.com/MarkUsProject/Markus/commit/3de4d7a403707bc7caee52548fa577eda1075561
Author: mikeconley <mike.d.conley@gmail.com>
Date: 2011-06-11 (Sat, 11 Jun 2011)
Changed paths:
M INSTALL
Log Message:
-----------
Adding some more install documentation. Addresses some of the issues in issue \
#162.
Commit: f36e9d5e1338b1569a76be55d680ff9809e3930e
https://github.com/MarkUsProject/Markus/commit/f36e9d5e1338b1569a76be55d680ff9809e3930e
Author: mikeconley <mike.d.conley@gmail.com>
Date: 2011-06-11 (Sat, 11 Jun 2011)
Changed paths:
M lib/repo/memory_repository.rb
M lib/repo/subversion_repository.rb
Log Message:
-----------
Removing ruby-debug requires in repositories that were causing production installs \
to freak out (since ruby-debug is not required in production installs). Referenced by \
issue #162.
Commit: 03a9f36de2dd3af2fdfabea9e3f186715f1d9ddb
https://github.com/MarkUsProject/Markus/commit/03a9f36de2dd3af2fdfabea9e3f186715f1d9ddb
Author: Benjamin Vialle <benjaminvialle@gmail.com>
Date: 2011-06-12 (Sun, 12 Jun 2011)
Changed paths:
M INSTALL
Log Message:
-----------
Merge pull request #363 from mikeconley/install-doc
Adding some more install documentation. Addresses some of the issues in
Commit: 438eab5136c9d433509b1719821ea0bfa51141aa
https://github.com/MarkUsProject/Markus/commit/438eab5136c9d433509b1719821ea0bfa51141aa
Author: Benjamin Vialle <benjaminvialle@gmail.com>
Date: 2011-06-12 (Sun, 12 Jun 2011)
Changed paths:
M Changelog
Log Message:
-----------
Updated Changelog for 0.10.0
Commit: 2a8174509959d88b3b2a7a0aa431d7e8fa0bf32e
https://github.com/MarkUsProject/Markus/commit/2a8174509959d88b3b2a7a0aa431d7e8fa0bf32e
Author: Benjamin Vialle <benjaminvialle@gmail.com>
Date: 2011-06-12 (Sun, 12 Jun 2011)
Changed paths:
R db/db_schema_postgresql.sql
Log Message:
-----------
Removed unused file
Closes #365
Commit: 2b0bfa47ed6151d6412f9b9e296ab27164e0d4f2
https://github.com/MarkUsProject/Markus/commit/2b0bfa47ed6151d6412f9b9e296ab27164e0d4f2
Author: Benjamin Vialle <benjaminvialle@gmail.com>
Date: 2011-06-12 (Sun, 12 Jun 2011)
Changed paths:
M test/unit/markus_logger_test.rb
Log Message:
-----------
Fixed the 'baddir' repository. Now created in tmp/ and removed
correctly.
Closes #364
Commit: 223907cb260c9362273427372b9e549869bf3da6
https://github.com/MarkUsProject/Markus/commit/223907cb260c9362273427372b9e549869bf3da6
Author: Benjamin Vialle <benjaminvialle@gmail.com>
Date: 2011-06-12 (Sun, 12 Jun 2011)
Changed paths:
M Changelog
Log Message:
-----------
Merge branch 'Changelog' of github.com:benjaminvialle/Markus into changelog
Commit: 83e464109896b89e0f9ab5fec8ecca23ee99484a
https://github.com/MarkUsProject/Markus/commit/83e464109896b89e0f9ab5fec8ecca23ee99484a
Author: Benjamin Vialle <benjaminvialle@gmail.com>
Date: 2011-06-12 (Sun, 12 Jun 2011)
Changed paths:
M Changelog
Log Message:
-----------
Corrected the Changelog for version 0.10.0
Commit: 0c8982568c528f0928ca7d195961728888ff18f5
https://github.com/MarkUsProject/Markus/commit/0c8982568c528f0928ca7d195961728888ff18f5
Author: mikeconley <mike.d.conley@gmail.com>
Date: 2011-06-12 (Sun, 12 Jun 2011)
Changed paths:
M INSTALL
Log Message:
-----------
Switching all rake commands to bundle exec rake. Part of issue #162.
Commit: 326a7eff9f8a253211ab7aa621e6b759314a1bcf
https://github.com/MarkUsProject/Markus/commit/326a7eff9f8a253211ab7aa621e6b759314a1bcf
Author: Benjamin Vialle <benjaminvialle@gmail.com>
Date: 2011-06-12 (Sun, 12 Jun 2011)
Changed paths:
M lib/repo/memory_repository.rb
M lib/repo/subversion_repository.rb
Log Message:
-----------
Merge pull request #369 from mikeconley/rm-ruby-debug
Removing ruby-debug requires in repositories that were causing production
Commit: 6714069e75ac89b850635489cc6adfd5d6a5340e
https://github.com/MarkUsProject/Markus/commit/6714069e75ac89b850635489cc6adfd5d6a5340e
Author: Mike Conley <mike.d.conley@gmail.com>
Date: 2011-06-12 (Sun, 12 Jun 2011)
Changed paths:
M test/unit/markus_logger_test.rb
Log Message:
-----------
Merge pull request #370 from benjaminvialle/baddir
Fixed the 'baddir' repository.
Commit: 98d1aa8a2f4752d00e21b8187f34e64d1392ed18
https://github.com/MarkUsProject/Markus/commit/98d1aa8a2f4752d00e21b8187f34e64d1392ed18
Author: Benjamin Vialle <benjaminvialle@gmail.com>
Date: 2011-06-12 (Sun, 12 Jun 2011)
Changed paths:
M INSTALL
Log Message:
-----------
Merge pull request #371 from mikeconley/install-doc
Switching all rake commands to bundle exec rake. Part of issue #162.
Commit: 31b01c56591a4c1eeea48f3f291ed29d3862c579
https://github.com/MarkUsProject/Markus/commit/31b01c56591a4c1eeea48f3f291ed29d3862c579
Author: Mike Conley <mike.d.conley@gmail.com>
Date: 2011-06-12 (Sun, 12 Jun 2011)
Changed paths:
M Changelog
Log Message:
-----------
Merge pull request #367 from benjaminvialle/changelog
Updating Changelog for 0.10.0
Commit: 966034edd9d8bae853afbc164241a5b760eeb399
https://github.com/MarkUsProject/Markus/commit/966034edd9d8bae853afbc164241a5b760eeb399
Author: Oloruntobi Ogunbiyi <t.ogunbiyi@gmail.com>
Date: 2011-06-12 (Sun, 12 Jun 2011)
Changed paths:
M app/controllers/main_controller.rb
A app/controllers/role_controller.rb
M app/models/user.rb
M app/views/layouts/_header.html.erb
M app/views/main/login.html.erb
A app/views/main/role_switching.html.erb
M config/locales/en.yml
M public/stylesheets/main.css
Log Message:
-----------
Finished role switching
Commit: 44fbd543817e7c8099f793d9f7fbf89b8cd34ae8
https://github.com/MarkUsProject/Markus/commit/44fbd543817e7c8099f793d9f7fbf89b8cd34ae8
Author: Oloruntobi Ogunbiyi <t.ogunbiyi@gmail.com>
Date: 2011-06-12 (Sun, 12 Jun 2011)
Changed paths:
M app/controllers/main_controller.rb
M app/models/user.rb
M app/views/layouts/_header.html.erb
Log Message:
-----------
Removed get functions, removed duplicated code in main_controller.rb
Commit: 3810f87a38981fbd1a65cb35845b61b2255a40e9
https://github.com/MarkUsProject/Markus/commit/3810f87a38981fbd1a65cb35845b61b2255a40e9
Author: Oloruntobi Ogunbiyi <t.ogunbiyi@gmail.com>
Date: 2011-06-12 (Sun, 12 Jun 2011)
Changed paths:
M app/controllers/main_controller.rb
M app/models/user.rb
Log Message:
-----------
Removed one more get method in user.rb and removed debugger statements
Commit: 650d311a59bafbe424aa358e3172c53f736a815d
https://github.com/MarkUsProject/Markus/commit/650d311a59bafbe424aa358e3172c53f736a815d
Author: Oloruntobi Ogunbiyi <t.ogunbiyi@gmail.com>
Date: 2011-06-12 (Sun, 12 Jun 2011)
Changed paths:
M app/controllers/main_controller.rb
M app/views/layouts/_header.html.erb
A app/views/main/del_now
M app/views/main/index.html.erb
M public/stylesheets/main.css
Log Message:
-----------
Implemented modal dialog for role switching
Commit: 0cfd89ab3a2ccf77cb1d4b8df462b6e5b98a31da
https://github.com/MarkUsProject/Markus/commit/0cfd89ab3a2ccf77cb1d4b8df462b6e5b98a31da
Author: Oloruntobi Ogunbiyi <t.ogunbiyi@gmail.com>
Date: 2011-06-12 (Sun, 12 Jun 2011)
Changed paths:
M app/views/layouts/_header.html.erb
M config/locales/en.yml
Log Message:
-----------
Made some changes to en.yml and _header.html.erb
Commit: 0977bb1adc9472e7f3a96be87ad59d133eee6ed3
https://github.com/MarkUsProject/Markus/commit/0977bb1adc9472e7f3a96be87ad59d133eee6ed3
Author: Oloruntobi Ogunbiyi <t.ogunbiyi@gmail.com>
Date: 2011-06-12 (Sun, 12 Jun 2011)
Changed paths:
M app/views/layouts/_header.html.erb
A app/views/layouts/_role_switch.html.erb
M app/views/layouts/content.html.erb
A app/views/main/_role_switch_content.html.erb
A app/views/main/role_switch.rjs
Log Message:
-----------
Implemented dialog using a *.rjs file
Commit: c15f0692a518ce0267640a9289286f7dd4f5f7da
https://github.com/MarkUsProject/Markus/commit/c15f0692a518ce0267640a9289286f7dd4f5f7da
Author: Oloruntobi Ogunbiyi <t.ogunbiyi@gmail.com>
Date: 2011-06-12 (Sun, 12 Jun 2011)
Changed paths:
M app/controllers/main_controller.rb
R app/controllers/role_controller.rb
R app/views/main/del_now
R app/views/main/role_switching.html.erb
M public/stylesheets/main.css
Log Message:
-----------
Implemented role switching dialog using a *.rjs file
Commit: 7feadb02298de94c207369b884e9fa5fe4ff35cd
https://github.com/MarkUsProject/Markus/commit/7feadb02298de94c207369b884e9fa5fe4ff35cd
Author: Oloruntobi Ogunbiyi <t.ogunbiyi@gmail.com>
Date: 2011-06-12 (Sun, 12 Jun 2011)
Changed paths:
M app/views/layouts/_header.html.erb
M app/views/main/_role_switch_content.html.erb
Log Message:
-----------
Error messages for the role switching dialog
Commit: 6888e85ee644c01864ce055225993467e03732ed
https://github.com/MarkUsProject/Markus/commit/6888e85ee644c01864ce055225993467e03732ed
Author: Severin Gehwolf <Severin.Gehwolf@utoronto.ca>
Date: 2011-06-12 (Sun, 12 Jun 2011)
Changed paths:
M app/views/main/index.html.erb
Log Message:
-----------
Remove role_switch_notice flash on dashboard
Commit: 61f54a8c1a32c73406d7bf23e7ce77b740e8df98
https://github.com/MarkUsProject/Markus/commit/61f54a8c1a32c73406d7bf23e7ce77b740e8df98
Author: Severin Gehwolf <Severin.Gehwolf@utoronto.ca>
Date: 2011-06-12 (Sun, 12 Jun 2011)
Changed paths:
M app/controllers/main_controller.rb
M app/views/layouts/_header.html.erb
M app/views/main/_role_switch_content.html.erb
A app/views/main/_role_switch_error.html.erb
A app/views/main/_role_switch_handler.rjs
Log Message:
-----------
Closes #306. Role switching now functional.
For now the code incorporates role switches without looking at
REMOTE_USER. That's a next up.
Commit: 6ede4e854a756b9a2bbcb7708bdfc933506dfa71
https://github.com/MarkUsProject/Markus/commit/6ede4e854a756b9a2bbcb7708bdfc933506dfa71
Author: Severin Gehwolf <Severin.Gehwolf@utoronto.ca>
Date: 2011-06-12 (Sun, 12 Jun 2011)
Changed paths:
M test/functional/main_controller_test.rb
Log Message:
-----------
Fix main controller test.
Now, on successful logins there shouldn't be a flash[:login_notice] at
all. Changed the assertion accordingly.
Commit: 14b6ed10fd9f517b4aac9eee36d4c2d90cb6b62c
https://github.com/MarkUsProject/Markus/commit/14b6ed10fd9f517b4aac9eee36d4c2d90cb6b62c
Author: Severin Gehwolf <Severin.Gehwolf@utoronto.ca>
Date: 2011-06-12 (Sun, 12 Jun 2011)
Changed paths:
M app/controllers/main_controller.rb
M app/views/layouts/_header.html.erb
M config/locales/en.yml
M lib/session_handler.rb
Log Message:
-----------
Role switching now functional with REMOTE_USER.
Commit: 84dca3bd5c5b366545998bab6d8dceadc1cec15a
https://github.com/MarkUsProject/Markus/commit/84dca3bd5c5b366545998bab6d8dceadc1cec15a
Author: Oloruntobi Ogunbiyi <t.ogunbiyi@gmail.com>
Date: 2011-06-12 (Sun, 12 Jun 2011)
Changed paths:
M app/controllers/main_controller.rb
M app/views/layouts/_header.html.erb
M app/views/main/_role_switch_content.html.erb
M lib/session_handler.rb
M public/stylesheets/main.css
A test/functional/role_switching_test.rb
Log Message:
-----------
Improved role switching. Plus wrote tests.
This should make the role switching feature complete.
Commit: aead34410b88b776b2525f2b8ceaf3ce69e60784
https://github.com/MarkUsProject/Markus/commit/aead34410b88b776b2525f2b8ceaf3ce69e60784
Author: Severin Gehwolf <Severin.Gehwolf@utoronto.ca>
Date: 2011-06-12 (Sun, 12 Jun 2011)
Changed paths:
M app/controllers/main_controller.rb
M app/views/main/_role_switch_content.html.erb
M app/views/main/_role_switch_handler.rjs
M test/functional/role_switching_test.rb
Log Message:
-----------
Incorporate Mike's feedback.
Removed whitespace, made the user name field to be in focus when the
modal pops up. Used preferred syntax.
Commit: 73bc8a6fd6f19b336c35013e8953f9031c9c2fed
https://github.com/MarkUsProject/Markus/commit/73bc8a6fd6f19b336c35013e8953f9031c9c2fed
Author: Severin Gehwolf <Severin.Gehwolf@utoronto.ca>
Date: 2011-06-12 (Sun, 12 Jun 2011)
Changed paths:
M config/locales/fr.yml
Log Message:
-----------
Added french locales. Thanks Benjamin!
Commit: e3b794ca35a1efc00dd380ada99a4697e1368b93
https://github.com/MarkUsProject/Markus/commit/e3b794ca35a1efc00dd380ada99a4697e1368b93
Author: Severin Gehwolf <Severin.Gehwolf@utoronto.ca>
Date: 2011-06-12 (Sun, 12 Jun 2011)
Changed paths:
M app/MARKUS_VERSION
Log Message:
-----------
Update MARKUS_VERSION for 0.10.0 release.
Commit: cff6825083ccb82b77cc420c7d31fed3ab4a6989
https://github.com/MarkUsProject/Markus/commit/cff6825083ccb82b77cc420c7d31fed3ab4a6989
Author: Varoquaux <nelle.varoquaux@gmail.com>
Date: 2011-06-12 (Sun, 12 Jun 2011)
Changed paths:
M app/MARKUS_VERSION
Log Message:
-----------
Merge pull request #372 from jerboaa/update_release_nr
Update MARKUS_VERSION for 0.10.0 release.
Commit: 7cfcf8fc2b2f152d840ba06493c61d1bea13db33
https://github.com/MarkUsProject/Markus/commit/7cfcf8fc2b2f152d840ba06493c61d1bea13db33
Author: Severin Gehwolf <Severin.Gehwolf@utoronto.ca>
Date: 2011-06-12 (Sun, 12 Jun 2011)
Changed paths:
M app/controllers/main_controller.rb
M test/functional/role_switching_test.rb
Log Message:
-----------
Use authorize_only_for_admin in favour of custom check.
Commit: 2afdea9c3a505682e0d9eabd896611478278655e
https://github.com/MarkUsProject/Markus/commit/2afdea9c3a505682e0d9eabd896611478278655e
Author: Mike Conley <mike.d.conley@gmail.com>
Date: 2011-06-12 (Sun, 12 Jun 2011)
Changed paths:
M app/controllers/main_controller.rb
M app/views/layouts/_header.html.erb
A app/views/layouts/_role_switch.html.erb
M app/views/layouts/content.html.erb
A app/views/main/_role_switch_content.html.erb
A app/views/main/_role_switch_error.html.erb
A app/views/main/_role_switch_handler.rjs
M app/views/main/login.html.erb
A app/views/main/role_switch.rjs
M config/locales/en.yml
M config/locales/fr.yml
M lib/session_handler.rb
M public/stylesheets/main.css
M test/functional/main_controller_test.rb
A test/functional/role_switching_test.rb
Log Message:
-----------
Merge pull request #373 from jerboaa/role_switch
Role switching feature.
Commit: 08fd9e0cb3e943087d0763d13d3c7436fb1f8037
https://github.com/MarkUsProject/Markus/commit/08fd9e0cb3e943087d0763d13d3c7436fb1f8037
Author: Mike Conley <mike.d.conley@gmail.com>
Date: 2011-06-13 (Mon, 13 Jun 2011)
Changed paths:
R db/db_schema_postgresql.sql
Log Message:
-----------
Merge pull request #374 from benjaminvialle/postgresql_dump
Removed unused file
Commit: 3d78d5e3cec4049be924bbfac68032b0a6c17430
https://github.com/MarkUsProject/Markus/commit/3d78d5e3cec4049be924bbfac68032b0a6c17430
Author: Benjamin Vialle <benjaminvialle@gmail.com>
Date: 2011-06-13 (Mon, 13 Jun 2011)
Changed paths:
M Changelog
M INSTALL
A LICENSE
R README
A README.rst
M app/MARKUS_VERSION
A app/controllers/api/users_controller.rb
M app/controllers/assignments_controller.rb
M app/controllers/main_controller.rb
M app/controllers/results_controller.rb
M app/controllers/submissions_controller.rb
M app/helpers/submissions_helper.rb
M app/models/annotation_category.rb
M app/models/annotation_text.rb
M app/models/assignment.rb
M app/models/assignment_file.rb
M app/models/grade_entry_form.rb
M app/models/mark.rb
M app/models/result.rb
M app/models/student_membership.rb
M app/models/submission.rb
M app/models/submission_file.rb
M app/models/ta_membership.rb
M app/models/token.rb
M app/views/annotation_categories/index.html.erb
M app/views/assignments/student_interface.html.erb
M app/views/flexible_criteria/index.html.erb
M app/views/groups/student_interface.html.erb
M app/views/layouts/_header.html.erb
A app/views/layouts/_role_switch.html.erb
M app/views/layouts/content.html.erb
A app/views/main/_role_switch_content.html.erb
A app/views/main/_role_switch_error.html.erb
A app/views/main/_role_switch_handler.rjs
M app/views/main/index.html.erb
A app/views/main/role_switch.rjs
M app/views/results/common/_annotations.js.erb
A app/views/results/common/_old_marks_view_functions.html.erb
M app/views/results/common/_rubric_criterion.html.erb
M app/views/results/common/_submission_selector.html.erb
M app/views/results/edit.html.erb
M app/views/results/marker/_marker_panes.html.erb
M app/views/results/marker/_marker_rubric_criterion_li.html.erb
M app/views/results/marker/_marker_summary.html.erb
M app/views/results/marker/_update_mark.rjs
A app/views/results/marker/show_result_error.rjs
M app/views/results/student/_student_panes.html.erb
M app/views/results/student/_student_rubric_criterion_li.html.erb
M app/views/results/student/_student_summary.html.erb
M app/views/results/update_marking_state.rjs
M app/views/results/view_marks.html.erb
M app/views/rubrics/index.html.erb
M app/views/submissions/_file_manager_boot.js.erb
M app/views/submissions/file_manager.html.erb
M app/views/submissions/submissions_table_row/_table_row.html.erb
M config/locales/en.yml
M config/locales/fr.yml
M config/routes.rb
R db/db_schema_postgresql.sql
A db/sample_submission_files/HelloWorld.java
A db/sample_submission_files/hello.py
M lib/repo/memory_repository.rb
M lib/repo/subversion_repository.rb
M lib/session_handler.rb
M lib/tasks/results.rake
A public/409.xml
M public/javascripts/file_manager.js
M public/stylesheets/grader.css
M public/stylesheets/main.css
A test/functional/api/users_controller_test.rb
M test/functional/main_controller_test.rb
M test/functional/results_controller_test.rb
A test/functional/role_switching_test.rb
M test/functional/submissions_controller_test.rb
M test/unit/admin_test.rb
M test/unit/annotation_category_test.rb
M test/unit/annotation_test.rb
M test/unit/annotation_text_test.rb
M test/unit/assignment_file_test.rb
M test/unit/assignment_test.rb
M test/unit/extra_mark_test.rb
M test/unit/flexible_criterion_test.rb
M test/unit/grace_period_deduction_test.rb
M test/unit/grace_period_submission_rule_test.rb
M test/unit/grade_entry_form_test.rb
M test/unit/grade_test.rb
M test/unit/group_test.rb
M test/unit/grouping_test.rb
M test/unit/image_annotation_test.rb
M test/unit/mark_test.rb
M test/unit/markus_logger_test.rb
M test/unit/membership_test.rb
M test/unit/no_late_submission_rule_test.rb
M test/unit/note_test.rb
M test/unit/penalty_decay_period_submission_rule_test.rb
M test/unit/penalty_period_submission_rule_test.rb
M test/unit/period_test.rb
M test/unit/result_test.rb
M test/unit/rubric_criteria_test.rb
M test/unit/section_due_date_test.rb
M test/unit/section_test.rb
M test/unit/student_membership_test.rb
M test/unit/student_test.rb
M test/unit/submission_collector_test.rb
M test/unit/submission_file_test.rb
A test/unit/submission_helper_test.rb
M test/unit/submission_rule_test.rb
M test/unit/submission_test.rb
M test/unit/ta_membership_test.rb
M test/unit/ta_test.rb
M test/unit/test_file_test.rb
M test/unit/test_result_test.rb
M test/unit/text_annotation_test.rb
M test/unit/token_test.rb
M test/unit/user_test.rb
Log Message:
-----------
Merge for MarkUs 0.10.0
Commit: 0c064ddbd93c75ddc42317c40340401595705a0c
https://github.com/MarkUsProject/Markus/commit/0c064ddbd93c75ddc42317c40340401595705a0c
Author: Benjamin Vialle <benjaminvialle@gmail.com>
Date: 2011-06-13 (Mon, 13 Jun 2011)
Changed paths:
M Gemfile
M Gemfile.lock
M Rakefile
M app/models/student_membership.rb
M config/boot.rb
M public/javascripts/rails.js
A test/files/README
A test/files/Shapes.java
A test/files/TestShapes.java
A test/files/classlist.csv
R test/fixtures/files/README
R test/fixtures/files/Shapes.java
R test/fixtures/files/TestShapes.java
R test/fixtures/files/classlist.csv
M test/functional/submissions_controller_test.rb
M test/test_helper.rb
M test/unit/flexible_criterion_test.rb
M test/unit/result_test.rb
Log Message:
-----------
Merge branch 'rails_3_migration' of github.com:benjaminvialle/Markus into \
rails_3_migration
Commit: 8429776e9bfeb09758a4ff68c2c964ed3614384c
https://github.com/MarkUsProject/Markus/commit/8429776e9bfeb09758a4ff68c2c964ed3614384c
Author: Benjamin Vialle <benjaminvialle@gmail.com>
Date: 2011-06-13 (Mon, 13 Jun 2011)
Changed paths:
A config/mongrel_cluster.yml
R mongrel_cluster.yml
Log Message:
-----------
Move mongrel_cluster.yml to config/
Closes #359
Commit: 428b04dc07a550a7196f62d7c42a37d60bafa529
https://github.com/MarkUsProject/Markus/commit/428b04dc07a550a7196f62d7c42a37d60bafa529
Author: Nelle Varoquaux <nelle@phgroup.com>
Date: 2011-06-20 (Mon, 20 Jun 2011)
Changed paths:
M app/controllers/admins_controller.rb
M app/controllers/annotation_categories_controller.rb
M app/controllers/annotations_controller.rb
M app/controllers/api/main_api_controller.rb
M app/controllers/api/submission_downloads_controller.rb
M app/controllers/api/test_results_controller.rb
M app/controllers/application_controller.rb
M app/controllers/assignments_controller.rb
M app/controllers/flexible_criteria_controller.rb
M app/controllers/grade_entry_forms_controller.rb
M app/controllers/graders_controller.rb
M app/controllers/groups_controller.rb
M app/controllers/rubrics_controller.rb
M app/controllers/submissions_controller.rb
M app/controllers/tas_controller.rb
M app/helpers/annotation_categories_helper.rb
M app/helpers/assignments_helper.rb
M app/helpers/ensure_config_helper.rb
M app/helpers/grade_entry_forms_helper.rb
M app/helpers/graders_helper.rb
M app/helpers/groups_helper.rb
M app/helpers/main_helper.rb
M app/helpers/pagination_helper.rb
M app/helpers/results_helper.rb
M app/helpers/students_helper.rb
M app/helpers/users_helper.rb
M app/models/admin.rb
M app/models/assignment.rb
M app/models/extra_mark.rb
M app/models/flexible_criterion.rb
M app/models/grace_period_submission_rule.rb
M app/models/grade.rb
M app/models/grade_entry_item.rb
M app/models/grade_entry_student.rb
M app/models/group.rb
M app/models/grouping.rb
M app/models/membership.rb
M app/models/no_late_submission_rule.rb
M app/models/note.rb
M app/models/penalty_decay_period_submission_rule.rb
M app/models/penalty_period_submission_rule.rb
M app/models/rubric_criterion.rb
M app/models/section.rb
M app/models/submission.rb
M app/models/submission_collector.rb
M app/models/ta.rb
M config/environments/cucumber.rb
M config/environments/development.rb
M config/initializers/01_init_app.rb
M config/initializers/03_inflections.rb
M db/migrate/20080729160237_create_users.rb
M db/migrate/20080729162322_create_assignments.rb
M db/migrate/20080806143028_create_assignment_files.rb
M db/migrate/20080812143621_create_groups.rb
M db/migrate/20080812143641_create_submissions.rb
M db/migrate/20081001150504_create_categories.rb
M db/migrate/20081001150627_create_descriptions.rb
M db/migrate/20081009115817_create_annotations.rb
M db/migrate/20081009204628_modify_groups.rb
M db/migrate/20081009204639_modify_submissions.rb
M db/migrate/20081009204730_create_memberships.rb
M db/migrate/20081009204739_create_assignments_groups.rb
M db/migrate/20081009204754_create_submission_files.rb
M db/migrate/20081126183411_modify_rubric_criteria.rb
M db/migrate/20081126200403_modify_annotations.rb
M db/migrate/20081130222245_add_columns_assignments.rb
M db/migrate/20081130222302_create_submission_rules.rb
M db/migrate/20090116063343_modify_annotations_for_labels.rb
M db/migrate/20090203023227_create_grades.rb
M db/migrate/20090211221709_add_status_to_grades.rb
M db/migrate/20090212060750_create_results.rb
M db/migrate/20090220200053_create_groupings.rb
M db/migrate/20090511210106_remove_description_table.rb
M db/migrate/20090512193837_remove_assignments_groups.rb
M db/migrate/20090513155255_change_annotation_label_to_annotation_text.rb
M db/migrate/20090723155356_remove_unneeded_columns_from_submission_rules.rb
M db/migrate/20091024193107_create_grade_entry_forms.rb
M db/migrate/20091101221901_create_grade_entry_items.rb
M db/migrate/20091101234310_create_grade_entry_students.rb
M db/migrate/20091105023240_create_grades_simple_grade_entry.rb
M db/migrate/20091105182703_improve_db_indexes.rb
M db/migrate/20091111065154_create_notes.rb
M db/migrate/20091118064643_rename_columns_note.rb
M features/support/env.rb
M features/support/paths.rb
M features/support/version_check.rb
M test/blueprints/helper.rb
M test/factory_data/results_controller_test_data.rb
M test/functional/annotation_categories_controller_test.rb
M test/functional/annotations_controller_test.rb
M test/functional/assignments_controller_test.rb
M test/functional/authenticated_controller_test.rb
M test/functional/flexible_criteria_controller_test.rb
M test/functional/grade_entry_forms_controller_test.rb
M test/functional/graders_controller_test.rb
M test/functional/groups_controller_csv_upload_test.rb
M test/functional/groups_controller_test.rb
M test/functional/results_controller_test.rb
M test/functional/rubrics_controller_test.rb
M test/functional/students_controller_test.rb
M test/functional/submissions_controller_test.rb
M test/selenium/assignment_properties_test.rb
M test/selenium/login_test.rb
M test/selenium_helper.rb
M test/unit/assignment_test.rb
M test/unit/grace_period_submission_rule_test.rb
M test/unit/grouping_test.rb
M test/unit/helpers/ensure_config_helper_test.rb
M test/unit/helpers/pagination_helper_test.rb
M test/unit/penalty_decay_period_submission_rule_test.rb
M test/unit/submission_collector_test.rb
M test/unit/submission_file_test.rb
M test/unit/submission_test.rb
Log Message:
-----------
Deleted trailing spaces
Commit: a47159ee484b5a098e7e3a4357c08f8e4fb0ab24
https://github.com/MarkUsProject/Markus/commit/a47159ee484b5a098e7e3a4357c08f8e4fb0ab24
Author: Severin Gehwolf <jerboaa@gmail.com>
Date: 2011-06-20 (Mon, 20 Jun 2011)
Changed paths:
A config/mongrel_cluster.yml
R mongrel_cluster.yml
Log Message:
-----------
Merge pull request #376 from benjaminvialle/mongrel_config
Move mongrel_cluster.yml to config/
Commit: 24b60ae9c41987255d089e44aca165408e2ab4c1
https://github.com/MarkUsProject/Markus/commit/24b60ae9c41987255d089e44aca165408e2ab4c1
Author: Benjamin Vialle <benjaminvialle@gmail.com>
Date: 2011-06-23 (Thu, 23 Jun 2011)
Changed paths:
A config/mongrel_cluster.yml
R mongrel_cluster.yml
Log Message:
-----------
Merge branch 'master' of github.com:MarkUsProject/Markus into rails_3_migration
Commit: 77bda98cf647752712d47f1b429d9c1f3788b33d
https://github.com/MarkUsProject/Markus/commit/77bda98cf647752712d47f1b429d9c1f3788b33d
Author: Benjamin Vialle <benjaminvialle@gmail.com>
Date: 2011-06-23 (Thu, 23 Jun 2011)
Changed paths:
M app/controllers/admins_controller.rb
M app/controllers/annotation_categories_controller.rb
M app/controllers/annotations_controller.rb
M app/controllers/api/main_api_controller.rb
M app/controllers/api/submission_downloads_controller.rb
M app/controllers/api/test_results_controller.rb
M app/controllers/application_controller.rb
M app/controllers/assignments_controller.rb
M app/controllers/flexible_criteria_controller.rb
M app/controllers/grade_entry_forms_controller.rb
M app/controllers/graders_controller.rb
M app/controllers/groups_controller.rb
M app/controllers/rubrics_controller.rb
M app/controllers/submissions_controller.rb
M app/controllers/tas_controller.rb
M app/helpers/annotation_categories_helper.rb
M app/helpers/assignments_helper.rb
M app/helpers/ensure_config_helper.rb
M app/helpers/grade_entry_forms_helper.rb
M app/helpers/graders_helper.rb
M app/helpers/groups_helper.rb
M app/helpers/main_helper.rb
M app/helpers/pagination_helper.rb
M app/helpers/results_helper.rb
M app/helpers/students_helper.rb
M app/helpers/users_helper.rb
M app/models/admin.rb
M app/models/assignment.rb
M app/models/extra_mark.rb
M app/models/flexible_criterion.rb
M app/models/grace_period_submission_rule.rb
M app/models/grade.rb
M app/models/grade_entry_item.rb
M app/models/grade_entry_student.rb
M app/models/group.rb
M app/models/grouping.rb
M app/models/membership.rb
M app/models/no_late_submission_rule.rb
M app/models/note.rb
M app/models/penalty_decay_period_submission_rule.rb
M app/models/penalty_period_submission_rule.rb
M app/models/rubric_criterion.rb
M app/models/section.rb
M app/models/submission.rb
M app/models/submission_collector.rb
M app/models/ta.rb
M config/environments/cucumber.rb
M config/environments/development.rb
M config/initializers/01_init_app.rb
M config/initializers/03_inflections.rb
M db/migrate/20080729160237_create_users.rb
M db/migrate/20080729162322_create_assignments.rb
M db/migrate/20080806143028_create_assignment_files.rb
M db/migrate/20080812143621_create_groups.rb
M db/migrate/20080812143641_create_submissions.rb
M db/migrate/20081001150504_create_categories.rb
M db/migrate/20081001150627_create_descriptions.rb
M db/migrate/20081009115817_create_annotations.rb
M db/migrate/20081009204628_modify_groups.rb
M db/migrate/20081009204639_modify_submissions.rb
M db/migrate/20081009204730_create_memberships.rb
M db/migrate/20081009204739_create_assignments_groups.rb
M db/migrate/20081009204754_create_submission_files.rb
M db/migrate/20081126183411_modify_rubric_criteria.rb
M db/migrate/20081126200403_modify_annotations.rb
M db/migrate/20081130222245_add_columns_assignments.rb
M db/migrate/20081130222302_create_submission_rules.rb
M db/migrate/20090116063343_modify_annotations_for_labels.rb
M db/migrate/20090203023227_create_grades.rb
M db/migrate/20090211221709_add_status_to_grades.rb
M db/migrate/20090212060750_create_results.rb
M db/migrate/20090220200053_create_groupings.rb
M db/migrate/20090511210106_remove_description_table.rb
M db/migrate/20090512193837_remove_assignments_groups.rb
M db/migrate/20090513155255_change_annotation_label_to_annotation_text.rb
M db/migrate/20090723155356_remove_unneeded_columns_from_submission_rules.rb
M db/migrate/20091024193107_create_grade_entry_forms.rb
M db/migrate/20091101221901_create_grade_entry_items.rb
M db/migrate/20091101234310_create_grade_entry_students.rb
M db/migrate/20091105023240_create_grades_simple_grade_entry.rb
M db/migrate/20091105182703_improve_db_indexes.rb
M db/migrate/20091111065154_create_notes.rb
M db/migrate/20091118064643_rename_columns_note.rb
M features/support/env.rb
M features/support/paths.rb
M features/support/version_check.rb
M test/blueprints/helper.rb
M test/factory_data/results_controller_test_data.rb
M test/functional/annotation_categories_controller_test.rb
M test/functional/annotations_controller_test.rb
M test/functional/assignments_controller_test.rb
M test/functional/authenticated_controller_test.rb
M test/functional/flexible_criteria_controller_test.rb
M test/functional/grade_entry_forms_controller_test.rb
M test/functional/graders_controller_test.rb
M test/functional/groups_controller_csv_upload_test.rb
M test/functional/groups_controller_test.rb
M test/functional/results_controller_test.rb
M test/functional/rubrics_controller_test.rb
M test/functional/students_controller_test.rb
M test/functional/submissions_controller_test.rb
M test/selenium/assignment_properties_test.rb
M test/selenium/login_test.rb
M test/selenium_helper.rb
M test/unit/assignment_test.rb
M test/unit/grace_period_submission_rule_test.rb
M test/unit/grouping_test.rb
M test/unit/helpers/ensure_config_helper_test.rb
M test/unit/helpers/pagination_helper_test.rb
M test/unit/penalty_decay_period_submission_rule_test.rb
M test/unit/submission_collector_test.rb
M test/unit/submission_file_test.rb
M test/unit/submission_test.rb
Log Message:
-----------
Merge pull request #378 from NelleV/TrailingSpace
Deleted trailing spaces
Commit: 121c982f80bcaaa35519f4c76023f574105bba11
https://github.com/MarkUsProject/Markus/commit/121c982f80bcaaa35519f4c76023f574105bba11
Author: Benjamin Vialle <benjaminvialle@gmail.com>
Date: 2011-06-23 (Thu, 23 Jun 2011)
Changed paths:
M app/controllers/admins_controller.rb
M app/controllers/annotation_categories_controller.rb
M app/controllers/annotations_controller.rb
M app/controllers/api/main_api_controller.rb
M app/controllers/api/submission_downloads_controller.rb
M app/controllers/api/test_results_controller.rb
M app/controllers/assignments_controller.rb
M app/controllers/flexible_criteria_controller.rb
M app/controllers/grade_entry_forms_controller.rb
M app/controllers/graders_controller.rb
M app/controllers/groups_controller.rb
M app/controllers/rubrics_controller.rb
M app/controllers/submissions_controller.rb
M app/controllers/tas_controller.rb
M app/helpers/annotation_categories_helper.rb
M app/helpers/assignments_helper.rb
M app/helpers/grade_entry_forms_helper.rb
M app/helpers/graders_helper.rb
M app/helpers/groups_helper.rb
M app/helpers/main_helper.rb
M app/helpers/pagination_helper.rb
M app/helpers/results_helper.rb
M app/helpers/students_helper.rb
M app/helpers/users_helper.rb
M app/models/admin.rb
M app/models/assignment.rb
M app/models/extra_mark.rb
M app/models/flexible_criterion.rb
M app/models/grace_period_submission_rule.rb
M app/models/grade.rb
M app/models/grade_entry_item.rb
M app/models/grade_entry_student.rb
M app/models/group.rb
M app/models/grouping.rb
M app/models/membership.rb
M app/models/no_late_submission_rule.rb
M app/models/note.rb
M app/models/penalty_decay_period_submission_rule.rb
M app/models/penalty_period_submission_rule.rb
M app/models/rubric_criterion.rb
M app/models/section.rb
M app/models/submission.rb
M app/models/submission_collector.rb
M app/models/ta.rb
M config/initializers/03_inflections.rb
M db/migrate/20080729160237_create_users.rb
M db/migrate/20080729162322_create_assignments.rb
M db/migrate/20080806143028_create_assignment_files.rb
M db/migrate/20080812143621_create_groups.rb
M db/migrate/20080812143641_create_submissions.rb
M db/migrate/20081001150504_create_categories.rb
M db/migrate/20081001150627_create_descriptions.rb
M db/migrate/20081009115817_create_annotations.rb
M db/migrate/20081009204628_modify_groups.rb
M db/migrate/20081009204639_modify_submissions.rb
M db/migrate/20081009204730_create_memberships.rb
M db/migrate/20081009204739_create_assignments_groups.rb
M db/migrate/20081009204754_create_submission_files.rb
M db/migrate/20081126183411_modify_rubric_criteria.rb
M db/migrate/20081126200403_modify_annotations.rb
M db/migrate/20081130222245_add_columns_assignments.rb
M db/migrate/20081130222302_create_submission_rules.rb
M db/migrate/20090116063343_modify_annotations_for_labels.rb
M db/migrate/20090203023227_create_grades.rb
M db/migrate/20090211221709_add_status_to_grades.rb
M db/migrate/20090212060750_create_results.rb
M db/migrate/20090220200053_create_groupings.rb
M db/migrate/20090511210106_remove_description_table.rb
M db/migrate/20090512193837_remove_assignments_groups.rb
M db/migrate/20090513155255_change_annotation_label_to_annotation_text.rb
M db/migrate/20090723155356_remove_unneeded_columns_from_submission_rules.rb
M db/migrate/20091024193107_create_grade_entry_forms.rb
M db/migrate/20091101221901_create_grade_entry_items.rb
M db/migrate/20091101234310_create_grade_entry_students.rb
M db/migrate/20091105023240_create_grades_simple_grade_entry.rb
M db/migrate/20091105182703_improve_db_indexes.rb
M db/migrate/20091111065154_create_notes.rb
M db/migrate/20091118064643_rename_columns_note.rb
M features/support/env.rb
M features/support/paths.rb
M features/support/version_check.rb
M test/blueprints/helper.rb
M test/functional/annotation_categories_controller_test.rb
M test/functional/annotations_controller_test.rb
M test/functional/assignments_controller_test.rb
M test/functional/flexible_criteria_controller_test.rb
M test/functional/grade_entry_forms_controller_test.rb
M test/functional/graders_controller_test.rb
M test/functional/groups_controller_csv_upload_test.rb
M test/functional/groups_controller_test.rb
M test/functional/results_controller_test.rb
M test/functional/rubrics_controller_test.rb
M test/functional/students_controller_test.rb
M test/unit/assignment_test.rb
M test/unit/grace_period_submission_rule_test.rb
M test/unit/grouping_test.rb
M test/unit/helpers/pagination_helper_test.rb
M test/unit/penalty_decay_period_submission_rule_test.rb
M test/unit/submission_collector_test.rb
M test/unit/submission_file_test.rb
M test/unit/submission_test.rb
Log Message:
-----------
Merge branch 'master' of github.com:MarkUsProject/Markus into rails_3_migration
Commit: e9a70555d7108c33d0da9b77c13b27a1fa5c58bb
https://github.com/MarkUsProject/Markus/commit/e9a70555d7108c33d0da9b77c13b27a1fa5c58bb
Author: Benjamin Vialle <benjaminvialle@gmail.com>
Date: 2011-06-28 (Tue, 28 Jun 2011)
Changed paths:
M Gemfile
M Gemfile.lock
Log Message:
-----------
Updated Gemfile (now using rake 0.9.0)
Commit: 1eb953c17b45f08bc78b4bbe46723b02a20f4e06
https://github.com/MarkUsProject/Markus/commit/1eb953c17b45f08bc78b4bbe46723b02a20f4e06
Author: Benjamin Vialle <benjaminvialle@gmail.com>
Date: 2011-06-28 (Tue, 28 Jun 2011)
Changed paths:
M config/environments/development.rb
M config/environments/test.rb
M lib/repo/memory_repository.rb
M lib/repo/repository.rb
M lib/repo/subversion_repository.rb
M lib/repo/test/memory_repository_test.rb
M lib/repo/test/subversion_repository_test.rb
M test/functional/groups_controller_csv_upload_test.rb
M test/unit/markus_logger_test.rb
Log Message:
-----------
Merging changes of MarkUs v0.10.0
Commit: f058982065eaa39c112fa278792a48b06dfc87ca
https://github.com/MarkUsProject/Markus/commit/f058982065eaa39c112fa278792a48b06dfc87ca
Author: Severin Gehwolf <Severin.Gehwolf@utoronto.ca>
Date: 2011-06-28 (Tue, 28 Jun 2011)
Changed paths:
M test/unit/submission_test.rb
Log Message:
-----------
Fix warning of duplicate test. Closes #379.
submission_test.rb had two "create a remark result. " tests. One is now
called "create a new remark result" This fixes the issue.
Commit: caca39a1b1021731746ae3284ff309184a32a904
https://github.com/MarkUsProject/Markus/commit/caca39a1b1021731746ae3284ff309184a32a904
Author: Benjamin Vialle <benjaminvialle@gmail.com>
Date: 2011-06-28 (Tue, 28 Jun 2011)
Changed paths:
M app/models/student_membership.rb
M app/models/ta_membership.rb
Log Message:
-----------
Fix: Deprecated warning. add_to_base is now add
Commit: 03cc16a40c2e71f80004b8b9471a85bc92750e30
https://github.com/MarkUsProject/Markus/commit/03cc16a40c2e71f80004b8b9471a85bc92750e30
Author: Benjamin Vialle <benjaminvialle@gmail.com>
Date: 2011-06-29 (Wed, 29 Jun 2011)
Changed paths:
M lib/repo/memory_repository.rb
M lib/repo/repository.rb
M lib/repo/subversion_repository.rb
M lib/repo/test/memory_repository_test.rb
M lib/repo/test/subversion_repository_test.rb
M test/functional/groups_controller_csv_upload_test.rb
M test/unit/markus_logger_test.rb
Log Message:
-----------
Merge branch 'master' of github.com:MarkUsProject/Markus into rails_3_migration
Commit: f479b55d837dd2d7797d8d8ea023af95e6455476
https://github.com/MarkUsProject/Markus/commit/f479b55d837dd2d7797d8d8ea023af95e6455476
Author: Benjamin Vialle <benjaminvialle@gmail.com>
Date: 2011-06-29 (Wed, 29 Jun 2011)
Changed paths:
M Gemfile
M Gemfile.lock
M Rakefile
Log Message:
-----------
Rdoc must now be added as a Gem in the Gemfile.
Remove a deprecated warning
Commit: 6d3dd9deed8ff38acdf71e1e196a0ed03cec7f3a
https://github.com/MarkUsProject/Markus/commit/6d3dd9deed8ff38acdf71e1e196a0ed03cec7f3a
Author: Benjamin Vialle <benjaminvialle@gmail.com>
Date: 2011-06-29 (Wed, 29 Jun 2011)
Changed paths:
M app/models/student_membership.rb
M app/models/ta_membership.rb
Log Message:
-----------
Merge branch 'master' of github.com:MarkUsProject/Markus into rails_3_migration
Commit: 6ed267d694bd1785ccd3331934e0a6436bed5f56
https://github.com/MarkUsProject/Markus/commit/6ed267d694bd1785ccd3331934e0a6436bed5f56
Author: Benjamin Vialle <benjaminvialle@gmail.com>
Date: 2011-06-29 (Wed, 29 Jun 2011)
Changed paths:
M app/models/assignment.rb
M app/models/student_membership.rb
Log Message:
-----------
Add_to_base improvment
Commit: 5f0c34fc928903c548362903f62da19d284a3438
https://github.com/MarkUsProject/Markus/commit/5f0c34fc928903c548362903f62da19d284a3438
Author: Benjamin Vialle <benjaminvialle@gmail.com>
Date: 2011-06-29 (Wed, 29 Jun 2011)
Changed paths:
M Gemfile
M Gemfile.lock
M Rakefile
Log Message:
-----------
rdoc
Commit: 1d6f1eb85d50d0db3722c67bd98036217bd9b16b
https://github.com/MarkUsProject/Markus/commit/1d6f1eb85d50d0db3722c67bd98036217bd9b16b
Author: Benjamin Vialle <benjaminvialle@gmail.com>
Date: 2011-06-29 (Wed, 29 Jun 2011)
Changed paths:
M Gemfile.lock
Log Message:
-----------
Updated Gemfile
Commit: 40e1fc28ce46d61ecc53d8abd230023334d729e2
https://github.com/MarkUsProject/Markus/commit/40e1fc28ce46d61ecc53d8abd230023334d729e2
Author: Benjamin Vialle <benjaminvialle@gmail.com>
Date: 2011-07-02 (Sat, 02 Jul 2011)
Changed paths:
M test/unit/submission_test.rb
Log Message:
-----------
Merge pull request #383 from jerboaa/fix_test_warning
Fix warning of duplicate test. Closes #379.
Commit: 811d20e7c4452f2f15c6bdb94ee897219de01ce1
https://github.com/MarkUsProject/Markus/commit/811d20e7c4452f2f15c6bdb94ee897219de01ce1
Author: Benjamin Vialle <benjaminvialle@gmail.com>
Date: 2011-07-04 (Mon, 04 Jul 2011)
Changed paths:
M test/unit/submission_test.rb
Log Message:
-----------
Merge branch 'master' of github.com:MarkUsProject/Markus into rails_3_migration
Commit: db5e211dc5bf97b315bb848faa0c4f994a08f8b8
https://github.com/MarkUsProject/Markus/commit/db5e211dc5bf97b315bb848faa0c4f994a08f8b8
Author: Alexandre Lissy <alexandre.lissy@etu.univ-tours.fr>
Date: 2011-07-04 (Mon, 04 Jul 2011)
Changed paths:
M app/views/submissions/_submission_warning.js.erb
Log Message:
-----------
Fix Javascript error
Strings between single quotes while it should be double quotes.
Commit: d31a0fea5dbeb4cbf47cdb8b50f8f125e093d651
https://github.com/MarkUsProject/Markus/commit/d31a0fea5dbeb4cbf47cdb8b50f8f125e093d651
Author: Alexandre Lissy <alexandre.lissy@etu.univ-tours.fr>
Date: 2011-07-04 (Mon, 04 Jul 2011)
Changed paths:
M config/locales/fr.yml
Log Message:
-----------
Fix french locale for missing string concat
JavaScript message translated in french was missing the '+' for
concatenation of the parameters.
Commit: 933250708f48193b673d8bce9c96403d972838b6
https://github.com/MarkUsProject/Markus/commit/933250708f48193b673d8bce9c96403d972838b6
Author: Benjamin Vialle <benjaminvialle@gmail.com>
Date: 2011-07-06 (Wed, 06 Jul 2011)
Changed paths:
M app/views/submissions/_submission_warning.js.erb
Log Message:
-----------
Merge branch 'master' of github.com:MarkUsProject/Markus into rails_3_migration
Commit: 927bf962f7843f4e87fe994748b9dc6077af9b9e
https://github.com/MarkUsProject/Markus/commit/927bf962f7843f4e87fe994748b9dc6077af9b9e
Author: Nicolas Carougeau <nicolas.carougeau@gmail.com>
Date: 2011-07-06 (Wed, 06 Jul 2011)
Changed paths:
M config/locales/fr.yml
Log Message:
-----------
Some improvments for French locale
Commit: 6aa5e2e9e089840c6b19c9b724b54530fc3abbb6
https://github.com/MarkUsProject/Markus/commit/6aa5e2e9e089840c6b19c9b724b54530fc3abbb6
Author: Benjamin Vialle <benjaminvialle@gmail.com>
Date: 2011-07-06 (Wed, 06 Jul 2011)
Changed paths:
M config/locales/fr.yml
Log Message:
-----------
Merge branch 'master' of github.com:MarkUsProject/Markus into rails_3_migration
Commit: 1de9366c97a1be971fd87b7a08cddce21accb675
https://github.com/MarkUsProject/Markus/commit/1de9366c97a1be971fd87b7a08cddce21accb675
Author: Nicolas Carougeau <nicolas.carougeau@gmail.com>
Date: 2011-07-08 (Fri, 08 Jul 2011)
Changed paths:
M config/locales/fr.yml
Log Message:
-----------
Better translations for French
Commit: e8df4d6726771ede78ab20c0d40ba9d0c44514d8
https://github.com/MarkUsProject/Markus/commit/e8df4d6726771ede78ab20c0d40ba9d0c44514d8
Author: Nicolas Carougeau <nicolas.carougeau@gmail.com>
Date: 2011-07-08 (Fri, 08 Jul 2011)
Changed paths:
M config/locales/fr.yml
Log Message:
-----------
Gender consideration for French locale
Commit: 1fc6c5223758b9c8a4f632fabe92d2a3b7814c38
https://github.com/MarkUsProject/Markus/commit/1fc6c5223758b9c8a4f632fabe92d2a3b7814c38
Author: Benjamin Vialle <benjaminvialle@gmail.com>
Date: 2011-07-08 (Fri, 08 Jul 2011)
Changed paths:
M app/views/submissions/_submission_warning.js.erb
M config/locales/fr.yml
Log Message:
-----------
Merge branch 'master' of github.com:MarkUsProject/Markus into French
Conflicts:
config/locales/fr.yml
Commit: 1597f0aa1b4871bc841107518a83df4bf3b0af65
https://github.com/MarkUsProject/Markus/commit/1597f0aa1b4871bc841107518a83df4bf3b0af65
Author: Benjamin Vialle <benjaminvialle@gmail.com>
Date: 2011-07-08 (Fri, 08 Jul 2011)
Changed paths:
M config/locales/fr.yml
Log Message:
-----------
Merge branch 'master' of github.com:MarkUsProject/Markus into rails_3_migration
Commit: 1c083b68a02bc00a1de27b39eb01f7e8752d00e2
https://github.com/MarkUsProject/Markus/commit/1c083b68a02bc00a1de27b39eb01f7e8752d00e2
Author: Benjamin Vialle <benjaminvialle@gmail.com>
Date: 2011-07-09 (Sat, 09 Jul 2011)
Changed paths:
M config/locales/fr.yml
Log Message:
-----------
Merge branch 'master' of github.com:MarkUsProject/Markus into rails_3_migration
Commit: bede3e09b621b826fa8bd0e6e222719112ea840d
https://github.com/MarkUsProject/Markus/commit/bede3e09b621b826fa8bd0e6e222719112ea840d
Author: Benjamin Vialle <benjaminvialle@gmail.com>
Date: 2011-07-11 (Mon, 11 Jul 2011)
Changed paths:
M Gemfile
M Gemfile.lock
Log Message:
-----------
Added rcov to Gem
Commit: 0c909ebc3893c610d31661e6f650e930ac54d7bc
https://github.com/MarkUsProject/Markus/commit/0c909ebc3893c610d31661e6f650e930ac54d7bc
Author: Severin Gehwolf <jerboaa@gmail.com>
Date: 2011-07-11 (Mon, 11 Jul 2011)
Changed paths:
M Gemfile
M Gemfile.lock
Log Message:
-----------
Merge pull request #392 from benjaminvialle/rcov
Added rcov to Gem
Commit: 6328c913ae7860b840f33022d292e24eaad55a1e
https://github.com/MarkUsProject/Markus/commit/6328c913ae7860b840f33022d292e24eaad55a1e
Author: Benjamin Vialle <benjaminvialle@gmail.com>
Date: 2011-07-18 (Mon, 18 Jul 2011)
Changed paths:
M app/views/assignments/student_interface.html.erb
M config/locales/en.yml
M config/locales/fr.yml
Log Message:
-----------
A new entry in locales in orider to fix French grammar rule
Commit: cc3a086cd6372911275e2c0c62524976a31acc1e
https://github.com/MarkUsProject/Markus/commit/cc3a086cd6372911275e2c0c62524976a31acc1e
Author: Benjamin Vialle <benjaminvialle@gmail.com>
Date: 2011-07-18 (Mon, 18 Jul 2011)
Changed paths:
M Gemfile
M Gemfile.lock
Log Message:
-----------
Merge branch 'master' of github.com:MarkUsProject/Markus into Typo-fr
Commit: d1e75d89e27e0b0e99be00dcf1819b30a3975263
https://github.com/MarkUsProject/Markus/commit/d1e75d89e27e0b0e99be00dcf1819b30a3975263
Author: Benjamin Vialle <benjaminvialle@gmail.com>
Date: 2011-07-18 (Mon, 18 Jul 2011)
Changed paths:
M app/views/assignments/student_interface.html.erb
Log Message:
-----------
Removed trailing whitespace
Commit: d1d4c262b195b9daf3dad102568a56415a8c46d3
https://github.com/MarkUsProject/Markus/commit/d1d4c262b195b9daf3dad102568a56415a8c46d3
Author: Benjamin Vialle <benjaminvialle@gmail.com>
Date: 2011-07-18 (Mon, 18 Jul 2011)
Changed paths:
M Gemfile
M Gemfile.lock
Log Message:
-----------
Merge branch 'master' of github.com:MarkUsProject/Markus into rails_3_migration
Commit: d06ddcd1aa8e6029e445433e39385c60dd8fee29
https://github.com/MarkUsProject/Markus/commit/d06ddcd1aa8e6029e445433e39385c60dd8fee29
Author: Nelle Varoquaux <nelle.varoquaux@gmail.com>
Date: 2011-07-18 (Mon, 18 Jul 2011)
Changed paths:
M db/populate/03_tas.rb
M db/populate/04_assignments.rb
A db/populate/05_groups.rb
A db/populate/06_repos.rb
A db/populate/07_criterias.rb
A db/populate/08_annotations.rb
A db/populate/data/deferred-process.jpg
A db/populate/data/internet.py
A db/populate/data/reactors.py
A db/populate/data/service.py
Log Message:
-----------
Added a few populate files (groups, criterias, annotations, populate repositories \
with some python code and jpg)
Commit: 12105709109e27b7a4536125181524d5765628d8
https://github.com/MarkUsProject/Markus/commit/12105709109e27b7a4536125181524d5765628d8
Author: Severin Gehwolf <jerboaa@gmail.com>
Date: 2011-07-18 (Mon, 18 Jul 2011)
Changed paths:
M db/populate/03_tas.rb
M db/populate/04_assignments.rb
A db/populate/05_groups.rb
A db/populate/06_repos.rb
A db/populate/07_criterias.rb
A db/populate/08_annotations.rb
A db/populate/data/deferred-process.jpg
A db/populate/data/internet.py
A db/populate/data/reactors.py
A db/populate/data/service.py
Log Message:
-----------
Merge pull request #394 from NelleV/add_populate
Added a few populate files (groups, criterias, annotations, populate repo
Commit: 5d3c6f4c5cf51d2371b368d900db39476cce1204
https://github.com/MarkUsProject/Markus/commit/5d3c6f4c5cf51d2371b368d900db39476cce1204
Author: Benjamin Vialle <benjaminvialle@gmail.com>
Date: 2011-07-19 (Tue, 19 Jul 2011)
Changed paths:
M app/views/assignments/student_interface.html.erb
M config/locales/en.yml
M config/locales/fr.yml
M db/populate/03_tas.rb
M db/populate/04_assignments.rb
A db/populate/05_groups.rb
A db/populate/06_repos.rb
A db/populate/07_criterias.rb
A db/populate/08_annotations.rb
A db/populate/data/deferred-process.jpg
A db/populate/data/internet.py
A db/populate/data/reactors.py
A db/populate/data/service.py
Log Message:
-----------
Merge branch 'master' of github.com:MarkUsProject/Markus into rails_3_migration
Commit: f1bd1bcf139412d1ec8604cfb9c235e2b52eb3e7
https://github.com/MarkUsProject/Markus/commit/f1bd1bcf139412d1ec8604cfb9c235e2b52eb3e7
Author: Nelle Varoquaux <nelle.varoquaux@gmail.com>
Date: 2011-07-20 (Wed, 20 Jul 2011)
Changed paths:
M app/controllers/results_controller.rb
M app/models/mark.rb
M app/models/result.rb
M app/models/user.rb
Log Message:
-----------
Reformatting
Commit: b46db9bee658801dd307af3fbe19f809552e7fdf
https://github.com/MarkUsProject/Markus/commit/b46db9bee658801dd307af3fbe19f809552e7fdf
Author: Nelle Varoquaux <nelle.varoquaux@gmail.com>
Date: 2011-07-20 (Wed, 20 Jul 2011)
Changed paths:
M test/blueprints/blueprints.rb
Log Message:
-----------
Added a blueprint for result
Commit: d849988566cb02bf18031650a5a7fa8eb8be5ac6
https://github.com/MarkUsProject/Markus/commit/d849988566cb02bf18031650a5a7fa8eb8be5ac6
Author: Nelle Varoquaux <nelle.varoquaux@gmail.com>
Date: 2011-07-20 (Wed, 20 Jul 2011)
Changed paths:
M test/functional/results_controller_test.rb
Log Message:
-----------
Getting rid of FactoryData on the controller result's tests
Commit: 7d0372768edd9ceca374c3f64534ec3426efa0dd
https://github.com/MarkUsProject/Markus/commit/7d0372768edd9ceca374c3f64534ec3426efa0dd
Author: Benjamin Vialle <benjaminvialle@gmail.com>
Date: 2011-07-20 (Wed, 20 Jul 2011)
Changed paths:
M Gemfile
M Gemfile.lock
M config/environments/test.rb
R test/factory_data.rb
R test/factory_data/results_controller_test_data.rb
M test/functional/results_controller_test.rb
M test/test_helper.rb
Log Message:
-----------
Removed references to factory_data_preloader (as it is not working with
Rails3)
Commit: 9e62a269a19a8b68a4ac4a5d8aa84d50b11a5fb0
https://github.com/MarkUsProject/Markus/commit/9e62a269a19a8b68a4ac4a5d8aa84d50b11a5fb0
Author: Nelle Varoquaux <nelle.varoquaux@gmail.com>
Date: 2011-07-20 (Wed, 20 Jul 2011)
Changed paths:
M app/controllers/results_controller.rb
M test/functional/results_controller_test.rb
Log Message:
-----------
FIX the few failing tests
Commit: c76bfcff7fac91dfb17273eeedefd676ddfa2d6c
https://github.com/MarkUsProject/Markus/commit/c76bfcff7fac91dfb17273eeedefd676ddfa2d6c
Author: Nelle Varoquaux <nelle.varoquaux@gmail.com>
Date: 2011-07-20 (Wed, 20 Jul 2011)
Changed paths:
M test/blueprints/blueprints.rb
M test/functional/results_controller_test.rb
Log Message:
-----------
All functionnal tests of the result controller are now independant from the
data factory loader.
closes #256
Commit: e78d8be48b987c1ccabce808966392f908095b6f
https://github.com/MarkUsProject/Markus/commit/e78d8be48b987c1ccabce808966392f908095b6f
Author: Nelle Varoquaux <nelle.varoquaux@gmail.com>
Date: 2011-07-20 (Wed, 20 Jul 2011)
Changed paths:
M test/blueprints/blueprints.rb
M test/functional/results_controller_test.rb
Log Message:
-----------
Uncommented most of the tests - some are still failing
Commit: 95092fcc4f2a1a2838b2ef636ca15944275cde3d
https://github.com/MarkUsProject/Markus/commit/95092fcc4f2a1a2838b2ef636ca15944275cde3d
Author: Nelle Varoquaux <nelle.varoquaux@gmail.com>
Date: 2011-07-21 (Thu, 21 Jul 2011)
Changed paths:
M test/blueprints/blueprints.rb
M test/functional/results_controller_test.rb
Log Message:
-----------
Last two tests finally pass
Commit: 2b36d20f20c62f56561960b4ac5ba2645726418d
https://github.com/MarkUsProject/Markus/commit/2b36d20f20c62f56561960b4ac5ba2645726418d
Author: Nelle Varoquaux <nelle.varoquaux@gmail.com>
Date: 2011-07-21 (Thu, 21 Jul 2011)
Changed paths:
M test/blueprints/blueprints.rb
Log Message:
-----------
Set back lark blueprint as it was initially
Commit: be0c645fcf733df00a674f36c998d0d3b1712858
https://github.com/MarkUsProject/Markus/commit/be0c645fcf733df00a674f36c998d0d3b1712858
Author: Nelle Varoquaux <nelle.varoquaux@gmail.com>
Date: 2011-07-21 (Thu, 21 Jul 2011)
Changed paths:
M test/functional/results_controller_test.rb
Log Message:
-----------
FIX typo
Commit: a4b22c3546b48b96354e2fec57bccdf2c1f5a9f6
https://github.com/MarkUsProject/Markus/commit/a4b22c3546b48b96354e2fec57bccdf2c1f5a9f6
Author: Nelle Varoquaux <nelle.varoquaux@gmail.com>
Date: 2011-07-21 (Thu, 21 Jul 2011)
Changed paths:
M test/functional/admins_controller_test.rb
Log Message:
-----------
Migrate tests to Shoulda + machinist
closes #241
Commit: 2b95b992fe92e55a69b21d4fb582e31838671f10
https://github.com/MarkUsProject/Markus/commit/2b95b992fe92e55a69b21d4fb582e31838671f10
Author: Nelle Varoquaux <nelle.varoquaux@gmail.com>
Date: 2011-07-21 (Thu, 21 Jul 2011)
Changed paths:
M test/functional/admins_controller_test.rb
Log Message:
-----------
FIX the admins_controller_test now uses proper File path
Commit: 5f605a6554b38b83ec0644ab68df2557c38cf866
https://github.com/MarkUsProject/Markus/commit/5f605a6554b38b83ec0644ab68df2557c38cf866
Author: Benjamin Vialle <benjaminvialle@gmail.com>
Date: 2011-07-21 (Thu, 21 Jul 2011)
Changed paths:
M Gemfile
M app/controllers/results_controller.rb
M app/models/mark.rb
M app/models/result.rb
M app/models/user.rb
M test/blueprints/blueprints.rb
M test/functional/results_controller_test.rb
Log Message:
-----------
Merge branch 'master' of github.com:MarkUsProject/Markus into rails_3_migration
Commit: 41088eab58a556f8ad00a8c57a318faba0057519
https://github.com/MarkUsProject/Markus/commit/41088eab58a556f8ad00a8c57a318faba0057519
Author: Benjamin Vialle <benjaminvialle@gmail.com>
Date: 2011-07-21 (Thu, 21 Jul 2011)
Changed paths:
M test/functional/admins_controller_test.rb
Log Message:
-----------
Merge branch 'master' of github.com:MarkUsProject/Markus into rails_3_migration
Commit: c9ce031f83cab18ebe569a0bc60af691a64672ef
https://github.com/MarkUsProject/Markus/commit/c9ce031f83cab18ebe569a0bc60af691a64672ef
Author: Benjamin Vialle <benjaminvialle@gmail.com>
Date: 2011-07-21 (Thu, 21 Jul 2011)
Changed paths:
M app/views/layouts/_header.html.erb
M lib/session_handler.rb
Log Message:
-----------
Fix deprecated warning concerning request_uri (now it is fullpath)
Commit: 12a5f55cff6a8b4a84d0dcca080b39f87e21c3ac
https://github.com/MarkUsProject/Markus/commit/12a5f55cff6a8b4a84d0dcca080b39f87e21c3ac
Author: Benjamin Vialle <benjaminvialle@gmail.com>
Date: 2011-07-21 (Thu, 21 Jul 2011)
Changed paths:
M app/views/assignments/_form.html.erb
M app/views/grade_entry_forms/_form.html.erb
Log Message:
-----------
Closes #400
Commit: dcc3957b1747cbe6792a20f61bac8ed33d721d55
https://github.com/MarkUsProject/Markus/commit/dcc3957b1747cbe6792a20f61bac8ed33d721d55
Author: Nelle Varoquaux <nelle@phgroup.com>
Date: 2011-07-21 (Thu, 21 Jul 2011)
Changed paths:
M app/views/annotation_categories/index.html.erb
M app/views/assignments/student_interface.html.erb
M app/views/flexible_criteria/_errors_list.html.erb
M app/views/grade_entry_forms/_form.html.erb
M app/views/grade_entry_forms/_grade_entry_item.html.erb
M app/views/rubrics/_errors_list.html.erb
M app/views/submissions/repo_browser.html.erb
M app/views/test_framework/_form.html.erb
M app/views/test_framework/_test_file.html.erb
Log Message:
-----------
<% %> style block helpers are deprecated. They are now removed
closes #399
Commit: f0a2ee572b7e59ddf7f3f26736e2adaf6ac435f3
https://github.com/MarkUsProject/Markus/commit/f0a2ee572b7e59ddf7f3f26736e2adaf6ac435f3
Author: Benjamin Vialle <benjaminvialle@gmail.com>
Date: 2011-07-21 (Thu, 21 Jul 2011)
Changed paths:
M app/views/annotation_categories/index.html.erb
M app/views/assignments/student_interface.html.erb
M app/views/flexible_criteria/_errors_list.html.erb
M app/views/grade_entry_forms/_form.html.erb
M app/views/grade_entry_forms/_grade_entry_item.html.erb
M app/views/rubrics/_errors_list.html.erb
M app/views/submissions/repo_browser.html.erb
M app/views/test_framework/_form.html.erb
M app/views/test_framework/_test_file.html.erb
Log Message:
-----------
Merge pull request #4 from NelleV/399_DeprecationStyleBlockHelper
399 deprecation style block helper
Commit: c12526fce478457c3abbff8301822f570c859847
https://github.com/MarkUsProject/Markus/commit/c12526fce478457c3abbff8301822f570c859847
Author: Nelle Varoquaux <nelle@phgroup.com>
Date: 2011-07-21 (Thu, 21 Jul 2011)
Changed paths:
M app/views/api/_key_display.html.erb
M app/views/layouts/_header.html.erb
Log Message:
-----------
FIX changed some remote tags to make them rails3 friendly
refs #404
Commit: 9425f4ab988c94a550f78f81e92afabd751668fa
https://github.com/MarkUsProject/Markus/commit/9425f4ab988c94a550f78f81e92afabd751668fa
Author: Nelle Varoquaux <nelle@phgroup.com>
Date: 2011-07-21 (Thu, 21 Jul 2011)
Changed paths:
M app/views/students/index.html.erb
Log Message:
-----------
FIX changed some remote tags to make them rails3 friendly
refs #404
Commit: 3845e927fc3a58fe7ac2f5d28a35ada88a3b4a39
https://github.com/MarkUsProject/Markus/commit/3845e927fc3a58fe7ac2f5d28a35ada88a3b4a39
Author: Nelle Varoquaux <nelle@phgroup.com>
Date: 2011-07-21 (Thu, 21 Jul 2011)
Changed paths:
M app/views/layouts/content.html.erb
Log Message:
-----------
FIX The layout is now displayed properly
Commit: 016ea592acd68de8917fb71d4f3b38bbef6c3d4b
https://github.com/MarkUsProject/Markus/commit/016ea592acd68de8917fb71d4f3b38bbef6c3d4b
Author: Benjamin Vialle <benjaminvialle@gmail.com>
Date: 2011-07-21 (Thu, 21 Jul 2011)
Changed paths:
M app/views/api/_key_display.html.erb
M app/views/layouts/_header.html.erb
M app/views/layouts/content.html.erb
M app/views/students/index.html.erb
Log Message:
-----------
Merge pull request #5 from NelleV/404_form_remote_tag
Fixes parts of the UI
Commit: bca62f80f5a4f582cc4219b487cfe74ff6abdae7
https://github.com/MarkUsProject/Markus/commit/bca62f80f5a4f582cc4219b487cfe74ff6abdae7
Author: Benjamin Vialle <benjaminvialle@gmail.com>
Date: 2011-07-21 (Thu, 21 Jul 2011)
Changed paths:
M app/views/note/edit.html.erb
M app/views/test_framework/_form.html.erb
Log Message:
-----------
Fixed deprecation warnings on form_for
Commit: 07ecfebbebdc92402e0d70c5e18d8028500e4e08
https://github.com/MarkUsProject/Markus/commit/07ecfebbebdc92402e0d70c5e18d8028500e4e08
Author: Nelle Varoquaux <nelle.varoquaux@gmail.com>
Date: 2011-07-21 (Thu, 21 Jul 2011)
Changed paths:
M test/blueprints/blueprints.rb
Log Message:
-----------
FIX assignment blueprint now initializes ``group_name_autogenerated`` correctly
Commit: 2b11cac81e695c86bdf5f44cdf90840f85c6bfb9
https://github.com/MarkUsProject/Markus/commit/2b11cac81e695c86bdf5f44cdf90840f85c6bfb9
Author: Nelle Varoquaux <nelle.varoquaux@gmail.com>
Date: 2011-07-22 (Fri, 22 Jul 2011)
Changed paths:
M test/unit/assignment_test.rb
M test/unit/student_test.rb
Log Message:
-----------
FIX the failing tests
Commit: f64e3d66379faeb1925839a3f5dee2d4907e1f13
https://github.com/MarkUsProject/Markus/commit/f64e3d66379faeb1925839a3f5dee2d4907e1f13
Author: Benjamin Vialle <benjaminvialle@gmail.com>
Date: 2011-07-24 (Sun, 24 Jul 2011)
Changed paths:
M test/blueprints/blueprints.rb
M test/unit/assignment_test.rb
M test/unit/student_test.rb
Log Message:
-----------
Merge pull request #406 from NelleV/blueprints
FIX in Blueprints
Commit: d37dd3a1a6654f5749d8ce0f0d323daf1213f0b3
https://github.com/MarkUsProject/Markus/commit/d37dd3a1a6654f5749d8ce0f0d323daf1213f0b3
Author: Nelle Varoquaux <nelle@phgroup.com>
Date: 2011-07-25 (Mon, 25 Jul 2011)
Changed paths:
M test/functional/results_controller_test.rb
Log Message:
-----------
FIX in pg, the results are now not created twice
Commit: 0b6881aa4796089c5fd9f48d5c143bd496cb9e0c
https://github.com/MarkUsProject/Markus/commit/0b6881aa4796089c5fd9f48d5c143bd496cb9e0c
Author: Benjamin Vialle <benjaminvialle@gmail.com>
Date: 2011-07-25 (Mon, 25 Jul 2011)
Changed paths:
M test/functional/authenticated_controller_test.rb
M test/functional/results_controller_test.rb
Log Message:
-----------
Fix: paths for tests
Commit: 13c8d39b2a8492842061cc75a2483a4e19cd80b4
https://github.com/MarkUsProject/Markus/commit/13c8d39b2a8492842061cc75a2483a4e19cd80b4
Author: Nelle Varoquaux <nelle@phgroup.com>
Date: 2011-07-25 (Mon, 25 Jul 2011)
Changed paths:
M test/functional/results_controller_test.rb
Log Message:
-----------
FIX all the failing tests with pg on results_controller_tests
Commit: ed12de2a767348441d410b913174681ae18dba1d
https://github.com/MarkUsProject/Markus/commit/ed12de2a767348441d410b913174681ae18dba1d
Author: Nelle Varoquaux <nelle@phgroup.com>
Date: 2011-07-25 (Mon, 25 Jul 2011)
Changed paths:
M app/models/submission_file.rb
M test/blueprints/blueprints.rb
Log Message:
-----------
Styling issues
Commit: fa70cd19c997f0f10860c7a9af3827a3fe69625c
https://github.com/MarkUsProject/Markus/commit/fa70cd19c997f0f10860c7a9af3827a3fe69625c
Author: Nelle Varoquaux <nelle@phgroup.com>
Date: 2011-07-25 (Mon, 25 Jul 2011)
Changed paths:
M test/functional/groups_controller_test.rb
M test/functional/results_controller_test.rb
Log Message:
-----------
FIX path issues in group_controller_test and results_controller_test
Commit: 55221483875bd8e4006443493079e5a1f3f56432
https://github.com/MarkUsProject/Markus/commit/55221483875bd8e4006443493079e5a1f3f56432
Author: Benjamin Vialle <benjaminvialle@gmail.com>
Date: 2011-07-25 (Mon, 25 Jul 2011)
Changed paths:
M app/models/submission_file.rb
M test/blueprints/blueprints.rb
M test/functional/authenticated_controller_test.rb
M test/functional/groups_controller_test.rb
M test/functional/results_controller_test.rb
Log Message:
-----------
Merge pull request #407 from NelleV/FIX_pgFailingTests
FIX in pg, the results are now not created twice
Commit: 714fbf2f953223bcf80f324d42ddeef5693c81f9
https://github.com/MarkUsProject/Markus/commit/714fbf2f953223bcf80f324d42ddeef5693c81f9
Author: Benjamin Vialle <benjaminvialle@gmail.com>
Date: 2011-07-25 (Mon, 25 Jul 2011)
Changed paths:
M app/models/submission_file.rb
M test/blueprints/blueprints.rb
M test/functional/authenticated_controller_test.rb
M test/functional/groups_controller_test.rb
M test/functional/results_controller_test.rb
M test/unit/assignment_test.rb
M test/unit/student_test.rb
Log Message:
-----------
Merge branch 'master' of github.com:MarkUsProject/Markus into rails_3_migration
Commit: c67d1dac7699eb04eddc5c28a7c40b2f114d1c6a
https://github.com/MarkUsProject/Markus/commit/c67d1dac7699eb04eddc5c28a7c40b2f114d1c6a
Author: Nelle Varoquaux <nelle@phgroup.com>
Date: 2011-07-25 (Mon, 25 Jul 2011)
Changed paths:
M app/controllers/results_controller.rb
M test/functional/results_controller_test.rb
Log Message:
-----------
FIX some tests were failing randomly on postgres, due to an sql query without order \
by
Commit: 7ae71b4b537901d1f4cc9f061e29a262b28e3841
https://github.com/MarkUsProject/Markus/commit/7ae71b4b537901d1f4cc9f061e29a262b28e3841
Author: Nelle Varoquaux <nelle@phgroup.com>
Date: 2011-07-25 (Mon, 25 Jul 2011)
Changed paths:
M app/controllers/results_controller.rb
Log Message:
-----------
FIX mino mistake for the TA's grouping. The keyword order_by doesn't exist: it is \
order
Commit: b2a4e9be31b959b6589d12ec843eea57ae3aee2b
https://github.com/MarkUsProject/Markus/commit/b2a4e9be31b959b6589d12ec843eea57ae3aee2b
Author: Benjamin Vialle <benjaminvialle@gmail.com>
Date: 2011-07-25 (Mon, 25 Jul 2011)
Changed paths:
M app/controllers/results_controller.rb
M test/functional/results_controller_test.rb
Log Message:
-----------
Merge pull request #408 from NelleV/FIX_failingTests
FIX some tests were failing randomly on postgres, due to an sql query wit
Commit: 1ee66ecb6f7716c70f16556b526340ec888c240f
https://github.com/MarkUsProject/Markus/commit/1ee66ecb6f7716c70f16556b526340ec888c240f
Author: Benjamin Vialle <benjaminvialle@gmail.com>
Date: 2011-07-25 (Mon, 25 Jul 2011)
Changed paths:
M app/controllers/results_controller.rb
M test/functional/results_controller_test.rb
Log Message:
-----------
Merge branch 'master' of github.com:MarkUsProject/Markus into rails_3_migration
Commit: 889f718ca5337877a198e613b83eb4fbb37e1754
https://github.com/MarkUsProject/Markus/commit/889f718ca5337877a198e613b83eb4fbb37e1754
Author: Nelle Varoquaux <nelle.varoquaux@gmail.com>
Date: 2011-07-25 (Mon, 25 Jul 2011)
Changed paths:
M test/functional/assignments_controller_test.rb
Log Message:
-----------
ENH Started to refactor the test on assignment_controller_test
Commit: 545c69d291f863722ba7e7f6959df06cacfc91b7
https://github.com/MarkUsProject/Markus/commit/545c69d291f863722ba7e7f6959df06cacfc91b7
Author: Nelle Varoquaux <nelle.varoquaux@gmail.com>
Date: 2011-07-25 (Mon, 25 Jul 2011)
Changed paths:
M test/functional/assignments_controller_test.rb
Log Message:
-----------
Migrated some more tests, and added a huge massive bug
Commit: 59bbba275af078097f4780a0f59f95cb5e148f31
https://github.com/MarkUsProject/Markus/commit/59bbba275af078097f4780a0f59f95cb5e148f31
Author: Nelle Varoquaux <nelle.varoquaux@gmail.com>
Date: 2011-07-25 (Mon, 25 Jul 2011)
Changed paths:
M test/functional/assignments_controller_test.rb
Log Message:
-----------
FIX a few tests
Commit: dbf186050542d38ed01ef9abcaf0ea6adef4dce0
https://github.com/MarkUsProject/Markus/commit/dbf186050542d38ed01ef9abcaf0ea6adef4dce0
Author: Nelle Varoquaux <nelle.varoquaux@gmail.com>
Date: 2011-07-25 (Mon, 25 Jul 2011)
Changed paths:
M test/functional/assignments_controller_test.rb
Log Message:
-----------
FIX reorganised the tests
Commit: 4a32047b844b82a695ca88928b9ae9cffffb8c5e
https://github.com/MarkUsProject/Markus/commit/4a32047b844b82a695ca88928b9ae9cffffb8c5e
Author: Nelle Varoquaux <nelle.varoquaux@gmail.com>
Date: 2011-07-25 (Mon, 25 Jul 2011)
Changed paths:
M test/functional/assignments_controller_test.rb
Log Message:
-----------
Moved more tests
Commit: 982268ce3857f4fc3bc9c8f2b642485a3da20a4b
https://github.com/MarkUsProject/Markus/commit/982268ce3857f4fc3bc9c8f2b642485a3da20a4b
Author: Nelle Varoquaux <nelle.varoquaux@gmail.com>
Date: 2011-07-25 (Mon, 25 Jul 2011)
Changed paths:
M test/functional/assignments_controller_test.rb
Log Message:
-----------
Few more tests
Commit: ff528bc2169522e2bede9c82e02836a4eacbf76c
https://github.com/MarkUsProject/Markus/commit/ff528bc2169522e2bede9c82e02836a4eacbf76c
Author: Nelle Varoquaux <nelle.varoquaux@gmail.com>
Date: 2011-07-25 (Mon, 25 Jul 2011)
Changed paths:
M test/functional/assignments_controller_test.rb
Log Message:
-----------
More tests migrated
Commit: efea963a451120c795f31c583c89933578989f46
https://github.com/MarkUsProject/Markus/commit/efea963a451120c795f31c583c89933578989f46
Author: Nelle Varoquaux <nelle.varoquaux@gmail.com>
Date: 2011-07-25 (Mon, 25 Jul 2011)
Changed paths:
M app/models/assignment.rb
Log Message:
-----------
reformatting
Commit: 91da89ea536fed53a7978135c0c18669a4e60643
https://github.com/MarkUsProject/Markus/commit/91da89ea536fed53a7978135c0c18669a4e60643
Author: Nelle Varoquaux <nelle.varoquaux@gmail.com>
Date: 2011-07-25 (Mon, 25 Jul 2011)
Changed paths:
M app/models/student_membership.rb
Log Message:
-----------
Formatting issues
Commit: 58cff2b8f7a4ed1120106e07113a7d795ee4dbbf
https://github.com/MarkUsProject/Markus/commit/58cff2b8f7a4ed1120106e07113a7d795ee4dbbf
Author: Nelle Varoquaux <nelle.varoquaux@gmail.com>
Date: 2011-07-25 (Mon, 25 Jul 2011)
Changed paths:
M test/functional/assignments_controller_test.rb
Log Message:
-----------
Moved all the tests to shoulda
Commit: a598907a92cd5d957094abdc99343c5427b22418
https://github.com/MarkUsProject/Markus/commit/a598907a92cd5d957094abdc99343c5427b22418
Author: Benjamin Vialle <benjaminvialle@gmail.com>
Date: 2011-07-26 (Tue, 26 Jul 2011)
Changed paths:
M app/models/assignment.rb
M app/models/student_membership.rb
M test/functional/assignments_controller_test.rb
Log Message:
-----------
Merge pull request #409 from NelleV/244_AssignmentsTests
244 assignments tests
Commit: ddba8677d78f87bec490b5e2b904554854e76e88
https://github.com/MarkUsProject/Markus/commit/ddba8677d78f87bec490b5e2b904554854e76e88
Author: Benjamin Vialle <benjaminvialle@gmail.com>
Date: 2011-07-26 (Tue, 26 Jul 2011)
Changed paths:
M app/models/assignment.rb
M app/models/student_membership.rb
M test/functional/assignments_controller_test.rb
Log Message:
-----------
Merge branch 'master' of github.com:MarkUsProject/Markus into rails_3_migration
Commit: cc4f424c5970d70a7ef65c718c28364317fe0987
https://github.com/MarkUsProject/Markus/commit/cc4f424c5970d70a7ef65c718c28364317fe0987
Author: Nelle Varoquaux <nelle@phgroup.com>
Date: 2011-07-26 (Tue, 26 Jul 2011)
Changed paths:
M test/functional/assignments_controller_test.rb
Log Message:
-----------
Removed all the fixtures
Commit: bdb988963e96a1764a6b66b7ebccf709a3c38147
https://github.com/MarkUsProject/Markus/commit/bdb988963e96a1764a6b66b7ebccf709a3c38147
Author: Benjamin Vialle <benjaminvialle@gmail.com>
Date: 2011-07-26 (Tue, 26 Jul 2011)
Changed paths:
M test/functional/assignments_controller_test.rb
Log Message:
-----------
Merge branch '244_AssignmentsTests' of http://github.com/NelleV/Markus into \
rails_3_migration
Commit: 788bf605c51601b500df2226dd5472704dfd2ac3
https://github.com/MarkUsProject/Markus/commit/788bf605c51601b500df2226dd5472704dfd2ac3
Author: Nelle Varoquaux <nelle@phgroup.com>
Date: 2011-07-26 (Tue, 26 Jul 2011)
Changed paths:
M test/functional/students_controller_test.rb
Log Message:
-----------
Moved students_controller_test to machinist
Commit: 923ed4c782cc421fc7f701f771c0d5cc190f066f
https://github.com/MarkUsProject/Markus/commit/923ed4c782cc421fc7f701f771c0d5cc190f066f
Author: Nelle Varoquaux <nelle@phgroup.com>
Date: 2011-07-26 (Tue, 26 Jul 2011)
Changed paths:
M test/functional/main_controller_test.rb
Log Message:
-----------
Migrated main_controller_test to machinist
Commit: d31549a57716e1c6bab6ad81278520b39eb08d50
https://github.com/MarkUsProject/Markus/commit/d31549a57716e1c6bab6ad81278520b39eb08d50
Author: Benjamin Vialle <benjaminvialle@gmail.com>
Date: 2011-07-26 (Tue, 26 Jul 2011)
Changed paths:
M test/functional/assignments_controller_test.rb
Log Message:
-----------
Merge pull request #410 from NelleV/244_AssignmentsTests
Removed all the fixtures on Assignment Controller Tests
Commit: 6b30c48032707e33763e319bb4b9cb833c86500f
https://github.com/MarkUsProject/Markus/commit/6b30c48032707e33763e319bb4b9cb833c86500f
Author: Benjamin Vialle <benjaminvialle@gmail.com>
Date: 2011-07-27 (Wed, 27 Jul 2011)
Changed paths:
M test/functional/main_controller_test.rb
M test/functional/students_controller_test.rb
Log Message:
-----------
Merge pull request #411 from NelleV/MainControllerTest
Main controller test
Commit: 381455ef99170a8109f8d5810dbbd6e7f56c1e65
https://github.com/MarkUsProject/Markus/commit/381455ef99170a8109f8d5810dbbd6e7f56c1e65
Author: Benjamin Vialle <benjaminvialle@gmail.com>
Date: 2011-07-27 (Wed, 27 Jul 2011)
Changed paths:
M test/functional/main_controller_test.rb
M test/functional/students_controller_test.rb
Log Message:
-----------
Merge branch 'master' of github.com:MarkUsProject/Markus into rails_3_migration
Commit: 79b5a62bd8fdfec8e16650b66d8c2a0d7e929cc2
https://github.com/MarkUsProject/Markus/commit/79b5a62bd8fdfec8e16650b66d8c2a0d7e929cc2
Author: Nelle Varoquaux <nelle@phgroup.com>
Date: 2011-07-27 (Wed, 27 Jul 2011)
Changed paths:
A app/controllers/sections_controller.rb
R app/controllers/users_controller.rb
M app/views/layouts/_menu.html.erb
A app/views/sections/_form.html.erb
A app/views/sections/create_section.html.erb
A app/views/sections/edit_section.html.erb
A app/views/sections/index.html.erb
A app/views/sections/table_row/_edit.html.erb
A app/views/sections/table_row/_filter_table_row.html.erb
R app/views/users/_form.html.erb
R app/views/users/create_section.html.erb
R app/views/users/edit_section.html.erb
R app/views/users/index.html.erb
R app/views/users/table_row/_edit.html.erb
R app/views/users/table_row/_filter_table_row.html.erb
A test/functional/sections_controller_test.rb
R test/functional/users_controller_test.rb
Log Message:
-----------
Moved users controller to sections controller
Commit: 893fa4e0c91ff85ff56322023d644251fd3ebc39
https://github.com/MarkUsProject/Markus/commit/893fa4e0c91ff85ff56322023d644251fd3ebc39
Author: Nelle Varoquaux <nelle.varoquaux@gmail.com>
Date: 2011-07-27 (Wed, 27 Jul 2011)
Changed paths:
M test/functional/admins_controller_test.rb
Log Message:
-----------
Added a few more tests on the AdminController
Commit: 470f09104de042722385a91a5c3ed71907f3551f
https://github.com/MarkUsProject/Markus/commit/470f09104de042722385a91a5c3ed71907f3551f
Author: Nelle Varoquaux <nelle.varoquaux@gmail.com>
Date: 2011-07-27 (Wed, 27 Jul 2011)
Changed paths:
M app/views/annotation_categories/_annotation_category.html.erb
M app/views/annotation_categories/_annotation_category_edit.html.erb
M app/views/annotation_categories/_annotation_text.html.erb
M app/views/annotation_categories/_new_annotation_category.html.erb
M app/views/annotation_categories/_new_annotation_text.html.erb
M test/functional/annotation_categories_controller_test.rb
Log Message:
-----------
Fixed some AnnotationCategoriesController tests
Commit: dcb8eb6e7c240ff6edf6420193b7201743e12d6b
https://github.com/MarkUsProject/Markus/commit/dcb8eb6e7c240ff6edf6420193b7201743e12d6b
Author: Nelle Varoquaux <nelle.varoquaux@gmail.com>
Date: 2011-07-27 (Wed, 27 Jul 2011)
Changed paths:
M test/functional/annotations_controller_test.rb
Log Message:
-----------
Fixed the *errors* in annotations_controller_test
Commit: 7a5faa539810dc0e5c3c5f32cadd79d26d55e59e
https://github.com/MarkUsProject/Markus/commit/7a5faa539810dc0e5c3c5f32cadd79d26d55e59e
Author: Nelle Varoquaux <nelle.varoquaux@gmail.com>
Date: 2011-07-27 (Wed, 27 Jul 2011)
Changed paths:
M app/views/flexible_criteria/_criterion_editor.html.erb
M app/views/flexible_criteria/_flexible_criteria_pane.html.erb
M app/views/flexible_criteria/_flexible_criterion.html.erb
M app/views/flexible_criteria/_new_flexible_criterion.html.erb
Log Message:
-----------
Fixed all the errors in FlexibleCriteriaControllerTests
Commit: dd322d4abd49b60a6a6c1e935dc3e69087d1e750
https://github.com/MarkUsProject/Markus/commit/dd322d4abd49b60a6a6c1e935dc3e69087d1e750
Author: Benjamin Vialle <benjaminvialle@gmail.com>
Date: 2011-07-27 (Wed, 27 Jul 2011)
Changed paths:
M app/views/flexible_criteria/_criterion_editor.html.erb
M app/views/flexible_criteria/_flexible_criteria_pane.html.erb
M app/views/flexible_criteria/_flexible_criterion.html.erb
M app/views/flexible_criteria/_new_flexible_criterion.html.erb
Log Message:
-----------
Merge pull request #9 from NelleV/FlexibleCriteriaControllerTests
Flexible criteria controller tests
Commit: cc95ba3cde37fd5c2f9a969ef8bfb107a2d9c09c
https://github.com/MarkUsProject/Markus/commit/cc95ba3cde37fd5c2f9a969ef8bfb107a2d9c09c
Author: Benjamin Vialle <benjaminvialle@gmail.com>
Date: 2011-07-27 (Wed, 27 Jul 2011)
Changed paths:
M test/functional/annotations_controller_test.rb
Log Message:
-----------
Merge pull request #8 from NelleV/AnnotationsControllerTest
Annotations controller test
Commit: 687b6c9263ce835b5753595b3ffefb77a52460c7
https://github.com/MarkUsProject/Markus/commit/687b6c9263ce835b5753595b3ffefb77a52460c7
Author: Benjamin Vialle <benjaminvialle@gmail.com>
Date: 2011-07-27 (Wed, 27 Jul 2011)
Changed paths:
M app/views/annotation_categories/_annotation_category.html.erb
M app/views/annotation_categories/_annotation_category_edit.html.erb
M app/views/annotation_categories/_annotation_text.html.erb
M app/views/annotation_categories/_new_annotation_category.html.erb
M app/views/annotation_categories/_new_annotation_text.html.erb
M test/functional/annotation_categories_controller_test.rb
Log Message:
-----------
Merge pull request #7 from NelleV/AnnotationsCategoriesControllerTests
Annotations categories controller tests
Commit: 939ddef07401833ef514f75558954aa98be70484
https://github.com/MarkUsProject/Markus/commit/939ddef07401833ef514f75558954aa98be70484
Author: Benjamin Vialle <benjaminvialle@gmail.com>
Date: 2011-07-27 (Wed, 27 Jul 2011)
Changed paths:
M test/functional/admins_controller_test.rb
Log Message:
-----------
Merge pull request #412 from NelleV/AddMoreTests
Added a few more tests on the AdminController
Commit: a027dbcd8a96e6f7d5c1214cb0e930d095b4d378
https://github.com/MarkUsProject/Markus/commit/a027dbcd8a96e6f7d5c1214cb0e930d095b4d378
Author: Nelle Varoquaux <nelle.varoquaux@gmail.com>
Date: 2011-07-27 (Wed, 27 Jul 2011)
Changed paths:
A test/fixtures/autogenerated_repos_groups.csv
A test/fixtures/criteria_grader_map.csv
A test/fixtures/group_grader_map.csv
A test/fixtures/mixed_repos_groups.csv
A test/fixtures/non_admin_repos_groups.csv
A test/fixtures/username_repos_groups.csv
M test/functional/groups_controller_csv_upload_test.rb
R test/group_csvs/autogenerated_repos_groups.csv
R test/group_csvs/criteria_grader_map.csv
R test/group_csvs/group_grader_map.csv
R test/group_csvs/mixed_repos_groups.csv
R test/group_csvs/non_admin_repos_groups.csv
R test/group_csvs/username_repos_groups.csv
Log Message:
-----------
Fixed all the errors of groups_controller_csv_upload_tests.rb
Commit: a7ee2dfe40b4f18bbee1857f3cb0b452a3cdf0a2
https://github.com/MarkUsProject/Markus/commit/a7ee2dfe40b4f18bbee1857f3cb0b452a3cdf0a2
Author: Nelle Varoquaux <nelle.varoquaux@gmail.com>
Date: 2011-07-27 (Wed, 27 Jul 2011)
Changed paths:
M app/views/groups/manage.html.erb
M app/views/groups/table_row/_filter_table_row.html.erb
Log Message:
-----------
Fixed some groups controller tests
Commit: 7ab3581b12248e2dfa4ded8fccf295793c4c9d34
https://github.com/MarkUsProject/Markus/commit/7ab3581b12248e2dfa4ded8fccf295793c4c9d34
Author: Nelle Varoquaux <nelle.varoquaux@gmail.com>
Date: 2011-07-27 (Wed, 27 Jul 2011)
Changed paths:
M app/views/note/index.html.erb
M app/views/note/modal_dialogs/_notes_dialog.html.erb
Log Message:
-----------
Fixed some of the errorsin NoteControllerTests
Commit: 5c12ce96ffd4eb0408121a2804ecb40b6559fa82
https://github.com/MarkUsProject/Markus/commit/5c12ce96ffd4eb0408121a2804ecb40b6559fa82
Author: Nelle Varoquaux <nelle.varoquaux@gmail.com>
Date: 2011-07-27 (Wed, 27 Jul 2011)
Changed paths:
M app/controllers/results_controller.rb
Log Message:
-----------
Fixed some warning in ResultsControllerTests
Commit: c623053904db019f2fa1739246aef9f3f837aede
https://github.com/MarkUsProject/Markus/commit/c623053904db019f2fa1739246aef9f3f837aede
Author: Nelle Varoquaux <nelle.varoquaux@gmail.com>
Date: 2011-07-27 (Wed, 27 Jul 2011)
Changed paths:
M app/views/results/common/_submission_selector.html.erb
M app/views/results/marker/_annotation_summary.html.erb
M app/views/results/marker/_new_extra_mark.html.erb
M app/views/results/student/_remark_request_form.html.erb
Log Message:
-----------
Some errors fixed in ResultsControllerTests
Commit: 73acdfd78338b38294ff5279d74bc9c58e321236
https://github.com/MarkUsProject/Markus/commit/73acdfd78338b38294ff5279d74bc9c58e321236
Author: Nelle Varoquaux <nelle.varoquaux@gmail.com>
Date: 2011-07-27 (Wed, 27 Jul 2011)
Changed paths:
M app/views/rubrics/_criterion_editor.html.erb
M app/views/rubrics/_new_rubric_criterion.html.erb
M app/views/rubrics/_rubric_criterion.html.erb
Log Message:
-----------
Fixed more errors in RubricsControllerTests
Commit: dad9aee904081a33a96d10a236c39c67b7c3d579
https://github.com/MarkUsProject/Markus/commit/dad9aee904081a33a96d10a236c39c67b7c3d579
Author: Nelle Varoquaux <nelle.varoquaux@gmail.com>
Date: 2011-07-27 (Wed, 27 Jul 2011)
Changed paths:
M app/views/rubrics/index.html.erb
Log Message:
-----------
Removed some deprecation warnings
Commit: d51f652f43d4e0618e17c73dac094e8df3081e63
https://github.com/MarkUsProject/Markus/commit/d51f652f43d4e0618e17c73dac094e8df3081e63
Author: Nelle Varoquaux <nelle.varoquaux@gmail.com>
Date: 2011-07-27 (Wed, 27 Jul 2011)
Changed paths:
M app/views/students/_student_form.html.erb
M app/views/students/index.html.erb
Log Message:
-----------
Fixed deprecation warnings
Commit: 2d3fb4ab90a39bb927915b0365fecc598364a79b
https://github.com/MarkUsProject/Markus/commit/2d3fb4ab90a39bb927915b0365fecc598364a79b
Author: Nelle Varoquaux <nelle.varoquaux@gmail.com>
Date: 2011-07-27 (Wed, 27 Jul 2011)
Changed paths:
M app/controllers/submissions_controller.rb
M app/views/submissions/repo_browser.html.erb
Log Message:
-----------
Fixed some warnings and a few errors in SubmissionsController
Commit: 860758eea5a025a05bc7f662dcc6a7b0059d1946
https://github.com/MarkUsProject/Markus/commit/860758eea5a025a05bc7f662dcc6a7b0059d1946
Author: Benjamin Vialle <benjaminvialle@gmail.com>
Date: 2011-07-28 (Thu, 28 Jul 2011)
Changed paths:
M app/controllers/results_controller.rb
M app/controllers/submissions_controller.rb
M app/views/groups/manage.html.erb
M app/views/groups/table_row/_filter_table_row.html.erb
M app/views/note/index.html.erb
M app/views/note/modal_dialogs/_notes_dialog.html.erb
M app/views/results/common/_submission_selector.html.erb
M app/views/results/marker/_annotation_summary.html.erb
M app/views/results/marker/_new_extra_mark.html.erb
M app/views/results/student/_remark_request_form.html.erb
M app/views/rubrics/_criterion_editor.html.erb
M app/views/rubrics/_new_rubric_criterion.html.erb
M app/views/rubrics/_rubric_criterion.html.erb
M app/views/rubrics/index.html.erb
M app/views/students/_student_form.html.erb
M app/views/students/index.html.erb
M app/views/submissions/repo_browser.html.erb
Log Message:
-----------
Merge pull request #11 from NelleV/GroupsControllerTests
Groups controller tests
Commit: 3495d183a93b4050ad82f9339c411815fb24fd8c
https://github.com/MarkUsProject/Markus/commit/3495d183a93b4050ad82f9339c411815fb24fd8c
Author: Benjamin Vialle <benjaminvialle@gmail.com>
Date: 2011-07-28 (Thu, 28 Jul 2011)
Changed paths:
A test/fixtures/autogenerated_repos_groups.csv
A test/fixtures/criteria_grader_map.csv
A test/fixtures/group_grader_map.csv
A test/fixtures/mixed_repos_groups.csv
A test/fixtures/non_admin_repos_groups.csv
A test/fixtures/username_repos_groups.csv
M test/functional/groups_controller_csv_upload_test.rb
R test/group_csvs/autogenerated_repos_groups.csv
R test/group_csvs/criteria_grader_map.csv
R test/group_csvs/group_grader_map.csv
R test/group_csvs/mixed_repos_groups.csv
R test/group_csvs/non_admin_repos_groups.csv
R test/group_csvs/username_repos_groups.csv
Log Message:
-----------
Merge pull request #10 from NelleV/rails_3_migration
Fixed all the errors of groups_controller_csv_upload_tests.rb
Commit: 0c4b032b5db94697baef40a5b7733903f841f2ff
https://github.com/MarkUsProject/Markus/commit/0c4b032b5db94697baef40a5b7733903f841f2ff
Author: Benjamin Vialle <benjaminvialle@gmail.com>
Date: 2011-07-28 (Thu, 28 Jul 2011)
Changed paths:
M test/functional/admins_controller_test.rb
Log Message:
-----------
Merge branch 'master' of github.com:MarkUsProject/Markus into rails_3_migration
Commit: c5687afe0fbf99c150e8976e423aef87aafe8dd8
https://github.com/MarkUsProject/Markus/commit/c5687afe0fbf99c150e8976e423aef87aafe8dd8
Author: Nelle Varoquaux <nelle@phgroup.com>
Date: 2011-07-28 (Thu, 28 Jul 2011)
Changed paths:
R test/fixtures/autogenerated_repos_groups.csv
R test/fixtures/criteria_grader_map.csv
R test/fixtures/group_grader_map.csv
R test/fixtures/mixed_repos_groups.csv
R test/fixtures/non_admin_repos_groups.csv
R test/fixtures/username_repos_groups.csv
M test/functional/groups_controller_csv_upload_test.rb
A test/group_csvs/autogenerated_repos_groups.csv
A test/group_csvs/criteria_grader_map.csv
A test/group_csvs/group_grader_map.csv
A test/group_csvs/mixed_repos_groups.csv
A test/group_csvs/non_admin_repos_groups.csv
A test/group_csvs/username_repos_groups.csv
Log Message:
-----------
Moved the csv files out of the fixtures folder, as they were loaded automatically \
when using fixtures :all
Commit: e69b392d88fb53452aa26749f705281d7550e7e8
https://github.com/MarkUsProject/Markus/commit/e69b392d88fb53452aa26749f705281d7550e7e8
Author: Benjamin Vialle <benjaminvialle@gmail.com>
Date: 2011-07-28 (Thu, 28 Jul 2011)
Changed paths:
R test/fixtures/autogenerated_repos_groups.csv
R test/fixtures/criteria_grader_map.csv
R test/fixtures/group_grader_map.csv
R test/fixtures/mixed_repos_groups.csv
R test/fixtures/non_admin_repos_groups.csv
R test/fixtures/username_repos_groups.csv
M test/functional/groups_controller_csv_upload_test.rb
A test/group_csvs/autogenerated_repos_groups.csv
A test/group_csvs/criteria_grader_map.csv
A test/group_csvs/group_grader_map.csv
A test/group_csvs/mixed_repos_groups.csv
A test/group_csvs/non_admin_repos_groups.csv
A test/group_csvs/username_repos_groups.csv
Log Message:
-----------
Merge pull request #12 from NelleV/rails_3_migration
Rails 3 migration
Commit: 5e41adfd1d4a63cd053da99bccd76b0c34621881
https://github.com/MarkUsProject/Markus/commit/5e41adfd1d4a63cd053da99bccd76b0c34621881
Author: Benjamin Vialle <benjaminvialle@gmail.com>
Date: 2011-07-28 (Thu, 28 Jul 2011)
Changed paths:
A app/controllers/sections_controller.rb
R app/controllers/users_controller.rb
M app/views/layouts/_menu.html.erb
A app/views/sections/_form.html.erb
A app/views/sections/create_section.html.erb
A app/views/sections/edit_section.html.erb
A app/views/sections/index.html.erb
A app/views/sections/table_row/_edit.html.erb
A app/views/sections/table_row/_filter_table_row.html.erb
R app/views/users/_form.html.erb
R app/views/users/create_section.html.erb
R app/views/users/edit_section.html.erb
R app/views/users/index.html.erb
R app/views/users/table_row/_edit.html.erb
R app/views/users/table_row/_filter_table_row.html.erb
A test/functional/sections_controller_test.rb
R test/functional/users_controller_test.rb
Log Message:
-----------
Merge pull request #413 from NelleV/MoveUserControllerToSectionController
Moved users controller to sections controller
Commit: 9fc0a9c3ef8626368c777a7a649ba8bc7daf3812
https://github.com/MarkUsProject/Markus/commit/9fc0a9c3ef8626368c777a7a649ba8bc7daf3812
Author: Nelle Varoquaux <nelle@phgroup.com>
Date: 2011-07-28 (Thu, 28 Jul 2011)
Changed paths:
M app/views/layouts/_menu.html.erb
M app/views/layouts/_sub_menu.html.erb
M app/views/layouts/content.html.erb
M config/locales/en.yml
M public/stylesheets/main.css
Log Message:
-----------
ENH Added subtabs to the menu
Commit: 9fc1d0c77789e0e87aafc440192dd97519104ecf
https://github.com/MarkUsProject/Markus/commit/9fc1d0c77789e0e87aafc440192dd97519104ecf
Author: Nelle Varoquaux <nelle@phgroup.com>
Date: 2011-07-28 (Thu, 28 Jul 2011)
Changed paths:
A app/views/layouts/_sub_sub_menu.html.erb
Log Message:
-----------
FIX added the sub_sub_menu file
Commit: 303b1e47a9332db2cc6fd47e5c4875efff8bcc1f
https://github.com/MarkUsProject/Markus/commit/303b1e47a9332db2cc6fd47e5c4875efff8bcc1f
Author: Nelle Varoquaux <nelle@phgroup.com>
Date: 2011-07-28 (Thu, 28 Jul 2011)
Changed paths:
M config/locales/en.yml
Log Message:
-----------
FIX typoo in the locals
Commit: 7511fc15277b7d98d3e75cf16c7d4ca07ac50376
https://github.com/MarkUsProject/Markus/commit/7511fc15277b7d98d3e75cf16c7d4ca07ac50376
Author: Nelle Varoquaux <nelle@phgroup.com>
Date: 2011-07-28 (Thu, 28 Jul 2011)
Changed paths:
M config/locales/fr.yml
Log Message:
-----------
ENH added french translation for settings
Commit: 566626bf8fa7a6ad0a241c0f272ca90ebeaba4db
https://github.com/MarkUsProject/Markus/commit/566626bf8fa7a6ad0a241c0f272ca90ebeaba4db
Author: Nelle Varoquaux <nelle@phgroup.com>
Date: 2011-07-28 (Thu, 28 Jul 2011)
Changed paths:
M config/locales/fr.yml
Log Message:
-----------
FIX spaces/tabs in locale/fr.yml
Commit: 668e85f652d821fa0ea462e82a53dabad3f018c3
https://github.com/MarkUsProject/Markus/commit/668e85f652d821fa0ea462e82a53dabad3f018c3
Author: Benjamin Vialle <benjaminvialle@gmail.com>
Date: 2011-07-28 (Thu, 28 Jul 2011)
Changed paths:
A app/controllers/sections_controller.rb
R app/controllers/users_controller.rb
M app/views/layouts/_menu.html.erb
A app/views/sections/_form.html.erb
A app/views/sections/create_section.html.erb
A app/views/sections/edit_section.html.erb
A app/views/sections/index.html.erb
A app/views/sections/table_row/_edit.html.erb
A app/views/sections/table_row/_filter_table_row.html.erb
R app/views/users/_form.html.erb
R app/views/users/create_section.html.erb
R app/views/users/edit_section.html.erb
R app/views/users/index.html.erb
R app/views/users/table_row/_edit.html.erb
R app/views/users/table_row/_filter_table_row.html.erb
A test/functional/sections_controller_test.rb
R test/functional/users_controller_test.rb
Log Message:
-----------
Merge branch 'master' of github.com:MarkUsProject/Markus into rails_3_migration
Commit: ae770360f318e83fbeb77e9dd839cca7327f0890
https://github.com/MarkUsProject/Markus/commit/ae770360f318e83fbeb77e9dd839cca7327f0890
Author: Nelle Varoquaux <nelle@phgroup.com>
Date: 2011-07-28 (Thu, 28 Jul 2011)
Changed paths:
M config/environments/test.rb
Log Message:
-----------
Disabled request forgery protection in test environment
Commit: f68cf5f270fb7b7829159102c44206ac0fd1e435
https://github.com/MarkUsProject/Markus/commit/f68cf5f270fb7b7829159102c44206ac0fd1e435
Author: Benjamin Vialle <benjaminvialle@gmail.com>
Date: 2011-07-28 (Thu, 28 Jul 2011)
Changed paths:
M app/views/layouts/_menu.html.erb
M app/views/layouts/_sub_menu.html.erb
A app/views/layouts/_sub_sub_menu.html.erb
M app/views/layouts/content.html.erb
M config/locales/en.yml
M config/locales/fr.yml
M public/stylesheets/main.css
Log Message:
-----------
Merge pull request #414 from NelleV/SubTabs
Sub tabs
Commit: 98787c6f15af8534bae285e2b35466c3e22ba6a9
https://github.com/MarkUsProject/Markus/commit/98787c6f15af8534bae285e2b35466c3e22ba6a9
Author: Benjamin Vialle <benjaminvialle@gmail.com>
Date: 2011-07-28 (Thu, 28 Jul 2011)
Changed paths:
M config/environments/test.rb
Log Message:
-----------
Merge pull request #13 from NelleV/FIX_rails_3
Disabled request forgery protection in test environment
Commit: 63db20e80c12a9f3f6185aeb6b4591c0d76f6d6e
https://github.com/MarkUsProject/Markus/commit/63db20e80c12a9f3f6185aeb6b4591c0d76f6d6e
Author: Benjamin Vialle <benjaminvialle@gmail.com>
Date: 2011-07-28 (Thu, 28 Jul 2011)
Changed paths:
M app/views/layouts/_menu.html.erb
M app/views/layouts/_sub_menu.html.erb
A app/views/layouts/_sub_sub_menu.html.erb
M app/views/layouts/content.html.erb
M config/locales/en.yml
M config/locales/fr.yml
M public/stylesheets/main.css
Log Message:
-----------
Merge branch 'master' of github.com:MarkUsProject/Markus into rails_3_migration
Commit: 623ee4bbebe0fbf481de4b55cd668ddbe41ca64f
https://github.com/MarkUsProject/Markus/commit/623ee4bbebe0fbf481de4b55cd668ddbe41ca64f
Author: Nelle Varoquaux <nelle@phgroup.com>
Date: 2011-07-28 (Thu, 28 Jul 2011)
Changed paths:
M app/controllers/api/users_controller.rb
M app/views/annotation_categories/_annotation_category_edit.html.erb
M app/views/api/_key_display.html.erb
M app/views/flexible_criteria/_criterion_editor.html.erb
M app/views/flexible_criteria/_new_flexible_criterion_errors.html.erb
M app/views/results/marker/_annotation_summary.html.erb
M app/views/rubrics/_criterion_editor.html.erb
M app/views/rubrics/_new_rubric_criterion_errors.html.erb
M test/functional/annotation_categories_controller_test.rb
M test/functional/assignments_controller_test.rb
M test/functional/flexible_criteria_controller_test.rb
M test/functional/graders_controller_test.rb
M test/functional/groups_controller_test.rb
M test/functional/note_controller_test.rb
M test/functional/role_switching_test.rb
M test/functional/rubrics_controller_test.rb
M test/test_helper.rb
Log Message:
-----------
FIX some failures, errors and deprecation warnings in the tests
Commit: 2321ff96ab03a4f6ee5c372d838d6babb5412a1e
https://github.com/MarkUsProject/Markus/commit/2321ff96ab03a4f6ee5c372d838d6babb5412a1e
Author: Nelle Varoquaux <nelle@phgroup.com>
Date: 2011-07-28 (Thu, 28 Jul 2011)
Changed paths:
M app/controllers/api/users_controller.rb
M test/functional/api/users_controller_test.rb
Log Message:
-----------
FIX all the failures in test/functional/api/users_controller_test.rb
Commit: 960d12b50b7588e205d086828ec0d31b5b9cd470
https://github.com/MarkUsProject/Markus/commit/960d12b50b7588e205d086828ec0d31b5b9cd470
Author: Benjamin Vialle <benjaminvialle@gmail.com>
Date: 2011-07-28 (Thu, 28 Jul 2011)
Changed paths:
M app/controllers/api/users_controller.rb
M app/views/annotation_categories/_annotation_category_edit.html.erb
M app/views/api/_key_display.html.erb
M app/views/flexible_criteria/_criterion_editor.html.erb
M app/views/flexible_criteria/_new_flexible_criterion_errors.html.erb
M app/views/results/marker/_annotation_summary.html.erb
M app/views/rubrics/_criterion_editor.html.erb
M app/views/rubrics/_new_rubric_criterion_errors.html.erb
M test/functional/annotation_categories_controller_test.rb
M test/functional/api/users_controller_test.rb
M test/functional/assignments_controller_test.rb
M test/functional/flexible_criteria_controller_test.rb
M test/functional/graders_controller_test.rb
M test/functional/groups_controller_test.rb
M test/functional/note_controller_test.rb
M test/functional/role_switching_test.rb
M test/functional/rubrics_controller_test.rb
M test/test_helper.rb
Log Message:
-----------
Merge pull request #14 from NelleV/FIX_rails_3
Fix rails 3
Commit: c1ac07c0812d66040854fc918976d2278b557880
https://github.com/MarkUsProject/Markus/commit/c1ac07c0812d66040854fc918976d2278b557880
Author: Severin Gehwolf <jerboaa@gmail.com>
Date: 2011-08-05 (Fri, 05 Aug 2011)
Changed paths:
M Changelog
M Gemfile
M Gemfile.lock
M INSTALL
A LICENSE
R README
A README.rst
M Rakefile
M app/MARKUS_VERSION
M app/controllers/admins_controller.rb
M app/controllers/annotation_categories_controller.rb
M app/controllers/annotations_controller.rb
M app/controllers/api/main_api_controller.rb
M app/controllers/api/submission_downloads_controller.rb
M app/controllers/api/test_results_controller.rb
A app/controllers/api/users_controller.rb
M app/controllers/assignments_controller.rb
M app/controllers/flexible_criteria_controller.rb
M app/controllers/grade_entry_forms_controller.rb
M app/controllers/graders_controller.rb
M app/controllers/groups_controller.rb
M app/controllers/main_controller.rb
M app/controllers/results_controller.rb
M app/controllers/rubrics_controller.rb
A app/controllers/sections_controller.rb
M app/controllers/submissions_controller.rb
M app/controllers/tas_controller.rb
R app/controllers/users_controller.rb
M app/helpers/annotation_categories_helper.rb
M app/helpers/assignments_helper.rb
M app/helpers/grade_entry_forms_helper.rb
M app/helpers/graders_helper.rb
M app/helpers/groups_helper.rb
M app/helpers/main_helper.rb
M app/helpers/pagination_helper.rb
M app/helpers/results_helper.rb
M app/helpers/students_helper.rb
M app/helpers/submissions_helper.rb
M app/helpers/users_helper.rb
M app/models/admin.rb
M app/models/annotation_category.rb
M app/models/annotation_text.rb
M app/models/assignment.rb
M app/models/assignment_file.rb
M app/models/extra_mark.rb
M app/models/flexible_criterion.rb
M app/models/grace_period_submission_rule.rb
M app/models/grade.rb
M app/models/grade_entry_form.rb
M app/models/grade_entry_item.rb
M app/models/grade_entry_student.rb
M app/models/group.rb
M app/models/grouping.rb
M app/models/mark.rb
M app/models/membership.rb
M app/models/no_late_submission_rule.rb
M app/models/note.rb
M app/models/penalty_decay_period_submission_rule.rb
M app/models/penalty_period_submission_rule.rb
M app/models/result.rb
M app/models/rubric_criterion.rb
M app/models/section.rb
M app/models/student_membership.rb
M app/models/submission.rb
M app/models/submission_collector.rb
M app/models/submission_file.rb
M app/models/ta.rb
M app/models/ta_membership.rb
M app/models/token.rb
M app/models/user.rb
M app/views/annotation_categories/_annotation_category.html.erb
M app/views/annotation_categories/_annotation_category_edit.html.erb
M app/views/annotation_categories/_annotation_text.html.erb
M app/views/annotation_categories/_new_annotation_category.html.erb
M app/views/annotation_categories/_new_annotation_text.html.erb
M app/views/annotation_categories/index.html.erb
M app/views/api/_key_display.html.erb
M app/views/assignments/_form.html.erb
M app/views/assignments/student_interface.html.erb
M app/views/flexible_criteria/_criterion_editor.html.erb
M app/views/flexible_criteria/_errors_list.html.erb
M app/views/flexible_criteria/_flexible_criteria_pane.html.erb
M app/views/flexible_criteria/_flexible_criterion.html.erb
M app/views/flexible_criteria/_new_flexible_criterion.html.erb
M app/views/flexible_criteria/_new_flexible_criterion_errors.html.erb
M app/views/flexible_criteria/index.html.erb
M app/views/grade_entry_forms/_form.html.erb
M app/views/grade_entry_forms/_grade_entry_item.html.erb
M app/views/groups/manage.html.erb
M app/views/groups/student_interface.html.erb
M app/views/groups/table_row/_filter_table_row.html.erb
M app/views/layouts/_header.html.erb
M app/views/layouts/_menu.html.erb
A app/views/layouts/_role_switch.html.erb
M app/views/layouts/_sub_menu.html.erb
A app/views/layouts/_sub_sub_menu.html.erb
M app/views/layouts/content.html.erb
A app/views/main/_role_switch_content.html.erb
A app/views/main/_role_switch_error.html.erb
A app/views/main/_role_switch_handler.rjs
M app/views/main/index.html.erb
A app/views/main/role_switch.rjs
M app/views/note/edit.html.erb
M app/views/note/index.html.erb
M app/views/note/modal_dialogs/_notes_dialog.html.erb
M app/views/results/common/_annotations.js.erb
A app/views/results/common/_old_marks_view_functions.html.erb
M app/views/results/common/_rubric_criterion.html.erb
M app/views/results/common/_submission_selector.html.erb
M app/views/results/edit.html.erb
M app/views/results/marker/_annotation_summary.html.erb
M app/views/results/marker/_marker_panes.html.erb
M app/views/results/marker/_marker_rubric_criterion_li.html.erb
M app/views/results/marker/_marker_summary.html.erb
M app/views/results/marker/_new_extra_mark.html.erb
M app/views/results/marker/_update_mark.rjs
A app/views/results/marker/show_result_error.rjs
M app/views/results/student/_remark_request_form.html.erb
M app/views/results/student/_student_panes.html.erb
M app/views/results/student/_student_rubric_criterion_li.html.erb
M app/views/results/student/_student_summary.html.erb
M app/views/results/update_marking_state.rjs
M app/views/results/view_marks.html.erb
M app/views/rubrics/_criterion_editor.html.erb
M app/views/rubrics/_errors_list.html.erb
M app/views/rubrics/_new_rubric_criterion.html.erb
M app/views/rubrics/_new_rubric_criterion_errors.html.erb
M app/views/rubrics/_rubric_criterion.html.erb
M app/views/rubrics/index.html.erb
A app/views/sections/_form.html.erb
A app/views/sections/create_section.html.erb
A app/views/sections/edit_section.html.erb
A app/views/sections/index.html.erb
A app/views/sections/table_row/_edit.html.erb
A app/views/sections/table_row/_filter_table_row.html.erb
M app/views/students/_student_form.html.erb
M app/views/students/index.html.erb
M app/views/submissions/_file_manager_boot.js.erb
M app/views/submissions/_submission_warning.js.erb
M app/views/submissions/file_manager.html.erb
M app/views/submissions/repo_browser.html.erb
M app/views/submissions/submissions_table_row/_table_row.html.erb
M app/views/test_framework/_form.html.erb
M app/views/test_framework/_test_file.html.erb
R app/views/users/_form.html.erb
R app/views/users/create_section.html.erb
R app/views/users/edit_section.html.erb
R app/views/users/index.html.erb
R app/views/users/table_row/_edit.html.erb
R app/views/users/table_row/_filter_table_row.html.erb
M config/boot.rb
M config/environments/test.rb
M config/initializers/03_inflections.rb
M config/locales/en.yml
M config/locales/fr.yml
A config/mongrel_cluster.yml
M config/routes.rb
R db/db_schema_postgresql.sql
M db/migrate/20080729160237_create_users.rb
M db/migrate/20080729162322_create_assignments.rb
M db/migrate/20080806143028_create_assignment_files.rb
M db/migrate/20080812143621_create_groups.rb
M db/migrate/20080812143641_create_submissions.rb
M db/migrate/20081001150504_create_categories.rb
M db/migrate/20081001150627_create_descriptions.rb
M db/migrate/20081009115817_create_annotations.rb
M db/migrate/20081009204628_modify_groups.rb
M db/migrate/20081009204639_modify_submissions.rb
M db/migrate/20081009204730_create_memberships.rb
M db/migrate/20081009204739_create_assignments_groups.rb
M db/migrate/20081009204754_create_submission_files.rb
M db/migrate/20081126183411_modify_rubric_criteria.rb
M db/migrate/20081126200403_modify_annotations.rb
M db/migrate/20081130222245_add_columns_assignments.rb
M db/migrate/20081130222302_create_submission_rules.rb
M db/migrate/20090116063343_modify_annotations_for_labels.rb
M db/migrate/20090203023227_create_grades.rb
M db/migrate/20090211221709_add_status_to_grades.rb
M db/migrate/20090212060750_create_results.rb
M db/migrate/20090220200053_create_groupings.rb
M db/migrate/20090511210106_remove_description_table.rb
M db/migrate/20090512193837_remove_assignments_groups.rb
M db/migrate/20090513155255_change_annotation_label_to_annotation_text.rb
M db/migrate/20090723155356_remove_unneeded_columns_from_submission_rules.rb
M db/migrate/20091024193107_create_grade_entry_forms.rb
M db/migrate/20091101221901_create_grade_entry_items.rb
M db/migrate/20091101234310_create_grade_entry_students.rb
M db/migrate/20091105023240_create_grades_simple_grade_entry.rb
M db/migrate/20091105182703_improve_db_indexes.rb
M db/migrate/20091111065154_create_notes.rb
M db/migrate/20091118064643_rename_columns_note.rb
M db/populate/03_tas.rb
M db/populate/04_assignments.rb
A db/populate/05_groups.rb
A db/populate/06_repos.rb
A db/populate/07_criterias.rb
A db/populate/08_annotations.rb
A db/populate/data/deferred-process.jpg
A db/populate/data/internet.py
A db/populate/data/reactors.py
A db/populate/data/service.py
A db/sample_submission_files/HelloWorld.java
A db/sample_submission_files/hello.py
M features/support/env.rb
M features/support/paths.rb
M features/support/version_check.rb
M lib/repo/memory_repository.rb
M lib/repo/repository.rb
M lib/repo/subversion_repository.rb
M lib/repo/test/memory_repository_test.rb
M lib/repo/test/subversion_repository_test.rb
M lib/session_handler.rb
M lib/tasks/results.rake
R mongrel_cluster.yml
A public/409.xml
M public/javascripts/file_manager.js
M public/javascripts/rails.js
M public/stylesheets/grader.css
M public/stylesheets/main.css
M test/blueprints/blueprints.rb
M test/blueprints/helper.rb
A test/files/README
A test/files/Shapes.java
A test/files/TestShapes.java
A test/files/classlist.csv
R test/fixtures/files/README
R test/fixtures/files/Shapes.java
R test/fixtures/files/TestShapes.java
R test/fixtures/files/classlist.csv
M test/functional/admins_controller_test.rb
M test/functional/annotation_categories_controller_test.rb
M test/functional/annotations_controller_test.rb
A test/functional/api/users_controller_test.rb
M test/functional/assignments_controller_test.rb
M test/functional/authenticated_controller_test.rb
M test/functional/flexible_criteria_controller_test.rb
M test/functional/grade_entry_forms_controller_test.rb
M test/functional/graders_controller_test.rb
M test/functional/groups_controller_csv_upload_test.rb
M test/functional/groups_controller_test.rb
M test/functional/main_controller_test.rb
M test/functional/note_controller_test.rb
M test/functional/results_controller_test.rb
A test/functional/role_switching_test.rb
M test/functional/rubrics_controller_test.rb
A test/functional/sections_controller_test.rb
M test/functional/students_controller_test.rb
M test/functional/submissions_controller_test.rb
R test/functional/users_controller_test.rb
M test/test_helper.rb
M test/unit/admin_test.rb
M test/unit/annotation_category_test.rb
M test/unit/annotation_test.rb
M test/unit/annotation_text_test.rb
M test/unit/assignment_file_test.rb
M test/unit/assignment_test.rb
M test/unit/extra_mark_test.rb
M test/unit/flexible_criterion_test.rb
M test/unit/grace_period_deduction_test.rb
M test/unit/grace_period_submission_rule_test.rb
M test/unit/grade_entry_form_test.rb
M test/unit/grade_test.rb
M test/unit/group_test.rb
M test/unit/grouping_test.rb
M test/unit/helpers/pagination_helper_test.rb
M test/unit/image_annotation_test.rb
M test/unit/mark_test.rb
M test/unit/markus_logger_test.rb
M test/unit/membership_test.rb
M test/unit/no_late_submission_rule_test.rb
M test/unit/note_test.rb
M test/unit/penalty_decay_period_submission_rule_test.rb
M test/unit/penalty_period_submission_rule_test.rb
M test/unit/period_test.rb
M test/unit/result_test.rb
M test/unit/rubric_criteria_test.rb
M test/unit/section_due_date_test.rb
M test/unit/section_test.rb
M test/unit/student_membership_test.rb
M test/unit/student_test.rb
M test/unit/submission_collector_test.rb
M test/unit/submission_file_test.rb
A test/unit/submission_helper_test.rb
M test/unit/submission_rule_test.rb
M test/unit/submission_test.rb
M test/unit/ta_membership_test.rb
M test/unit/ta_test.rb
M test/unit/test_file_test.rb
M test/unit/test_result_test.rb
M test/unit/text_annotation_test.rb
M test/unit/token_test.rb
M test/unit/user_test.rb
Log Message:
-----------
Merge pull request #418 from NelleV/rails_3_migration
Rails 3 migration
Compare: https://github.com/MarkUsProject/Markus/compare/adcc157...c1ac07c
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic