Commit graph

27 commits

Author SHA1 Message Date
zhitomirskiyi
2b650e6b6d removed person can't be blank error message 2011-02-11 16:29:19 -08:00
Sarah Mei
1f67cc2485 Replace APP_CONFIG with lib/app_config.rb so that it's testable. 2010-12-24 12:31:09 -08:00
Raphael
3a24eb900d Refine log lines 2010-11-26 13:02:52 -05:00
Raphael
a061999e30 Don't inspect people in logging statements 2010-11-25 18:03:34 -05:00
Raphael
4853a55d9b Don't expect raises from user receive 2010-11-17 15:35:25 -08:00
Raphael
0f1517af15 Redirect directly to the login page no registrations closed 2010-11-15 12:24:58 -08:00
Raphael
d3098cf6bc Add option to close registration in app_config 2010-11-15 12:15:40 -08:00
Sarah Mei
c816a1f78e RegistrationsController#create re-renders the form instead of redirecting, so user doesn't lose what they've entered.
Took out RegistrationsController#update, since all it was doing was calling super.
Took out stubbing of user save, because I actually want to check that save is doing the right thing.
2010-11-04 22:51:30 -07:00
Raphael
961510a8ed Rename instantiate! to build, no more raising in build, no saving in build, no seeding of aspects in build. 2010-10-20 11:03:47 -07:00
Raphael
fd8028db33 Revert "Revert "Merge remote branch 'upstream/master'""
This reverts commit 1481056af2.
2010-10-20 09:51:55 -07:00
Alec Leamas
1481056af2 Revert "Merge remote branch 'upstream/master'"
This reverts commit fb70dc8c99, reversing
changes made to 53fef63a9a.

Conflicts:

	pkg/fedora/diaspora-setup
	pkg/ubuntu/diaspora-setup
	public/stylesheets/sass/application.sass
	spec/models/user/attack_vectors_spec.rb
2010-10-20 14:59:55 +02:00
Sarah Mei
81ef7386b3 validation errors in profile and person bubble up to user. 2010-10-19 22:33:12 -07:00
Raphael
14a5eee41c Return if there is a failure to create a user 2010-10-19 17:29:22 -07:00
Raphael
9309be2d69 Merge branch 'import'
Conflicts:
	spec/models/user/invite_spec.rb
2010-10-19 16:06:48 -07:00
Sarah Mei
d3a62c7a45 RegistrationsController#create deals with validation errors. Username, email, password now required on sign-up. 2010-10-16 22:02:51 -07:00
Sarah Mei
1b6726354f Backfill specs for RegistrationsController#create.
Remove RegistrationsController#new (which just called super, so it's not necessary).
2010-10-16 21:14:37 -07:00
maxwell
04f6cdaacf MS DG; basic view support; it works, but it is ugly 2010-10-13 18:42:24 -07:00
Raphael
1fd3aeabd9 Add or later to license notice 2010-10-07 16:25:34 -07:00
Raphael
2489f8503f Merge branch 'master' into HEAD
Conflicts:
	app/controllers/albums_controller.rb
	app/controllers/aspects_controller.rb
	app/controllers/photos_controller.rb
	app/controllers/registrations_controller.rb
	app/controllers/requests_controller.rb
	app/helpers/dashboards_helper.rb
	app/views/albums/show.html.haml
	app/views/aspects/manage.html.haml
	app/views/shared/_aspect_nav.haml
	app/views/shared/_sub_header.haml
	app/views/status_messages/_status_message.html.haml
	app/views/status_messages/show.html.haml
	config/locales/de.yml
	config/locales/en.yml
	config/locales/es.yml
	config/locales/fr.yml
2010-09-22 21:32:03 -07:00
danielvincent
fe306b37ab DG IZ; mass-assignment quick-fix in controllers 2010-09-20 11:30:27 -07:00
Ariel Zavala
4558f9901e Added translations to photos and registrations controllers 2010-09-17 18:25:36 -04:00
Jamie Wilkinson
5d87ca0904 Use /signup instead of /an_excellent_meme_reference, and don't use hardcoded paths when redirecting 2010-09-16 10:07:57 +08:00
Raphael
708e9f88a5 Spell our own name right 2010-09-15 17:56:18 -07:00
Raphael
bf33313bf9 take out index, change backer seed, no puts 2010-09-15 17:13:17 -07:00
Raphael
02dda4f0a7 change the name of instantiate back 2010-09-15 17:08:56 -07:00
Raphael
01d26f6d0e Using custom registrations controller 2010-09-15 17:05:21 -07:00
Raphael
e0ffc8bba0 First pass at having a custom registrationsController 2010-09-15 16:40:03 -07:00