Raphael
|
7876da8fb8
|
Refactor raises in requesting to validations in request, move to better controller structure
|
2010-11-16 16:18:16 -08:00 |
|
zhitomirskiyi
|
6f72cd7184
|
NGINX serves crossdomain.xml on port 843, which is required for FF3.6 running em-websocket :secure => true. daemontools run script for websocket uses production environment
|
2010-11-16 15:54:51 -08:00 |
|
Raphael
|
c005be99fd
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-11-16 14:36:29 -08:00 |
|
Raphael
|
d1a56e9ef2
|
Fix to websocket js
|
2010-11-16 14:35:46 -08:00 |
|
zhitomirskiyi
|
8edc516edf
|
Revert "added the socket policy file perl script, starts on script server, added a chef task"
This reverts commit ed9a66d9a4.
|
2010-11-16 12:34:00 -08:00 |
|
zhitomirskiyi
|
9b5a6cc27a
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-11-16 12:01:22 -08:00 |
|
zhitomirskiyi
|
ed9a66d9a4
|
added the socket policy file perl script, starts on script server, added a chef task
|
2010-11-16 12:01:10 -08:00 |
|
maxwell
|
8c647aa169
|
adding instafail
|
2010-11-16 10:05:15 -08:00 |
|
Alec Leamas
|
90b86690d9
|
Merge branch 'sv-update-4' of https://github.com/Hexagon/diaspora into Hexagon-sv-update-4
|
2010-11-16 16:25:32 +01:00 |
|
maxwell
|
f6c6030c6d
|
fixing a translation
|
2010-11-15 23:08:57 -08:00 |
|
Sarah Mei
|
44bd4534ce
|
I found where we needed the one-line addition. Ruby 1.9 build now works.
I feel pretty badass.
|
2010-11-15 22:44:55 -08:00 |
|
Sarah Mei
|
2cf4350fab
|
Clean up unused variable
|
2010-11-15 22:42:09 -08:00 |
|
Sarah Mei
|
08073ff27e
|
new point releases of haml and nokogiri
|
2010-11-15 22:41:31 -08:00 |
|
Sarah Mei
|
686cea6595
|
1.9.2 doesn't like friending people when the target doesn't have any aspects. ::sigh:: And with that, I fix the cucumber feature that was failing under 1.9.
|
2010-11-15 21:52:02 -08:00 |
|
Sarah Mei
|
9fa47c9bfa
|
Fix a failing spec under 1.9 in receive_spec
|
2010-11-15 21:19:21 -08:00 |
|
Sarah Mei
|
0b12c4e272
|
Cucumber user by default is done with getting started.
|
2010-11-15 21:06:45 -08:00 |
|
Raphael
|
248e768846
|
search now sockets a person
|
2010-11-15 19:13:45 -08:00 |
|
zhitomirskiyi
|
8a47b3d538
|
DG IZ rails updated
|
2010-11-15 19:00:15 -08:00 |
|
zhitomirskiyi
|
b437f201a5
|
DG IZ using em-websocket from HEAD; updated flash policy for FABridge over wss://
|
2010-11-15 18:42:26 -08:00 |
|
zhitomirskiyi
|
c5ae73f96d
|
websocket secure params in app_config
|
2010-11-15 17:45:52 -08:00 |
|
Raphael
|
de1fed70f0
|
Add logging statement to server startup
|
2010-11-15 16:56:30 -08:00 |
|
Raphael
|
1b39b79446
|
Make invitation view with no inviters sensible
|
2010-11-15 16:35:00 -08:00 |
|
Raphael
|
70bcab3abc
|
adding a couple specs to invitation_spec
|
2010-11-15 16:34:59 -08:00 |
|
zhitomirskiyi
|
eb8b35f222
|
the production nginx forwards non-ssl requests to use ssl
|
2010-11-15 13:56:26 -08:00 |
|
Hexagon
|
13a2b8ce07
|
Small fix to devise.sv
|
2010-11-15 22:28:36 +01:00 |
|
Hexagon
|
1d3d2565df
|
Forgot to change en.yml, here it is
|
2010-11-15 22:28:36 +01:00 |
|
Hexagon
|
35095f8859
|
Update of sv.yml to reflect latest changes + small fix to en.yml
|
2010-11-15 22:28:36 +01:00 |
|
Hexagon
|
9f8ef8ae3b
|
Translation fix "Invite someone"
|
2010-11-15 22:28:36 +01:00 |
|
Raphael
|
0f1517af15
|
Redirect directly to the login page no registrations closed
|
2010-11-15 12:24:58 -08:00 |
|
Raphael
|
0eb91e320c
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-11-15 12:15:49 -08:00 |
|
Raphael
|
d3098cf6bc
|
Add option to close registration in app_config
|
2010-11-15 12:15:40 -08:00 |
|
Raphael
|
03eea3fc08
|
Class not class_name
|
2010-11-15 11:49:16 -08:00 |
|
zhitomirskiyi
|
cede80d47b
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-11-15 11:02:53 -08:00 |
|
zhitomirskiyi
|
3bc8639992
|
added ssl support in nginx template for chef
|
2010-11-15 10:59:09 -08:00 |
|
Alec Leamas
|
3abb2c9751
|
app_config update
Attempt to close http://bugs.joindiaspora.com/issues/463, establishing a
new style in app_config.yml. Many comments needs to be reviewed.
|
2010-11-15 09:10:35 +01:00 |
|
Sarah Mei
|
23c1ac4936
|
Cucumber feature for managing contact requests
|
2010-11-14 21:49:56 -08:00 |
|
Sarah Mei
|
45e47513c2
|
AspectEdit#onDeleteRequestSuccess now adds and drops attributes properly
|
2010-11-14 21:49:36 -08:00 |
|
Sarah Mei
|
e0c0d2036c
|
add .redcar to .gitignore
|
2010-11-14 21:48:10 -08:00 |
|
Sarah Mei
|
830a43ec2f
|
Add destroy specs for RequestsController.
Cucumber feature for contact requests.
|
2010-11-14 09:43:28 -08:00 |
|
Raphael
|
2ad74d397c
|
fix build
|
2010-11-13 19:05:12 -08:00 |
|
danielvincent
|
60b272b243
|
remove validations on url for now to support ip addresses in pod_url field in app_config.yml
|
2010-11-13 14:55:40 -08:00 |
|
danielvincent
|
969c668518
|
translation fix on _person.haml. button tweak
|
2010-11-13 12:10:09 -08:00 |
|
Hexagon
|
958be06ff1
|
Removed duplicate id generation in _new_comment form
|
2010-11-13 13:54:48 +01:00 |
|
danielvincent
|
f57f3236d9
|
root as public directory in nginx.conf. this resolves the issue of nginx not serving static files from /public
|
2010-11-13 01:34:51 -08:00 |
|
danielvincent
|
988e2afe3d
|
resolved missing translation, tweaked button css, commented out mobile_fu in application controller
|
2010-11-13 00:26:55 -08:00 |
|
Alec Leamas
|
4d6295a292
|
Don't daemonize magent.
Closes issue http://bugs.joindiaspora.com/issues/532.
|
2010-11-13 08:34:12 +01:00 |
|
danielvincent
|
86470dc15b
|
jasmine references move_contact instead of move_friend
|
2010-11-12 20:39:49 -08:00 |
|
danielvincent
|
ed50fe7f1f
|
Aspect.people -> Aspect.contacts. Fixed diaspora.en to reflect friend -> contact changes.
|
2010-11-12 20:22:56 -08:00 |
|
danielvincent
|
aa9966ea26
|
removed the word friend everywhere minus translation files
|
2010-11-12 20:22:55 -08:00 |
|
danielvincent
|
a21af7cac6
|
friend_users -> connect_users in helper_methods
|
2010-11-12 20:22:54 -08:00 |
|