ilya
|
d642928268
|
invite sends friend request if already friends, and raises if already friends
|
2010-10-18 16:27:02 -07:00 |
|
ilya
|
7ab2b00231
|
moved fb posting into the user model
|
2010-10-18 14:50:48 -07:00 |
|
ilya
|
a8bf082e35
|
The invitation now has an optional personal message
|
2010-10-18 14:35:41 -07:00 |
|
Raphael
|
244accc9a9
|
flash error on friending self
|
2010-10-18 12:11:32 -07:00 |
|
Raphael
|
f90d38bb9c
|
Merge branch 'master' of http://github.com/tristil/diaspora into tristil-merge
|
2010-10-18 12:00:20 -07:00 |
|
ilya
|
73dfab8601
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-18 09:56:36 -07:00 |
|
danielvincent
|
2f5547626e
|
fixed error in status_messages_controller
|
2010-10-17 21:31:12 -07:00 |
|
danielvincent
|
1139299f42
|
removed loop and hidden checkboxes from publisher. hidden field passes single aspect id or :all to controller
|
2010-10-17 20:47:51 -07:00 |
|
Joseph Method
|
e3e4a6b319
|
Continuation of previous commit
|
2010-10-17 19:07:54 -04: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 |
|
ilya
|
f33298e762
|
removed the puts, initial token checking
|
2010-10-16 00:42:37 -07:00 |
|
ilya
|
d4702aefa3
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-15 17:20:19 -07:00 |
|
ilya
|
9727b356e1
|
the invitations add requests which are now correctly auto accepted
|
2010-10-15 17:20:04 -07:00 |
|
maxwell
|
a0ce9630b1
|
added test for facebook posting
|
2010-10-15 16:03:02 -07:00 |
|
maxwell
|
d56800f9e8
|
fixing facebook posting
|
2010-10-15 14:53:36 -07:00 |
|
ilya
|
2c9c4b0e14
|
Merge branch 'master' of github.com:diaspora/diaspora
Conflicts:
app/views/invitations/_new.haml
|
2010-10-15 14:36:49 -07:00 |
|
ilya
|
0074aadd48
|
added a select tag to email invitations
|
2010-10-15 14:21:08 -07:00 |
|
maxwell
|
7e0825e492
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-15 13:58:40 -07:00 |
|
danielvincent
|
12bdd1712d
|
share on facebook checkbox instead of broadcast button
|
2010-10-15 13:56:49 -07:00 |
|
maxwell
|
20f164fd45
|
fixing some of the invite copy
|
2010-10-15 11:11:25 -07:00 |
|
Raphael
|
9e90463455
|
Fix bug if app_config[url] has no trailing slash. Thanks to binarycleric.
|
2010-10-14 17:29:26 -07:00 |
|
Raphael
|
65958cf85c
|
Should close Issue 368
|
2010-10-14 15:53:43 -07:00 |
|
Raphael
|
d66c1e70bc
|
Merge remote branch 'bigbash/280-bug-fix'
|
2010-10-14 13:21:50 -07:00 |
|
maxwell
|
e1dd0cf6be
|
Fixed pending people_controller spec; cleaned up person.search(this is ruby :D ); fyi, calling should_receive stubs that method, hence this test confusion
|
2010-10-13 23:49:13 -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 |
|
Shawn McGuire
|
711dcdc5f4
|
Issue #280 Fixed trailing whitespace error
|
2010-10-13 14:36:03 -05:00 |
|
ilya
|
bb7e2a9918
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-11 14:58:22 -07:00 |
|
ilya
|
007f6cfb6f
|
close account
|
2010-10-11 14:58:11 -07:00 |
|
danielvincent
|
afad554f01
|
DG MS; added link to send invitation, consolidated locale file for devise invitable, upgraded devise to 1.1.3 in the gemfile
|
2010-10-11 13:42:05 -07:00 |
|
danielvincent
|
9bfb213465
|
Merge branch 'invites' of github.com:diaspora/diaspora into invites
|
2010-10-11 11:52:57 -07:00 |
|
danielvincent
|
9162a4a168
|
DG MS; 404 show pages for objects that don't exist for given user
|
2010-10-11 11:32:20 -07:00 |
|
Raphael
|
8cf72441b4
|
Make intended behavior on hcard action clearer, return 404 on nonexistent person
|
2010-10-11 10:13:52 -07:00 |
|
Raphael
|
04d5271530
|
Merge remote branch 'crimer/master'
|
2010-10-11 10:03:09 -07:00 |
|
maxwell
|
0541833c18
|
stop the file include madness. using File.join and Rails.root for includes everywhere I could
|
2010-10-10 11:54:08 -07:00 |
|
Crimer
|
4163ce4544
|
Solved issue 166# "Clicking 'Photos' for an aspect appears to take you to the 'All Aspects' photo page"
|
2010-10-09 11:51:42 +00:00 |
|
ilya
|
ef3e627bed
|
the users are now made with people
|
2010-10-08 15:40:42 -07:00 |
|
maxwell
|
255901dfab
|
fixing copypasta
|
2010-10-08 15:00:04 -07:00 |
|
maxwell
|
d7521cb288
|
MS trying to not use MiniFB to post since it is barfing
|
2010-10-08 14:49:09 -07:00 |
|
danielvincent
|
44338a9897
|
removed traces of :public
|
2010-10-08 14:44:56 -07:00 |
|
maxwell
|
b6b192da01
|
MS DG trying to move around fb url
|
2010-10-08 14:25:39 -07:00 |
|
danielvincent
|
ed1cb5a0e7
|
DG MS; moved change password to account page; fixed the styling on password inputs
|
2010-10-07 18:52:46 -07:00 |
|
Raphael
|
399e437655
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-07 17:34:03 -07:00 |
|
danielvincent
|
7a56d82873
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-07 16:56:22 -07:00 |
|
danielvincent
|
4deea95057
|
DG MS; export photos button in users#edit
|
2010-10-07 16:56:10 -07:00 |
|
Raphael
|
1d463d22a1
|
Person show for a nonexistent person now redirects to people index page, rather than giving a 500
|
2010-10-07 16:50:19 -07:00 |
|
Raphael
|
1fd3aeabd9
|
Add or later to license notice
|
2010-10-07 16:25:34 -07:00 |
|
danielvincent
|
0ebb597b72
|
DG MS; test for users#export
|
2010-10-07 15:22:03 -07:00 |
|