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
