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

290 commits

Author SHA1 Message Date
Maxwell Salzberg
2d9d9bd1a1 Revert "Revert "remove perform delegate: use a gem that unobtrusivly does the same"" 
This reverts commit 696779d589.
 2011-07-02 12:05:26 -07:00
Maxwell Salzberg
696779d589 Revert "remove perform delegate: use a gem that unobtrusivly does the same" 
the connection adapter messes with single process mode...
This reverts commit dd752d7dd9.
 2011-07-02 12:01:31 -07:00
Maxwell Salzberg
dd752d7dd9 remove perform delegate: use a gem that unobtrusivly does the same 
thing. use built in resque inline method for single process mode
 2011-07-02 11:57:10 -07:00
Raphael Sofaer
04b0705733 Faraday follows redirects 2011-06-22 12:53:18 -07:00
Ilya Zhitomirskiy
a03423309d fixed the getting started step 3, ignore the CA certs in developement is now in initializer, changed the 'login' -> 'connect' [to facebook] png 2011-06-09 15:12:35 -07:00
Ilya Zhitomirskiy
808754f8bd added the cert bundle for facebook http things 2011-06-08 18:20:47 -07:00
MrZYX
668c4ddfc5 d'oh 
- just check for existance before accessing in services initializer
- before_validation has no option :post
- dry up routes.rb
 2011-06-02 12:32:21 +02:00
Maxwell Salzberg
5cbbdf2949 initial post to tumblr support 2011-06-01 22:30:22 -07:00
Sarah Mei
31a5ef19de Switching to settingslogic to manage our configuration. THE FILE FORMAT HAS CHANGED. OLD APP.YML AND APP_CONFIG.YML FILES WILL NOT WORK ANYMORE. 
Two important differences:
1. The app only looks in one file for settings: config/application.yml. If you want to override something, do it in that file. It is gitignore'd. If config/application.yml does not exist, or exists but is in the old format, you'll get a nice friendly set of instructions on how to convert your old file.
2. script/server settings are no longer in application.yml. They have their own settings file - copy config/script_server_config.yml.example to config/script_server_config.yml. This is also gitignore'd. script/server will print a message and exit if that file doesn't exist.
 2011-05-28 19:44:40 -07:00
MrZYX
c5630006b6 better compatibillity with old git versions to get the current rev. 2011-05-26 16:27:56 +02:00
MrZYX
cf1d83878c fixed #747 2011-05-25 22:50:13 +02:00
Raphael Sofaer
286f1b876d Allow anyone to generate a token, restrict tokens to ActivityStreams::PhotosController#create, don't let tokens create sessions. 2011-05-20 15:14:23 -07:00
danielgrippi
be662a65c6 added token authenticatable to user model 2011-05-19 11:57:06 -07:00
Shane Becker
910cc52387 rename config/app_config.yml to config/app.yml in accordance to The Redundant Rendundacy Act of 2011 2011-05-18 11:46:45 -07:00
MrZYX
2a449aa8c4 uncomment the new s3_region setting so that nobody needs to update his app_config.yml when he's using S3 2011-05-18 16:21:54 +02:00
cyberkov
eb615c3e7e Added region config to carrierwave to select other regions than US 2011-05-18 15:57:02 +02:00
danielgrippi
7042b43799 use appconfig instead of config 2011-05-16 18:54:50 -07:00
danielgrippi
55d39521c4 rescue redis connection attempts in websocket 2011-05-16 18:34:37 -07:00
danielgrippi
8821043ed7 work in process 2011-05-16 18:27:12 -07:00
Sarah Mei
43ab8cfcfa Tell devise that :mobile is a navigational format. 2011-05-14 15:46:56 -07:00
Sarah Mei
c8e9225dfb For the love of god, normal Rails logs in test & development. 
There's now a setting in app_config.yml, :enable_splunk_logging, which if true outputs godawful machine-readable splunk logs. It's false in test and development, and true elsewhere.
 2011-05-14 13:29:54 -07:00
