Ariel Zavala
58c2d0dd28
merged with diaspora master; this fork has spanish, german and french translations (need some help with the last two)
2010-09-18 02:21:45 -04:00
ilya
01e3bdaa29
Merge branch 'master' of github.com:diaspora/diaspora
2010-09-17 23:02:45 -07:00
Mikhail Zubrov
08bdaf7340
add a Russian translation
2010-09-18 09:58:29 +04:00
ZTurtleMan
7d0db11444
Lithuanian local should use 'lt' not 'en'
2010-09-18 13:07:34 +08:00
Vytautas Jakutis
211bc1b59a
adding Lithuanian locale, thanks to my friends and typewith.me :)
2010-09-18 08:14:51 +08:00
Ariel Zavala
6c3882ce57
Added devise spanish locale
2010-09-18 08:08:32 +08:00
Ariel Zavala
0b91a2c186
Added I18n initializer
2010-09-18 08:08:32 +08:00
Rick Waldron
535f6ed334
More clean up to decrementRequestsCounter()
2010-09-18 08:05:51 +08:00
Rick Waldron
fcdc1d914c
Cached all reused match selector sets, moved synchronous functions into callbacks where needed for optimization; Moved all DOM manip into $(function () {} )
2010-09-18 08:04:47 +08:00
Rick Waldron
773839308c
Moved .live(...) into $(function() {}) block - DOM logic should not be left to synchronously execute outside of a DOMContentLoaded closure
2010-09-18 08:03:59 +08:00
Johan Brinch
1f2592db18
Remove trailing whitespace
2010-09-18 08:02:02 +08:00
Don Park
2d16289e46
use photos_path to generate the correct POST destination for photo uploads
2010-09-18 07:50:12 +08:00
Sven Kräuter
3457883787
added missing directory creation for mongodb mac os x installation
2010-09-18 07:48:24 +08:00
cori schlegel
6223b7d78f
update README with mongodb install info for other Ubuntu distros
2010-09-18 07:45:57 +08:00
T-Moe
2e55666b46
Added note about universe being required under Ubuntu to Readme.md
2010-09-18 07:38:47 +08:00
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
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
Ariel Zavala
f95cebcb8b
Added translations to new requests view and aspects controller
2010-09-17 16:38:50 -04: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
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
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