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

2594 commits

This branch
This branch
All branches
Author SHA1 Message Date
Raphael
c520fb71a7 Moved socket out to separate process. Multiple thins should now be possible 2010-09-16 21:34:15 -07:00
Ariel Zavala
d7e9744e84 Merge branch 'master' of http://github.com/diaspora/diaspora 2010-09-16 23:53:18 -04:00
Ariel Zavala
9adcb3a48d French locale included 2010-09-16 23:53:09 -04:00
Ariel Zavala
07138041b0 Fixed album controller errors 2010-09-16 23:35:57 -04:00
ilya
fc234390c3 Merge branch 'master' of github.com:diaspora/diaspora 2010-09-16 19:44:29 -07:00
danielvincent
9199f40bed Merge branch 'master' of github.com:diaspora/diaspora into production 2010-09-16 18:56:41 -07:00
danielvincent
f335c5f50b Merge branch 'master' of github.com:diaspora/diaspora 2010-09-16 18:56:00 -07:00
danielvincent
292a38e694 DG IZ; arrow keys work in fancybox. removed background color change on close button on hover 2010-09-16 18:55:54 -07:00
maxwell
e668071ea5 README.md 2010-09-16 18:48:18 -07:00
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
c2c3a51622 Merge branch 'master' of github.com:diaspora/diaspora into production 2010-09-16 17:35:58 -07: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
Raphael
b0c87fcffa Add a little more feedback to rake task 2010-09-16 17:04:59 -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
9d1063d39d Merge branch 'master' of github.com:diaspora/diaspora into production 2010-09-16 16:42:46 -07:00
Raphael
dea0912c28 Do a more specific query in the fix rake task 2010-09-16 16:41:28 -07:00
danielvincent
25b4b409be Merge branch 'master' of github.com:diaspora/diaspora into production 2010-09-16 16:19:48 -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
Guido Serra aka Zeph
4ce2505a65 wrong! fullpath required 2010-09-17 00:24:30 +02: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
Etienne Membrives
1c16f80c04 Merge branch 'locale-de' of http://github.com/ccoenen/diaspora 2010-09-16 15:16:57 -07:00
Ariel Zavala
f430961672 Merge branch 'master' of http://github.com/diaspora/diaspora 2010-09-16 18:15:32 -04:00
Etienne Membrives
ed54c50f48 French localization done 2010-09-16 15:14:05 -07:00
Guido Serra aka Zeph
42180f20ab Merge branch 'master' of ../diaspora 2010-09-17 00:07:45 +02: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
Guido Serra aka Zeph
4d8c83adad issue #9 on github: missing OsX/MongoDB info 2010-09-16 23:56:47 +02:00