Raphael
f6d899f1d9
Move prep_image_url into profile image_url setter
2010-11-04 18:46:15 -07:00
danielvincent
be916384a1
collapsed remove from aspect and remove person into one function on aspects#manage
2010-11-04 17:50:48 -07:00
Raphael
7d125e68e9
Warn rather than failing if there is no smtp sender address
2010-11-04 16:55:15 -07:00
Raphael
c3a38eaab4
Merge remote branch 'MrZYX/396-smtp-sender-address'
2010-11-04 16:47:57 -07:00
Raphael
20508ad37a
Merge branch 'master' of github.com:diaspora/diaspora
2010-11-04 16:45:03 -07:00
Raphael
3634658cbf
The Governator's party has lost the election.
2010-11-04 16:44:17 -07:00
danielvincent
b74dfcf5fd
comments autolink
2010-11-04 16:18:49 -07:00
danielvincent
2c24eba49c
make profile photo button on photos#show works again
2010-11-04 16:04:58 -07:00
danielvincent
f4dba54ff3
posting to a person with a user on the same pod will send internally, skipping the http queue and encryption.
2010-11-04 15:33:16 -07:00
danielvincent
b4679c9041
Take application_controller before filters out of publicscontroller
2010-11-04 15:33:16 -07:00
danielvincent
d5cc0ed6dc
separating object receiving in user#receive
2010-11-04 15:33:16 -07:00
Raphael
7e568db032
Add a couple specs to user_spec
2010-11-04 15:23:58 -07:00
Raphael
229e202a72
Take httponly off of session cookies so that the websocket works in firefox 3.x. XSS attacks would now be easier to exploit if found. A possible replacement for opening this security hole is to set a new cookie value for Firefox users that stores a randomly generated key which would give a websocket with that key access.
2010-11-04 15:17:28 -07:00
zhitomirskiyi
ea0f0fbdc5
add moved dev controller to use the user post api
2010-11-04 15:07:24 -07:00
zhitomirskiyi
7f5b98a6cb
the photo image url is now randomized
2010-11-04 14:37:08 -07:00
Raphael
c1703edc22
Merge branch 'master' of github.com:diaspora/diaspora
2010-11-04 13:34:57 -07:00
Raphael
fbbb88109b
Make cookie finding in ws server a little more robust, put in some debugging
2010-11-04 13:34:27 -07:00
danielvincent
9da7272e59
should query the correct collection on perform
2010-11-04 12:58:24 -07:00
MrZYX
1102fcd565
made flash messages translatable
2010-11-04 20:49:50 +01:00
MrZYX
63a5fdb000
made a bunch of strings translatable
2010-11-04 20:49:50 +01:00
MrZYX
f84b14bd19
unscope are_you_sure in photos/show.html.haml
2010-11-04 20:49:50 +01:00
danielvincent
b33aa9a0fb
retracting on a non existant post does not raise a permissions error.
2010-11-04 12:43:26 -07:00
Raphael
152025f912
Update flashsocket
2010-11-04 12:01:39 -07:00
danielvincent
82c82b8ccc
killed albums
2010-11-04 10:17:19 -07:00
zhitomirskiyi
9389d99ba8
Merge branch 'master' of github.com:diaspora/diaspora
2010-11-03 23:05:47 -07:00
zhitomirskiyi
a55878f2a3
invitations controller test, tnx coyote
2010-11-03 22:58:42 -07:00
J David Eisenberg
c695688c63
Issue #511 : Nonstandard mongo port fails
2010-11-03 22:58:39 -07:00
Sarah Mei
dbdd6884a7
SM MS jasmine specs for aspect edit
2010-11-03 22:19:20 -07:00
Sarah Mei
bfb6abd71e
try require => false on chef instead
2010-11-03 22:18:48 -07:00
zhitomirskiyi
96b44faed5
commenting chef out of bundle saved 5 secs off server start
2010-11-03 19:57:21 -07:00
zhitomirskiyi
2da1f860cd
validate user ownership on status message destroy
2010-11-03 18:04:10 -07:00
zhitomirskiyi
6a6cedbc62
oops did not save the pending
2010-11-03 16:43:10 -07:00
zhitomirskiyi
8246882067
MS IZ fixed some permissions in photo controller
2010-11-03 16:42:33 -07:00
Raphael
03b272db60
Requests are no longer tracked by id across servers, DELETED USELESS PUTS IN EM-WEBFINGER SPEC
2010-11-03 15:26:58 -07:00
Raphael
2eef9f7ad1
Refactor ostatus builder spec
2010-11-03 15:26:58 -07:00
zhitomirskiyi
7771219a0a
Merge branch 'master' of github.com:diaspora/diaspora
2010-11-03 13:16:57 -07:00
zhitomirskiyi
0ac4c5b04f
IZ MS refactored invites to use user.build
2010-11-03 13:16:45 -07:00
zhitomirskiyi
3578daa14e
IZ MS more photo controller specs
2010-11-03 12:21:32 -07:00
danielvincent
3e001c74d6
Albums#index hidden from views. Photos must be accessed through a person.
2010-11-03 12:21:14 -07:00
zhitomirskiyi
5e9d70f88c
Merge branch 'master' of github.com:diaspora/diaspora
2010-11-03 11:00:04 -07:00
zhitomirskiyi
c6e9b94f4f
IZ MS moved contact_for to querying and added tests
2010-11-03 10:59:56 -07:00
maxwell
62c25057e6
adding photocontroller spec for IZ
2010-11-03 10:43:27 -07:00
Raphael
5c6c43ca4e
Too many things in diaspora repo! Moving pkg/ out to a seperate
...
diaspora-packages repo. We should have a bash (curl (script_url))
install like rvm does. I think the ubuntu install script needs to have
'clone' added to the line which is supposed to clone.
2010-11-03 10:23:45 -07:00
Raphael
c8a8849518
Move to build_post and dispatch_post in most controllers
2010-11-03 09:30:41 -07:00
Alec Leamas
a08fa76975
Updating Gemfile.lock
2010-11-03 12:58:06 +01:00
Alec Leamas
879ab6cb9a
Use public http url in setup scripts, bugfixes
...
Use public http url so script can be run w/o registering w the github
2010-11-03 11:11:26 +01:00
Alec Leamas
cf58d3cbab
raw fedora14 in place
2010-11-03 10:11:40 +01:00
Alec Leamas
4f6f4bc7ec
Build breakage point fixes, new user feedback
...
New user korth is also created when setting up db. Jasmine
handled, for now by disabling rake task. Various fixes
2010-11-03 10:11:39 +01:00
Alec Leamas
b205cb84a5
Merge remote branch 'upstream/master'
2010-11-03 10:11:27 +01:00
maxwell
0343e7a226
Merge branch 'master' of github.com:diaspora/diaspora
2010-11-03 00:10:11 -07:00