nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
5972 commits 4 branches 0 tags 121 MiB
Commit graph

158 commits

Author SHA1 Message Date
MrZYX
cd2d7db7b2 workaround from https://rails.lighthouseapp.com/projects/8994/tickets/5329-using-i18nwith_locale-in-actionmailer-raises-systemstackerror 2011-02-12 21:31:14 +01:00
zhitomirskiyi
fc6d641643 correct requires 2011-01-19 14:30:34 -08:00
zhitomirskiyi
995d285fdd ssl s3, attrs 2011-01-17 15:56:06 -08:00
zhitomirskiyi
0f9dc4954a added a task to upload 2011-01-17 15:56:06 -08:00
danielvincent
2eb1901073 s3 support minus rake migration. 2011-01-17 15:56:06 -08:00
Raphael
738e8c65c8 Merge almost complete, 4 failures 2011-01-14 16:00:10 -08:00
Sarah Mei
38102ebda7 Revert "Mount application on proper location" - changes cause app to fail when there's no trailing / on the pod_url. 
This reverts commit 18827b40d1.
 2011-01-09 18:32:01 -08:00
Alec Leamas
18827b40d1 Mount application on proper location 
Uses mapping in config.ru to respect sub-uri settings in pod_uri.
 2011-01-09 23:37:47 +01:00
Andreas Schneider
0c58d9814b mailer: Added support for /usr/sbin/sendmail. 
This fixes bug #788.
 2011-01-08 18:57:24 +01:00
Alec Leamas
22a696bcf8 Print warnings on stderr, where they belong. 2011-01-02 16:07:19 +01:00
Raphael
b642cd6840 Merging master into mysql 2010-12-26 16:30:17 -08:00
Sarah Mei
1f67cc2485 Replace APP_CONFIG with lib/app_config.rb so that it's testable. 2010-12-24 12:31:09 -08:00
maxwell
081e85f224 Revert "Extended sub-uri support." for now.... 
This reverts commit 9cd08bac67.
 2010-12-20 18:12:12 -08:00
Raphael
f043c9cc7e Took MongoMapper out of the bundle, trying to fix querying. 2010-12-20 16:53:56 -08:00
Alec Leamas
9cd08bac67 Extended sub-uri support. 
Adds new routing in routes.rb based on pod_uri. Assets are handled by a symlink
in public when using sub-uri. Various clean-up, removing thin and socket port
settings from server.sh (these are now taken from pod_uri and socket_port).

Basic functionality when setting a sub_uri like http://example.org/diaspora
now seems OK. Closes .http://joindiaspora.com/issues/737, and partially
http://joindiaspora.com/issues/391. Ports are yet to be defined and handled
in this context.

Conflicts:

	app/views/layouts/application.html.haml
	config/routes.rb
 2010-12-21 01:13:15 +01:00
Mike Sofaer, Raphael Sofaer & Sarah Mei
5c21e220ff post_spec now passes with mysql 2010-12-18 20:23:16 -08:00
danielvincent
6afb7a6bd5 Revert "added configuration for cloudfile cdn" 
This reverts commit 0d5ac3bd36.
 2010-12-17 14:30:02 -08:00
danielvincent
0d5ac3bd36 added configuration for cloudfile cdn 2010-12-17 12:26:20 -08:00
danielvincent
28a22d9fc3 increase session timeout from 10 minutes to 1 day 2010-12-16 17:24:25 -08:00
danielvincent
b4b6189321 time out a user session via devise after 10 minutes of inactivity 2010-12-16 15:50:00 -08:00
Raphael
461171f6d6 Take magent out of the initializer 2010-12-10 11:28:55 -08:00
Alec Leamas
eacee54846 Replace APP_CONFIG[:terse_pod_url] with uri object. 
Adds a new APP_CONFIG[:pod_uri] item, an uri object parsed from
pod_url. Replace all occurrences of APP_CONFIG[:terse_pod_url] with
APP_CONFIG[:pod_uri].host. Closes http://bugs.joindiaspora.com/issues/684,
using the well-defined semantics of the uri object.

The pod_url is normalized using module URI's functions, always with a
trailing /.

