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

14839 commits

This branch
This branch
All branches
Author SHA1 Message Date
Ethan Bruning
d1c7559c29 Added check to see if Mongod is running 2010-09-18 07:37:35 +08:00
Patrick Aljord
182c6228f3 show comments ordered by created_at, they are showing up at random order without that 2010-09-18 07:36:21 +08:00
ilya
2b70317677 Merge branch 'master' of github.com:diaspora/diaspora 2010-09-17 15:33:51 -07:00
Ariel Zavala
4558f9901e Added translations to photos and registrations controllers 2010-09-17 18:25:36 -04:00
Raphael
5b29c2700a Restore thin yml 2010-09-17 15:03:16 -07:00
Raphael
84789f64c9 scope album queries through user 2010-09-17 14:57:14 -07:00
Raphael
f5c10bb24c Put master deploy info back in master 2010-09-17 14:39:15 -07:00
Ariel Zavala
ce3284f1a1 Merge branch 'master' into i18n 2010-09-17 17:28:55 -04:00
Ariel Zavala
7bb3d9c87a Merge branch 'master' of http://github.com/diaspora/diaspora 2010-09-17 17:21:29 -04:00
maco
10edabd681 Merge branch 'master' of git://github.com/diaspora/diaspora 2010-09-17 21:14:44 +00:00
Ariel Zavala
c1c20e14f7 Added translations to requests controller 2010-09-17 17:05:54 -04:00
Stephen Caudill
81d753e773 Refactor Album spec 
* use let(!) where appropriate (see [1] for more info).
* use `context` to portray scenarios
* use `describe` to portray method and Class specifications
* omit the word "should" from example descriptions (Dave Chelimsky
  remarked to me that it was "tantamount to line-noise" and I'm of the
  opinion that it adds no value.
* use more idiomatic Ruby (prefer things like 2.times to 1.upto(2))
* use more idiomatic Rails (prefer 1.minute.from_now to Time.now +
  60*60)
* use more idiomatic Rspec (prefer album.should be_valid to
  album.valid?.should be_true
* also ensure to only make one assertion per example

Other sundry cleanups.

[1] http://rdoc.info/github/rspec/rspec-core/master/RSpec/Core/Let/ClassMethods#let-instance_method
 2010-09-17 16:41:58 -04:00
maco
cc44dcc7a4 ubuntu-setup.bash: for rubygems, use maverick's repo or if lucid use ppa or if old use tarball. create /var/lib/gems/1.8/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games-friendly symlink if using debs 2010-09-17 20:40:33 +00:00
Ariel Zavala
f95cebcb8b Added translations to new requests view and aspects controller 2010-09-17 16:38:50 -04:00
maco
b50ffdc246 Merge branch 'master' of git://github.com/diaspora/diaspora 2010-09-17 20:16:33 +00:00
Raphael
b3549c79f4 Give slightly more specific error message 2010-09-17 12:49:49 -07:00
Raphael
71ac61c01d Fix websocket specs 2010-09-17 12:49:05 -07:00
Ariel Zavala
cb145c346a Added I18n translations to helpers 2010-09-17 15:30:02 -04:00
Ariel Zavala
0014024870 Added I18n translations to helpers 2010-09-17 15:26:31 -04:00
maco
5cdeec5d1a Merge branch 'master' of git://github.com/diaspora/diaspora 2010-09-17 19:03:36 +00:00
Raphael
a96a52def7 Run 3 thins 2010-09-17 11:58:34 -07:00
Raphael
ce2260b747 Merge branch 'master' of github.com:diaspora/diaspora into production 2010-09-17 11:57:36 -07:00
Raphael
3859f8a529 Adding instructions to readme 2010-09-17 10:56:42 -07:00
Raphael
5df33a6fd0 Take out users/show, use current_user in update 2010-09-17 10:50:18 -07:00
Raphael
be26794e4a only write to your own profile 2010-09-17 10:46:14 -07:00
Raphael
511a4487de Make running the websocket server a little easier 2010-09-17 10:44:15 -07:00
ilya
f80b0b80b5 Merge branch 'master' of github.com:diaspora/diaspora 2010-09-17 10:39:07 -07:00
Raphael
99ad001d28 Fix websocket spec, take out puts in by_webfinger 2010-09-17 09:52:31 -07:00
Raphael
5c48e81f67 Give a little more feedback on the websocket server 2010-09-17 09:48:01 -07:00
Ariel Zavala
271925a7f6 added photo view translations 2010-09-17 11:34:45 -04:00
Ariel Zavala
c6b34be63d Added people views translations 2010-09-17 11:27:08 -04:00
Ariel Zavala
1384b65565 added more translations missing on views 2010-09-17 10:46:03 -04:00
Ariel Zavala
375f4f6808 added more translations missing on views 2010-09-17 10:43:59 -04:00
Ariel Zavala
c6cdf65fc8 updated local configuration 2010-09-17 10:26:57 -04:00
maco
d12dc32c34 Merge branch 'master' of git://github.com/diaspora/diaspora 2010-09-17 13:10:51 +00:00
ilya
659c06d0cf Merge branch 'master' of github.com:diaspora/diaspora 2010-09-16 23:04:03 -07:00
Raphael
cf02b3221c Merge branch 'production' of github.com:diaspora/diaspora into production 2010-09-16 21:53:47 -07:00
Raphael
2e8ecceaf7 Merge branch 'master' of github.com:diaspora/diaspora into production 2010-09-16 21:53:34 -07:00
Raphael
7c02200a67 Finish moving out websocket server, add task to start it 2010-09-16 21:42:16 -07:00
Raphael
b45906f902 Merge branch 'master' of github.com:diaspora/diaspora 2010-09-16 21:35:48 -07: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
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