okimo****@users*****
okimo****@users*****
2010年 3月 10日 (水) 17:55:30 JST
ForkThis is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to "mint-server" repository
containing the "mint" project.
The branch, master has been updated
via af702d088952227815af15273463c4c65c213d49 (commit)
via f0a76060a1c51efd741026c7eba1d159fd386a29 (commit)
via 49f82870d2b9cc6f543f03829193dbed7c765e08 (commit)
via abeef6ff123047af2116d3fdb900f329eefb23a3 (commit)
via 8fefa61edab3e7f087aed441342389751c0316e4 (commit)
via 5b2ae0de7b6bdf120eeb9b736599811240819b76 (commit)
via 13a969e0f4ab41ad87bb28c05833afeca9887269 (commit)
via 513d656a398d0ea26cf18a9f17e778e97bd94f83 (commit)
via deba3695cc9b16854f5bb9e0f6cdcbdbb8402d5c (commit)
via e1cedcc2d5fc3a40e6fac3e57d7f7bafb828e5df (commit)
via e9495135e683178e0f3f31a0e7f7720fe2c5632b (commit)
via 5eb078f45f3adac851428fdefc77ed0cece63bfe (commit)
via d84718250421609594467ca51836a45fbe4de792 (commit)
via 9aecd0743b0d2f95e20c1192e0b63f35f48951a7 (commit)
via a8e3ddf2ee559f7a19aaf90d0fa274a06cd8b507 (commit)
via 4d156e7035b1948ec37c17e62e44c76f65175b98 (commit)
via fe49000be803c785a582dffc4c2be2b4b3a8bc10 (commit)
from 6e6386aad61e09713721e2c26448b804c37f0e8a (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit af702d088952227815af15273463c4c65c213d49
Author: okimoto <okimo****@good-*****>
Date: Wed Mar 10 17:21:41 2010 +0900
add affiliation and matriculation number
fix specs to pass spec
commit f0a76060a1c51efd741026c7eba1d159fd386a29
Author: okimoto <okimo****@good-*****>
Date: Wed Mar 10 16:13:50 2010 +0900
update css
commit 49f82870d2b9cc6f543f03829193dbed7c765e08
Author: okimoto <okimo****@good-*****>
Date: Wed Mar 10 15:46:33 2010 +0900
now can sort affiliations
commit abeef6ff123047af2116d3fdb900f329eefb23a3
Author: okimoto <okimo****@good-*****>
Date: Wed Mar 10 15:46:19 2010 +0900
fix bug
commit 8fefa61edab3e7f087aed441342389751c0316e4
Author: okimoto <okimo****@good-*****>
Date: Wed Mar 10 13:31:15 2010 +0900
add quadratic equation view template
commit 5b2ae0de7b6bdf120eeb9b736599811240819b76
Author: okimoto <okimo****@good-*****>
Date: Tue Mar 9 22:17:03 2010 +0900
add admin/affiliations controller
commit 13a969e0f4ab41ad87bb28c05833afeca9887269
Author: okimoto <okimo****@good-*****>
Date: Tue Mar 9 18:36:32 2010 +0900
fix specs
commit 513d656a398d0ea26cf18a9f17e778e97bd94f83
Author: okimoto <okimo****@good-*****>
Date: Tue Mar 9 18:36:05 2010 +0900
allow_blank
commit deba3695cc9b16854f5bb9e0f6cdcbdbb8402d5c
Author: okimoto <okimo****@good-*****>
Date: Tue Mar 9 18:35:53 2010 +0900
fix typo
commit e1cedcc2d5fc3a40e6fac3e57d7f7bafb828e5df
Author: okimoto <okimo****@good-*****>
Date: Tue Mar 9 18:15:57 2010 +0900
fixes for association with affiliation
commit e9495135e683178e0f3f31a0e7f7720fe2c5632b
Author: okimoto <okimo****@good-*****>
Date: Tue Mar 9 18:15:13 2010 +0900
add more validations and associations to affiliation
commit 5eb078f45f3adac851428fdefc77ed0cece63bfe
Author: okimoto <okimo****@good-*****>
Date: Tue Mar 9 18:03:33 2010 +0900
add affiliation model
commit d84718250421609594467ca51836a45fbe4de792
Author: okimoto <okimo****@good-*****>
Date: Tue Mar 9 16:08:57 2010 +0900
remove useless examples
commit 9aecd0743b0d2f95e20c1192e0b63f35f48951a7
Author: okimoto <okimo****@good-*****>
Date: Tue Mar 9 16:08:32 2010 +0900
add special message
commit a8e3ddf2ee559f7a19aaf90d0fa274a06cd8b507
Author: okimoto <okimo****@good-*****>
Date: Tue Mar 9 16:05:39 2010 +0900
ignore coverage/
commit 4d156e7035b1948ec37c17e62e44c76f65175b98
Author: okimoto <okimo****@good-*****>
Date: Mon Mar 8 18:29:05 2010 +0900
add quadratic equation
commit fe49000be803c785a582dffc4c2be2b4b3a8bc10
Author: okimoto <okimo****@good-*****>
Date: Mon Mar 8 15:04:36 2010 +0900
now Problem#label returns string include level
-----------------------------------------------------------------------
Summary of changes:
.gitignore | 2 +-
app/controllers/admin/affiliations_controller.rb | 68 +++++++++
app/controllers/reports_controller.rb | 1 +
app/controllers/users_controller.rb | 11 +-
app/helpers/reports_helper.rb | 9 +
app/models/affiliation.rb | 8 +
app/models/problem.rb | 3 +-
app/models/quadratic_equation_edit_form.rb | 41 +++++
app/models/user.rb | 2 +
app/models/user_edit_form.rb | 2 +
app/views/admin/affiliations/_form.html.erb | 9 +
app/views/admin/affiliations/edit.html.erb | 3 +
app/views/admin/affiliations/index.html.erb | 40 +++++
app/views/admin/affiliations/new.html.erb | 2 +
app/views/admin/affiliations/show.html.erb | 11 ++
app/views/admin/index.html.erb | 13 +-
app/views/admin/problem_groups/index.html.erb | 8 +-
.../admin/problems/_quadratic_equation.html.erb | 3 +
.../_quadratic_equation_edit_form.html.erb | 4 +
app/views/admin/problems/index.html.erb | 4 +-
app/views/admin/units/_form.html.erb | 1 +
app/views/admin/units/index.html.erb | 8 +-
app/views/admin/users/index.html.erb | 4 +-
app/views/reports/_reports.html.erb | 2 +-
app/views/reports/show.html.erb | 1 +
app/views/users/edit.html.erb | 4 +
app/views/users/show.html.erb | 4 +
config/routes.rb | 1 +
db/migrate/20091215064720_create_users.rb | 2 +
db/migrate/20100309071953_create_affiliations.rb | 15 ++
db/seeds.rb | 13 ++
public/stylesheets/mint.css | 38 +----
...ler_spec.rb => affiliations_controller_spec.rb} | 48 +++----
spec/factories/affiliation.rb | 9 +
spec/factories/problem.rb | 10 ++
spec/factories/unit.rb | 1 +
spec/factories/user.rb | 4 +-
spec/models/affiliation_spec.rb | 44 ++++++
spec/models/ordinary_arithmetic_edit_form_spec.rb | 21 ---
spec/models/quadratic_equation_edit_form_spec.rb | 156 ++++++++++++++++++++
spec/models/user_spec.rb | 43 ++++--
spec/views/admin/problems/edit.html.erb_spec.rb | 1 +
spec/views/admin/problems/index.html.erb_spec.rb | 2 +-
spec/views/admin/problems/show.html.erb_spec.rb | 1 +
spec/views/admin/users/index.html.erb_spec.rb | 2 +-
spec/views/users/edit.html.erb_spec.rb | 1 +
46 files changed, 554 insertions(+), 126 deletions(-)
create mode 100644 app/controllers/admin/affiliations_controller.rb
create mode 100644 app/models/affiliation.rb
create mode 100644 app/models/quadratic_equation_edit_form.rb
create mode 100644 app/views/admin/affiliations/_form.html.erb
create mode 100644 app/views/admin/affiliations/edit.html.erb
create mode 100644 app/views/admin/affiliations/index.html.erb
create mode 100644 app/views/admin/affiliations/new.html.erb
create mode 100644 app/views/admin/affiliations/show.html.erb
create mode 100644 app/views/admin/problems/_quadratic_equation.html.erb
create mode 100644 app/views/admin/problems/_quadratic_equation_edit_form.html.erb
create mode 100644 db/migrate/20100309071953_create_affiliations.rb
copy spec/controllers/admin/{units_controller_spec.rb => affiliations_controller_spec.rb} (85%)
create mode 100644 spec/factories/affiliation.rb
create mode 100644 spec/models/affiliation_spec.rb
create mode 100644 spec/models/quadratic_equation_edit_form_spec.rb
hooks/post-receive
--
mint-server (mint)