Commit graph

56 commits

Author SHA1 Message Date
danielvincent
828635def9 Person#real_name -> Person#name 2010-11-30 13:01:53 -08:00
MrZYX
849072f283 this should fix #572 2010-11-24 17:48:47 +01:00
danielvincent
efab6449b3 message for closed signups on users#sign_in 2010-11-23 11:14:26 -08:00
maxwell
dab3725a9c hotlinking image for invite 2010-11-23 09:39:53 -08:00
danielvincent
c9c84794af fixed build. publisher lights up on hover on aspect#index page. updated login page text. 2010-11-23 03:10:47 -08:00
Dan Goldenberg
bfc1fa4da0 added getting_started text and new press logos 2010-11-22 21:07:01 -08:00
Sarah Mei
bedc7ca41b Made landing page and log in views content-type agnostic.
Added an un-minified version of jquery-mobile for debugging.
2010-11-22 15:02:25 -08:00
MrZYX
e72f4e1da7 translatable status is good again
made default aspects translatable
fix all the misssing translations I found
cleanup en.yml
2010-11-22 22:30:37 +01:00
maxwell
970d56a007 basic batch inviter 2010-11-18 15:17:22 -08:00
danielvincent
056dc7d3ba DG MS; added homecontroller to take care of landing page and aspects index redirecting in regards to user's logged in state. 2010-11-17 19:37:08 -08:00
danielvincent
a7c1733093 firefox fixes and added links to press articles on landing page 2010-11-17 19:37:08 -08:00
danielvincent
f59f6be4b0 users#sign_in is the current landing page. 'sign up for an invite' is hooked up to mailchimp. 2010-11-17 19:37:08 -08:00
Raphael
1b39b79446 Make invitation view with no inviters sensible 2010-11-15 16:35:00 -08:00
Raphael
d3098cf6bc Add option to close registration in app_config 2010-11-15 12:15:40 -08:00
Raphael
1e842f1a88 Render mail css as a partial, fix spec 2010-11-12 12:26:34 -08:00
MrZYX
0a363a73b0 just found the mailer... :) 2010-11-12 06:07:37 +01:00
Raphael
6dd58fe875 Specs pass again, invitations moved to Invitation model, refactor possibly complete 2010-11-09 14:07:26 -08:00
maxwell
7e40558dc4 reverse the years as they are displyed in the birthday dropdown 2010-11-08 10:33:05 -08:00
MrZYX
63a5fdb000 made a bunch of strings translatable 2010-11-04 20:49:50 +01:00
Raphael
67219248b0 unscope i18n calls 2010-11-02 10:32:34 -07:00
Hexagon
bba3aaa684 Translating a huge amount of untranslated strings 2010-10-30 15:25:42 +02:00
danielvincent
bfb1c6df28 collapsed layout views 2010-10-27 13:33:42 -07:00
ilya
e677e4782e the handle is now in the email if only one user invited the person 2010-10-21 16:07:31 -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
maxwell
da95930c9a added a bit to test email 2010-10-19 20:23:20 -07:00
danielvincent
d200aaab52 mail has some style. couldn't figure out devise mailer templating at the time... 2010-10-19 18:26:02 -07:00
ilya
a8bf082e35 The invitation now has an optional personal message 2010-10-18 14:35:41 -07:00
ilya
d0c6f12ea8 added another attack vector spec 2010-10-13 18:43:22 -07:00
ilya
36b9f66f60 the invited user keeps track of who invited them, limit on invites,
removed the invites controller test
2010-10-13 16:52:33 -07:00
ilya
3b8998ab71 Invitations contains the inviters 2010-10-13 13:29:45 -07:00
Crimer
3754b519a7 Solved issue #79 'Email Label in Forgot Password Appears Outside of Textbox'. 2010-10-08 21:51:59 +00:00
Dorian
6ffc03a4c9 Big clean up: delete trailing whitespace 2010-09-26 12:48:40 -04:00
maxwell
40d736d233 MS changed the session page to show APP_CONFIG[:terse_pod_url] 2010-09-23 10:39:47 -07:00
ilya
d26e7850ac RS, IZ; removed url from user and views 2010-09-21 15:52:26 -07:00
maxwell
64d371d9d6 MS added a warning for account 2010-09-20 11:30:08 -07:00
Jamie Wilkinson
eb0f011236 Show the signup link 2010-09-16 10:07:58 +08:00
Raphael
e0ffc8bba0 First pass at having a custom registrationsController 2010-09-15 16:40:03 -07:00
maxwell
8828707c45 MS fixed the login bug, deploying to master 2010-09-15 15:15:15 -07:00
Daniel Vincent Grippi
1c2bfa64a1 cleaned login page resources 2010-09-08 23:30:08 -07:00
maxwell
c3a1b36282 MS fixing this to be request host on the login page 2010-09-08 19:49:09 -07:00
Daniel Vincent Grippi
36730978ca login page is more elegant 2010-09-08 11:37:54 -07:00
Raphael
960d40278c Add username, login with username or email 2010-09-08 10:59:08 -07:00
Raphael
a23df47dbc Trying to merge in the pivots changes that we want in master 2010-08-18 21:10:42 -07:00
Raphael
08de5caf97 make signup page look better 2010-08-17 17:20:29 -07:00
Raphael
bd7ce5250f renamed the route for signup. also, removed the link from the login page: get_to_the_choppa 2010-08-10 17:14:58 -07:00
Raphael
0fb55be7a0 RS, DG; You can now sign up to be a user on a seed 2010-08-10 16:03:38 -07:00
danielvincent
a6f5603dc9 added email field to login screen. strange error won't let me log in? 2010-08-06 23:55:05 -07:00
maxwell
902a8cb349 MS factored out User.first EVERYWHERE. Use User.owner now instead (currently just calls User.first, but now it is easier to make a new change 2010-07-10 10:34:46 -07:00
danielvincent
a15cd932b6 nevermind, nevermind 2010-06-29 23:47:39 -07:00