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 |
|
danielvincent
|
206e10f66a
|
dont put log behind devise
|
2010-10-07 14:57:00 -07:00 |
|
danielvincent
|
8f1973815e
|
DG MS; added route for exported xml
|
2010-10-07 14:21:53 -07:00 |
|
Raphael
|
9cbdf78aa7
|
Don't redirect on status message create
|
2010-10-07 12:01:49 -07:00 |
|
Raphael
|
0859d8ebfe
|
Merge remote branch 'jeffry/master'
|
2010-10-07 11:45:39 -07:00 |
|
Raphael
|
d7bbb66d27
|
Run whitespace:cleanup
|
2010-10-07 10:47:37 -07:00 |
|
maxwell
|
0fb091ebbc
|
MS pretty sure we dont need to get the oauth path every time we load the public aspect...
|
2010-10-06 18:38:37 -07:00 |
|
maxwell
|
ec4c63ada7
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-05 17:51:10 -07:00 |
|
maxwell
|
d638bdb018
|
MS IZ password change field is now in edit profile
|
2010-10-05 17:49:06 -07:00 |
|
danielvincent
|
c9d97d3233
|
render public with correct mime type
|
2010-10-05 17:15:00 -07:00 |
|
danielvincent
|
4a8a21b95f
|
public fix
|
2010-10-05 16:28:01 -07:00 |
|
danielvincent
|
f3c34692d8
|
pubsub support
|
2010-10-05 13:39:56 -07:00 |
|
danielvincent
|
aed9125e93
|
more querying through the current_user in controllers
|
2010-10-05 12:41:41 -07:00 |
|
Jeffry Degrande
|
132eec2c63
|
Merge branch 'upstream'
Conflicts:
app/controllers/aspects_controller.rb
|
2010-09-29 02:11:20 -03:00 |
|
Jeffry Degrande
|
046dbf063b
|
fix i18n => I18n
|
2010-09-29 01:49:35 -03:00 |
|
danielvincent
|
bf15514bc9
|
redirect users#public to root_url if user does not exist.
|
2010-09-28 10:23:03 -07:00 |
|
danielvincent
|
15a4609c14
|
moved user's public route to user controller. changed person.public_url to reflect change.
|
2010-09-27 22:30:16 -07:00 |
|
danielvincent
|
eac6b8a63b
|
builder is now a class initialized with a user. added director class.
|
2010-09-27 21:54:01 -07:00 |
|
danielvincent
|
eb7244e07c
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-09-27 19:07:01 -07:00 |
|