maco
109cb49a9e
ubuntu-setup.bash: fix s/blunder/bundler/ and s/elsif/elif/
2010-09-18 22:10:19 +00:00
mishudark
c46ad0d7fa
photo description with ajax request
2010-09-18 12:33:22 -05:00
Ariel Zavala
f48b8a4748
Moved devise.it to devise locale folder
2010-09-18 11:20:57 -04:00
Ariel Zavala
a77575bb6e
Merge branch 'master' of http://github.com/Darkmagister/diaspora into i18n
2010-09-18 11:18:45 -04:00
Ariel Zavala
216cf8ccd7
Moved devise.ru to devise locale folder
2010-09-18 11:14:39 -04:00
Ariel Zavala
d84e33390a
Merge branch 'master' of http://github.com/MrBison/diaspora into i18n
2010-09-18 11:12:24 -04:00
Ariel Zavala
bf98ec38d0
Moved devise.pl to devise locale folder
2010-09-18 11:09:21 -04:00
Ariel Zavala
8ab5aeb6fb
Merge branch 'production' of http://github.com/sirmacik/diaspora into i18n
2010-09-18 11:08:40 -04:00
Marcin Karpezo
ecadeac86c
fixed translation
2010-09-18 14:27:52 +02:00
Marcin Karpezo
0ce90b4b71
Translated en.yml
2010-09-18 13:34:02 +02:00
maco
0931664b9b
Merge branch 'master' of git://github.com/diaspora/diaspora
2010-09-18 11:33:30 +00:00
Marcin Karpezo
9965140874
Translated devise.en.yml
2010-09-18 13:32:17 +02:00
Darkmagister
32957658ba
adding Italian locale
2010-09-18 12:04:35 +02:00
MrBison
a049cabc2d
oops, a stupid error fixed
2010-09-18 02:18:35 -07:00
MrBison
7e20f42422
oops, a stupid error.
2010-09-18 02:18:07 -07:00
mishudark
b7bc4b8615
prevent next prev when youre add writting
2010-09-18 04:14:44 -05:00
mishudark
910bd71c78
prevent photho redirect next,prev if textarea has focus
2010-09-18 03:32:37 -05:00
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
mishudark
02c3cc0ee7
Merge branch 'master' of http://github.com/diaspora/diaspora
2010-09-18 00:26:58 -05:00
ZTurtleMan
7d0db11444
Lithuanian local should use 'lt' not 'en'
2010-09-18 13:07:34 +08:00
mishudark
4d4adc91ee
Merge branch 'master' of http://github.com/diaspora/diaspora
2010-09-17 22:03:13 -05: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
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