Commit graph

1915 commits

Author SHA1 Message Date
Ariel Zavala
34d784bbbc Merge branch 'master' of http://github.com/maelsoucaze/diaspora 2010-09-16 21:18:50 -04:00
Ariel Zavala
db41bcc144 Merge branch 'locale-de' of http://github.com/ccoenen/diaspora 2010-09-16 21:09:11 -04:00
Ariel Zavala
0be3314e0a merge with diaspora and resolved a conflict 2010-09-16 20:42:45 -04:00
danielvincent
755e2a744c DG IZ; dropzones now light up when dragging on aspect page 2010-09-16 17:30:49 -07:00
danielvincent
95a4120e57 DG IZ; dropzones on left back on aspect manage page. 2010-09-16 17:22:42 -07:00
danielvincent
f614729060 Merge branch 'master' of github.com:diaspora/diaspora 2010-09-16 17:03:21 -07:00
danielvincent
ae83dae1ca added git info (branch,date,author) to debug partial 2010-09-16 17:03:14 -07:00
Guido Serra aka Zeph
2dc0fc9965 wrong! fullpath required 2010-09-17 07:52:42 +08:00
maco
1e8834a8d5 README.md: add note about bundle's location with Ubuntu debs 2010-09-17 07:49:33 +08:00
maco
3cf085c3c1 README.md: add PPA instructions for rubygems 1.3.7 for Ubuntu 10.04 2010-09-17 07:49:33 +08:00
hemanth
193deb9767 Corrected a comment # Check if the user has sudo privileges. 2010-09-17 07:48:47 +08:00
hemanth
e9df690644 Added --no-install-recommends to apt-get to avoid additional extra packages. 2010-09-17 07:48:47 +08:00
hemanth
87feb5bba5 Removed root check and added sudo check. 2010-09-17 07:48:46 +08:00
hemanth
f76bc6ffc4 Updated all apt-get installs with apt-get -y to avoid prompts during installation. 2010-09-17 07:48:46 +08:00
hemanth.hm
04d55ef35e Added ubuntu setup script 2010-09-17 07:48:46 +08:00
danielvincent
9997493c45 Merge branch 'master' of github.com:diaspora/diaspora 2010-09-16 16:47:16 -07:00
danielvincent
d74c4bd117 DG IZ; use focus instead of click 2010-09-16 16:47:10 -07:00
Guido Serra aka Zeph
4d8eb3d532 issue #9 on github: missing OsX/MongoDB info 2010-09-17 07:45:54 +08:00
cryptix
c80a79dea5 Unified require quotes 2010-09-17 07:44:47 +08: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
dea0912c28 Do a more specific query in the fix rake task 2010-09-16 16:41:28 -07:00
maxwell
bbc7492af4 Merge branch 'master' of github.com:diaspora/diaspora 2010-09-16 16:17:23 -07:00
maxwell
1e8f10f1af MS rake task to fix broken local people.... let me test it first on a server, but then you can run rake db:fix_diaspora_handle 2010-09-16 16:12:45 -07:00
danielvincent
cbb692b6a3 Merge branch 'master' of github.com:diaspora/diaspora 2010-09-16 16:06:28 -07:00
danielvincent
0c7ba49e34 DG IZ; aspect deletion 2010-09-16 16:03:18 -07:00
patcito
abf121f53c added link to diaspora Q&A shapado site 2010-09-17 07:02:03 +08:00
Ariel Zavala
b727fe42f5 Merge branch 'master' of http://github.com/diaspora/diaspora 2010-09-16 18:56:02 -04:00
Claudius Coenen
64b07fca55 Merge branch 'master' of http://github.com/diaspora/diaspora into locale-de 2010-09-17 00:23:43 +02:00
Claudius Coenen
5197c1b3ec adding localisation for controller's flash messages' 2010-09-17 00:23:35 +02:00
Ariel Zavala
f430961672 Merge branch 'master' of http://github.com/diaspora/diaspora 2010-09-16 18:15:32 -04:00
maxwell
e7afebece8 Merge branch 'master' of github.com:diaspora/diaspora 2010-09-16 15:07:02 -07:00
maxwell
2e8785b596 applying this change from wiki, thanks astronouth7303 2010-09-16 15:04:29 -07:00
Claudius Coenen
aeedf2fc22 adding german translation 2010-09-16 23:55:57 +02:00
Raphael
0eb2c97aef object_path shouldn't create links to users 2010-09-16 14:51:27 -07:00
Claudius Coenen
80f2880329 Merge branch 'locale-de' of http://github.com/felgru/diaspora 2010-09-16 23:43:22 +02:00
maxwell
b155d07abd Merge branch 'master' of github.com:diaspora/diaspora 2010-09-16 14:38:32 -07:00
maxwell
6f867d60c4 MS fixed the nil hostname on user 2010-09-16 14:38:24 -07:00
Raphael
9827f02874 I'm still learning markdown 2010-09-16 14:38:08 -07:00
Raphael
1d8d35cb98 Add contributor agreement to readme 2010-09-16 14:36:35 -07:00
Ariel Zavala
8f56178bd2 added diaspora site specific localization files 2010-09-16 17:29:25 -04:00
Ariel Zavala
d7ca279fa9 Revert "Moved diaspora specific locales to diaspora.en.yml and diaspora.es.yml"
This reverts commit b7cfbd6fd7.
2010-09-16 17:27:26 -04:00
Ariel Zavala
b7cfbd6fd7 Moved diaspora specific locales to diaspora.en.yml and diaspora.es.yml 2010-09-16 17:05:11 -04:00
Raphael
0d2037af1e Merge branch 'master' of github.com:diaspora/diaspora 2010-09-16 13:46:05 -07:00
Ariel Zavala
060ba12376 Started Spanish Locale 2010-09-16 16:30:17 -04:00
Maël Soucaze
f4aeca66f8 French localisation. 2010-09-16 22:17:00 +02:00
Ariel Zavala
e10e5df760 Merge branch 'master' of http://github.com/diaspora/diaspora 2010-09-16 15:56:06 -04:00
Ariel Zavala
be9ae343cc Added localizations that I had missed 2010-09-16 15:55:54 -04:00
Ariel Zavala
6a967e7fe9 Added localization to status message views 2010-09-16 15:47:12 -04:00
danielvincent
1d616f001a Merge branch 'master' of github.com:diaspora/diaspora 2010-09-16 12:14:46 -07:00
Ariel Zavala
ec9affb849 Merge branch 'master' of http://github.com/diaspora/diaspora 2010-09-16 15:14:38 -04:00