MrZYX
92bf8444a7 added spec; rtl? -> direction_for 2011-04-03 04:20:08 +02:00
MrZYX
a7a8da2f75 added detection of rtl languages on every user based input 2011-04-03 02:14:35 +02:00
MrZYX
a05c9b0010 fixed a translation, keep up the new format in en.yml, set pagination labels in application controller 2011-03-19 14:04:11 +01:00
MrZYX
ed8d4db3a8 some reformatting/refactor of en.yml. This might break some translations but I think I've catched the most ones, at least the most important ones 2011-03-12 03:27:28 +01:00
Raphael Sofaer
c259fc65f0 You can now pass hashes to the logger 2011-03-09 11:48:29 -08:00
Raphael Sofaer
e00a033e9e Update rspec-instafail, test git headers 2011-03-06 10:18:37 -08:00
MrZYX
feb47df97e total refactor of version header. X-Git-Update: ISO 8601 formated date of the last commit, X-Git-Revision: sha1 hash of the last commit 2011-02-21 17:13:11 +01:00
MrZYX
e02c3eafc0 Merge branch 'xheader' of https://github.com/diasporg/diaspora into xheader 2011-02-21 16:12:24 +01:00
Raphael Sofaer
6cf8de94a7 take secret token stuff out of chef scripts 2011-02-16 22:46:43 -05:00
David Morley
151b23f77b remove modulization part 2011-02-15 11:11:40 -08:00
David Morley
e3df222d0e move file 2011-02-15 10:42:02 -08:00
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
Raphael
399a8965cc Merge remote branch 'ultrasaurus/365-app-config-warning' 2010-10-31 23:30:56 -07:00
livefromthemoon@gmail.com
bbd0d35070 Fix some bugs for I18n fallbacks 2010-10-31 22:39:54 +01:00
livefromthemoon@gmail.com
9e27797092 Fallback to default language when a translation is missing for the current language 2010-10-31 22:39:54 +01:00
livefromthemoon@gmail.com
cf82a0a9c8 Better to set the default locale in an initializer than in a before_filter 2010-10-31 22:39:54 +01:00
zhitomirskiyi
2c0a189df4 removed the session secret from the repo 2010-10-29 12:20:06 -07:00
Sarah Allen
ef2c8fbfdc Rails.env is a string, not a symbol 2010-10-28 21:28:20 -07:00
zhitomirskiyi
21c75c08bb removed the http inspect 2010-10-26 19:19:34 -07:00
zhitomirskiyi
c4b79aebc0 mongo query profing 2010-10-26 18:42:53 -07:00
zhitomirskiyi
0b2e00b7d6 MS IZ the mailer will not be setup unless turned on in the APP_CONFIG 2010-10-26 17:46:19 -07:00
Sarah Mei
33410899d9 Fix for build breakage 2010-10-25 21:38:53 -07:00
danielvincent
6ff94e67b3 remove unused fb_config.yml files. removed oauth_keys.yml from git, updated .example" 2010-10-25 17:50:04 -07:00
maxwell
c489f49a25 DG beginning to collapse twitter&facebook 2010-10-25 17:41:58 -07:00
maxwell
c4ff07b09a twitter oauth dance complete 2010-10-25 17:41:58 -07:00
ilya
b337d5acc9 delivery method test in tests 2010-10-22 16:36:54 -07:00
ilya
47b03c45b2 commented out the email interceptor 2010-10-22 10:37:04 -07:00
maxwell
5701c3a873 should send the email when a new request is received. emails in dev should be intercepted to email@joindiaspora.com for now 2010-10-22 00:49:01 -07:00
MrZYX
5fa623552d made smtp sender address configurable 2010-10-21 19:47:30 +02:00
danielvincent
9bfb213465 Merge branch 'invites' of github.com:diaspora/diaspora into invites 2010-10-11 11:52:57 -07:00
Alec Leamas
0c30f544d9 Fallback to static version data if git unavailable. 
Uses the file config/gitversion if git is unavailable.  This is to
support deployment without git (which will be necessary). Installation
script will generate the file config/gitversion when app is shipped.
 2010-10-10 16:38:01 +02:00
ilya
9a34ca07c4 Merge branch 'master' of github.com:diaspora/diaspora into invites 2010-10-07 19:25:42 -07:00
ilya
ddb98502b9 setup the controller, still need to make the person 2010-10-07 19:25:34 -07:00
danielvincent
75aadc5c57 DG MS; cleaned up routes, killed all deprication warnings in everything. totally legit. 2010-10-07 18:25:59 -07:00
danielvincent
2e73104d6f DG MS; updated BSON gems, added devise-mongomapper gem fix, using unforked devise 1.1.2 2010-10-07 18:17:26 -07:00
ilya
97f058c625 moving to app config yml 2010-10-07 17:00:38 -07:00
ilya
ad348ed24c trying the mailer_condig 2010-10-07 16:54:38 -07:00
Raphael
1fd3aeabd9 Add or later to license notice 2010-10-07 16:25:34 -07:00
ilya
720d1daa9e moved the mailer settings back into env 2010-10-07 15:40:18 -07:00
ilya
8fae836b65 isolating the problem 2010-10-07 15:28:58 -07:00
ilya
e174722315 Merge branch 'master' of github.com:diaspora/diaspora 2010-10-07 15:06:03 -07:00
ilya
43600905dc trying making the port an int 2010-10-07 15:05:52 -07:00
Raphael
a01a059293 Merge branch 'master' of github.com:diaspora/diaspora 2010-10-07 14:47:32 -07:00
ilya
7aa49b277c moved the smtp setting to intializers 2010-10-07 14:36:08 -07:00
Raphael
9912769b5b Merge remote branch 'guillei/s3_upload' 2010-10-07 14:17:43 -07:00
Crimer
56ed245db0 MongoMapper now not overrides database name in MONGOHQ_URL configuration if provided. It also works on Heroku. 2010-10-07 14:29:17 +00:00
ilya
b823213c0d added a generate:secret_token task, and added an initializer to generate one if the file does not exist 2010-09-27 15:29:55 -07:00
Dorian
6ffc03a4c9 Big clean up: delete trailing whitespace 2010-09-26 12:48:40 -04:00
Guillermo
6e0082da9e Files are uploaded to S3 if the ENV variables are set (Heroku-friendly) 2010-09-26 11:03:47 -05:00
Stephen Caudill
536cea5e44 Remove consecutive empty lines 2010-09-25 12:06:39 -04:00
Raphael
beda67aca6 Shorten git show stuff 2010-09-24 17:51:51 -07:00
Raphael
2489f8503f Merge branch 'master' into HEAD 
Conflicts:
	app/controllers/albums_controller.rb
	app/controllers/aspects_controller.rb
	app/controllers/photos_controller.rb
	app/controllers/registrations_controller.rb
	app/controllers/requests_controller.rb
	app/helpers/dashboards_helper.rb
	app/views/albums/show.html.haml
	app/views/aspects/manage.html.haml
	app/views/shared/_aspect_nav.haml
	app/views/shared/_sub_header.haml
	app/views/status_messages/_status_message.html.haml
	app/views/status_messages/show.html.haml
	config/locales/de.yml
	config/locales/en.yml
	config/locales/es.yml
	config/locales/fr.yml
 2010-09-22 21:32:03 -07:00
