David Morley
d848537df8
blacklist example admin username
2011-11-06 09:07:13 -08:00
Maxwell Salzberg
5348c72209
add sqlite method; fix chubbies cukes
2011-09-30 14:27:54 -07:00
Paul Spieker
0c12471feb
add username blacklist
2011-09-30 14:17:04 +02:00
danielgrippi
91e649977c
MS DG update copyright
2011-09-14 11:23:12 -07:00
Raphael Sofaer
a987b198fd
Fix search in PG
2011-06-22 15:09:00 -07:00
Raphael Sofaer
e8552fc417
Fix direct query execution issues in PG by using select_values/select_rows instead of execute.
2011-06-22 14:47:59 -07:00
danielgrippi
9f05ac1f33
Newrelic now working in thin
2011-06-02 14:18:38 -07:00
danielgrippi
23dd975551
Don't depend on Rails.root as thin does not have it before app require
2011-06-02 12:18:22 -07:00
danielgrippi
918284a8f8
include newrelic if the newrelic config file is present. profiling ftw.
2011-06-02 12:10:03 -07: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
MrZYX
e4db8c7a36
fixed #589 , no CSS!
2011-04-03 02:10:41 +02:00
MrZYX
abf385d79d
collapsed langcodes_alias_map.yml and languages.yml into locale_settings.yml
2011-02-20 14:35:24 +01:00
Jairo Diaz
133828edeb
fixed typo for default_language at environment.rb
2011-01-16 16:14:24 -05:00
Sarah Mei
b865c20b2d
Backing out sub-uri changes
2011-01-09 18:29:43 -08:00
Alec Leamas
e01fb62eeb
Expose and refer to assets on the sub_uri.
...
When using sub-uri, create a symlink in public/ making the assets
available at the sub-uri. Modify environment.rb so that asset paths
refers to this sub-uri path. Closes http://bugs.joindiaspora.com/issues/391
and http://bugs.joindiaspora.com/issues/737 when application mounted
on suburi (i. e., prev patch)
2011-01-09 23:38:03 +01:00
Alec Leamas
6a90646eaa
Nullifying test garbage in last patch
2010-12-29 10:46:29 +01:00
Alec Leamas
8d218e7871
suburi cucumber test.
...
Adds the features/uri-features test directory, testing sub-uri
deployment. These tests uses script/server since much of this code is
about configuring the server. They are not run by "rake cucumber", to
run them use "bundle exec rake cucumber features/uri-test".
Tests requires a working app_config.yml setup with pod_url =
"http://localhost:3000/diaspora "
Patches cucumber.yml to always load step definitions from features/**, see
http://thoughtsincomputation.com/posts/cucumber-step-definitions-and-autorequire-hell
2010-12-29 10:31:25 +01:00
maxwell
081e85f224
Revert "Extended sub-uri support." for now....
...
This reverts commit 9cd08bac67 .
2010-12-20 18:12:12 -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
MrZYX
dcbcaefcbe
added language codes map
2010-11-18 15:13:30 -08:00
danielvincent
4976503c0f
let nginx serve static assets.
2010-11-12 11:47:19 -08:00
livefromthemoon@gmail.com
52522c102e
add some basic verification when loading the languages config file
2010-10-28 18:09:25 +02:00
livefromthemoon@gmail.com
b7a586b1a5
allow user to change his language in his settings
2010-10-28 17:29:17 +02:00
Raphael
1fd3aeabd9
Add or later to license notice
2010-10-07 16:25:34 -07:00
Raphael
de9cdfbe7b
Always set the FACEBOOK constant
2010-10-05 17:46:14 -07:00
Raphael
37fb2bfd32
Don't require a facebook yml
2010-10-05 16:57:22 -07:00
ilya
08b9aa864a
Merge branch 'master' of github.com:diaspora/diaspora into fb
...
Conflicts:
app/views/layouts/application.html.haml
app/views/shared/_publisher.haml
app/views/shared/_sub_header.haml
app/views/users/edit.html.haml
config/deploy_config.yml
config/routes.rb
2010-09-27 15:39:50 -07:00
Stephen Caudill
536cea5e44
Remove consecutive empty lines
2010-09-25 12:06:39 -04:00
danielvincent
9571ade89c
basic setup
2010-09-21 12:29:39 -07:00
Steve Klabnik
22edec5776
Adding Haml html escaping.
...
Haml's HTML escaping option was not on, leaving the site open for xss
attacks. This would seem to fix it.
2010-09-17 07:44:23 +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
ilya
5dfc097c88
replaced the functionality with openssl, didn't do the encryption spec
2010-08-04 20:32:15 -07:00
ilya
895742824d
Sped up specs, fixed env
2010-07-08 21:23:08 -04:00
ilya
a5db2cd231
Added keyrings to gitignore, symlinked to shared dir in cap scripts
2010-07-08 20:54:20 -04:00
ilya
9e8426ceb4
RS, IZ; Users now have keys, keyring now in db folder
2010-07-08 19:57:10 -04:00
maxwell
60fa7e3ac4
view stuffs
2010-06-23 01:26:00 -07:00
Raphael Sofaer
0390bbde8a
Activerecord this time\!
2010-06-11 10:40:49 -07:00