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 |
|
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 |
|
zhitomirskiyi
|
9850783fd7
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-11-12 16:34:23 -08:00 |
|
zhitomirskiyi
|
a414f2cfc3
|
added the missing gzip types and IE disable
|
2010-11-12 16:34:10 -08:00 |
|
Raphael
|
64cf82a06b
|
Websocket server no longer fails hard on a bad cookie or a db reset
|
2010-11-12 16:21:09 -08:00 |
|
Sarah Mei
|
0467d7ad5e
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-11-12 17:04:48 -06:00 |
|
Sarah Mei
|
6c439608f0
|
started specs for AspectEdit.deletePersonFromAspect
|
2010-11-12 17:04:15 -06:00 |
|
Raphael
|
90474d9acb
|
Attempt to fix websocket bug, default pidfile location
|
2010-11-12 14:59:13 -08:00 |
|
Sarah Mei
|
9586ebb67e
|
specs for AspectEdit.onMovePersonSuccess
|
2010-11-12 16:44:22 -06:00 |
|
Sarah Mei
|
737c812e08
|
Specs for AspectEdit.onDeleteRequestSuccess
|
2010-11-12 16:38:02 -06:00 |
|
zhitomirskiyi
|
ef5a9ede2e
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-11-12 14:30:29 -08:00 |
|
zhitomirskiyi
|
f0f491b124
|
another typo
|
2010-11-12 14:29:57 -08:00 |
|
Raphael
|
791798fe0f
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-11-12 14:12:06 -08:00 |
|
Raphael
|
1a5aa02c77
|
Removing :value => on hidden_field_tag. Thanks npouillard.
|
2010-11-12 14:10:49 -08:00 |
|
Sarah Mei
|
506d13335a
|
Finally have complete specs for AspectEdit.onDropMove.
|
2010-11-12 16:05:17 -06:00 |
|
zhitomirskiyi
|
c0dcd37cde
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-11-12 14:01:11 -08:00 |
|
zhitomirskiyi
|
47d6f82b5f
|
another little typo
|
2010-11-12 14:00:34 -08:00 |
|
zhitomirskiyi
|
da58422036
|
chef typo
|
2010-11-12 13:41:52 -08:00 |
|
Sarah Mei
|
b77547e940
|
Responding to a friend request now only calls RequestsController#delete instead of also calling AspectsController#move_friend
|
2010-11-12 14:51:16 -06:00 |
|
Raphael
|
1e842f1a88
|
Render mail css as a partial, fix spec
|
2010-11-12 12:26:34 -08:00 |
|
livefromthemoon@gmail.com
|
82f9aefaa8
|
Updated some french translation strings
|
2010-11-12 12:26:34 -08:00 |
|
livefromthemoon@gmail.com
|
cdfc406aad
|
Added missing french translations
|
2010-11-12 12:26:34 -08:00 |
|
Raphael
|
a4d7b25bac
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-11-12 11:54:19 -08:00 |
|
Raphael
|
ae9f4ab969
|
Refactor mail views, add a spec to make sure CSS is rendered
|
2010-11-12 11:47:59 -08:00 |
|
danielvincent
|
4976503c0f
|
let nginx serve static assets.
|
2010-11-12 11:47:19 -08:00 |
|
Sarah Mei
|
feec6d971d
|
More specs for aspect edit JS
|
2010-11-12 13:40:23 -06:00 |
|
zhitomirskiyi
|
26c4760e25
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-11-12 11:36:50 -08:00 |
|
zhitomirskiyi
|
6544d8235b
|
now running thins through ports since sockets were not working for some reason
|
2010-11-12 11:36:34 -08:00 |
|
Raphael
|
0e8b1efefd
|
Merge remote branch 'MrZYX/en.yml-refactor'
|
2010-11-12 11:28:05 -08:00 |
|
Alec Leamas
|
bbdc22ed35
|
Add log directory
Adding the toplevel log directory, part of standard rails directory layout.
|
2010-11-12 11:21:54 +01:00 |
|
Alec Leamas
|
6888398ba7
|
Removing file \'
|
2010-11-12 11:20:10 +01:00 |
|