danielvincent
8941975224 DG IZ; example extension convention for app_config 2010-09-22 10:59:23 -07:00
ilya
6d6ca3d8bc added terse_pod_url to the APP_CONFIG hash 2010-09-21 20:01:56 -07:00
ilya
96aaf3093c Make load_app_config more robust, point to the right folder in db seed 2010-09-21 18:04:36 -07:00
ilya
b01928af4b RS IZ if yaml fails to load (empty config) file load the example 2010-09-21 17:52:23 -07:00
ilya
efd901dcd9 RS, IZ; Pod url moved to app_config.yml, app_config.yml refactored, diaspora_handle now set based on APP_CONFIG 2010-09-21 15:46:57 -07:00
Raphael
60e29f6572 Magent should use the same settings as mongomapper, app config should load first, websocket spec is a little better. 2010-09-19 16:37:34 -07:00
Ariel Zavala
0b91a2c186 Added I18n initializer 2010-09-18 08:08:32 +08:00
Ariel Zavala
7bb3d9c87a Merge branch 'master' of http://github.com/diaspora/diaspora 2010-09-17 17:21:29 -04:00
Ariel Zavala
c6cdf65fc8 updated local configuration 2010-09-17 10:26:57 -04:00
Raphael
c520fb71a7 Moved socket out to separate process. Multiple thins should now be possible 2010-09-16 21:34:15 -07:00
Ariel Zavala
0be3314e0a merge with diaspora and resolved a conflict 2010-09-16 20:42:45 -04:00
danielvincent
ae83dae1ca added git info (branch,date,author) to debug partial 2010-09-16 17:03:14 -07:00
cryptix
c80a79dea5 Unified require quotes 2010-09-17 07:44:47 +08:00
Ariel Zavala
ab5e7319ee Added I18n initializer 2010-09-16 11:46:34 -04:00
Jamie Wilkinson
fbdd50172d Cleanup stray whitespace 2010-09-16 10:07:59 +08:00
Jesse Kriss
30e655fd6c adding heroku-friendly mongo config 2010-09-16 09:46:09 +08:00
Raphael
708e9f88a5 Spell our own name right 2010-09-15 17:56:18 -07:00
Raphael
aa3ebe372c License notices replaced 2010-09-15 10:58:48 -07:00
Daniel Vincent Grippi
4c15b1a01c added license to every single goddamn file. also, put one in the root dir. 2010-09-13 14:23:50 -07:00
Raphael
960d40278c Add username, login with username or email 2010-09-08 10:59:08 -07:00
Raphael
efb4100e01 Split up socket debug and app debug 2010-08-23 13:58:09 -07:00
Raphael
7ed31ab96a Moving to file store 2010-08-18 16:37:05 -07:00
ilya
5dff3369ad DG IZ; removed puts statements. 2010-08-17 10:48:40 -07:00
Raphael
599d1da620 Moved socket code out to lib, unsocketing from view should now work again 2010-08-11 12:03:26 -07:00
Raphael
c14bb5a4f8 Changed info logging to debug logging almost everywhere 2010-08-09 14:39:37 -07:00
Raphael
614c8c72ba RS, DG; Log files should now rotate 2010-08-09 14:27:17 -07:00
Raphael
088da2544b RS, DG; We now delete channels when there is nobody subscribed to them 2010-08-09 14:11:46 -07:00
Raphael
33a827c33a RS, DG; Websocket is now working again, users have a channel 2010-08-09 13:02:08 -07:00