The diaspora-handle will always reflect the pod_url with this patch
i. e., a pod_url like www.dpod.se will give the handle xx@www.dpod.se;
previous code stripped the www. prefix. If this is a problem, it
should be addressed by another setting, since one cannot presume that
www.domain.tld resolves to the same address as domain.tld.
 2010-12-10 14:29:19 +01:00
Hexagon
80c5c5c9f5 Cleaning up revert of #619 pull 2010-12-07 22:20:26 +01:00
danielvincent
addbaaeb70 JSON::Pure::Generator::State fix when using resque. huge thanks to this post: http://blog.ethanvizitei.com/2010/11/json-pure-ruins-my-morning.html 2010-12-04 13:16:30 -08:00
Raphael
3cb0064835 Take out server start logging for now, maybe put in a more useful one later" 2010-12-03 11:29:49 -08:00
Raphael
d35badd7ea Remove log rotator, it seems to be disrupting log_overrider 2010-12-03 11:02:28 -08:00
Raphael
8798f05ff7 Revert "Revert redis merge to fix bugs on master" 
This reverts commit 30698d674b.
 2010-12-02 15:33:26 -08:00
Raphael
30698d674b Revert redis merge to fix bugs on master 2010-12-02 15:20:27 -08:00
Raphael
236fbc7cc7 Final adjustments to fix resque worker 2010-12-02 12:35:26 -08:00
Raphael
6cfa6577a5 Add first resque job 2010-12-02 12:35:26 -08:00
Raphael
cee5e4c26e Bring in resque recipes and rake tasks 2010-12-02 12:35:26 -08:00
danielvincent
8cb2a3a79a resque init, config, gemfile 2010-12-02 12:35:26 -08:00
Sarah Mei
d5c32b6a56 Revert "Genderize#translate fixed and enhanced (now it accepts User objects to fix the gender)." 
This reverts commit eb2d186a12.
 2010-12-01 22:29:27 -08:00
Paweł Wilk
eb2d186a12 Genderize#translate fixed and enhanced (now it accepts User objects to fix the gender). 2010-12-01 17:29:04 +01:00
Paweł Wilk
279b08ae4a Added inflection of nouns by the grammatical gender for some languages. 
- New module I18n::Backend::Genderize keeps configuration and adds :gender option to translate().
- Module methods in Genderize allow fast checking if language needs gender and guessing gender.
- jQuery in views/users/edit.html.haml shows and hides grammatical gender select list when needed.
- Span and select list in views/users/edit.html.haml allows to choose grammatical gender.
- Key :grammatical_gender in User model keeps grammatical gender information.
- Added some methods to language_helper.rb.
- UsersController is aware of grammatical gender and is able to guess it when "getting started".
 2010-12-01 17:29:04 +01:00
maxwell
808b4af5c7 adding warning to startup about making sure mongo is bound to localhost 2010-11-29 14:50:38 -08:00
Hexagon
7bb32de899 Fixed #638, forcing trailing slash on pod url 2010-11-29 22:55:43 +01:00
Hexagon
5a90cfd680 Fixed #580 , exception when using phusion passenger, thanks yarishima42 2010-11-27 12:53:37 +01:00
MrZYX
a0f9fb35f3 made pagination translatable 2010-11-26 21:20:28 +01:00
Hexagon
36415b0c73 Its now possible to use smtp-servers with no authentication 2010-11-26 20:00:22 +01:00
MrZYX
dcbcaefcbe added language codes map 2010-11-18 15:13:30 -08:00
Raphael
de1fed70f0 Add logging statement to server startup 2010-11-15 16:56:30 -08:00
maxwell
034d7ee2b1 first commit 2010-11-09 15:29:43 -08:00
maxwell
21cdbf08b5 we need to ask to publish on peoples wall...this was working because we all installed it with minifb which asked for everything 2010-11-08 01:26:11 -08:00
Raphael
061ec59091 Merge remote branch 'jdeisenberg/511-nonstandard-mongo-port' 2010-11-04 19:55:09 -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
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
J David Eisenberg
c695688c63 Issue #511: Nonstandard mongo port fails 2010-11-03 22:58:39 -07:00
Raphael
377cae8cba Merge remote branch 'ed0h/i18n-fallbacks' 
Conflicts:
	pkg/ubuntu/dist
 2010-11-01 15:57:43 -07:00