Raphael
|
3b4b4f4ed3
|
Add a couple things to gitignore
|
2010-09-24 15:35:18 -07:00 |
|
Raphael
|
be623a0c3a
|
Merge branch 'master' into 1.9.2
|
2010-09-24 15:18:59 -07:00 |
|
Raphael
|
999d229225
|
Post photos in either 1.8.7 or 1.9.2
|
2010-09-24 15:18:30 -07:00 |
|
Raphael
|
004e659ee1
|
fix album posting
|
2010-09-24 15:10:49 -07:00 |
|
Raphael
|
ae7c869bc3
|
Add specs for album controller failure
|
2010-09-24 15:01:36 -07:00 |
|
Raphael
|
1f62f910e3
|
fix requires in db seeds
|
2010-09-24 14:43:23 -07:00 |
|
Raphael
|
5c32cbaee8
|
Fix requires in rake task
|
2010-09-24 14:40:30 -07:00 |
|
Raphael
|
950c6a7cab
|
Merge branch '1.9.2' into HEAD
Conflicts:
app/models/photo.rb
|
2010-09-24 14:36:00 -07:00 |
|
Raphael
|
19199dabfe
|
fix spec_helper for 1.9.2
|
2010-09-24 11:49:30 -07:00 |
|
Raphael
|
40120bb441
|
Moving to activemodel validations
|
2010-09-24 11:15:39 -07:00 |
|
Raphael
|
b9bff76054
|
Initial 1.9.2, specs fail (possibly validatable), need to pull in aredridel photo fixes
|
2010-09-24 09:49:42 -07:00 |
|
Raphael
|
70a22ae839
|
Merge branch 'master' into HEAD
Conflicts:
app/models/post.rb
app/models/user.rb
config/initializers/socket.rb
|
2010-09-24 09:15:10 -07:00 |
|
Pistos
|
7dc813a15a
|
Added a newline before a list, so that the list can be properly interpreted as a list (Markdown syntax).
|
2010-09-24 11:48:34 +08:00 |
|
Pistos
|
86f462cc42
|
Strip trailing whitespace.
|
2010-09-24 11:48:34 +08:00 |
|
Raphael
|
16b6fc6cdc
|
Don't give exception on webfinger with no query
|
2010-09-23 17:18:34 -07:00 |
|
Raphael
|
d748d456b5
|
Revert "fix in person partial"
This reverts commit 8c0bc4b9e6.
|
2010-09-23 16:21:08 -07:00 |
|
Raphael
|
264555e63b
|
Update css
|
2010-09-23 15:15:19 -07:00 |
|
Raphael
|
c6c361b5e6
|
Add lucida sans, thanks danieleds
|
2010-09-23 15:14:44 -07:00 |
|
Raphael
|
8690967509
|
defaults doesn't really make sense when there's nothing else
|
2010-09-23 14:58:17 -07:00 |
|
Raphael
|
972cb54828
|
Move locale files, fix syntax error in fr-informal
|
2010-09-23 14:52:06 -07:00 |
|
Raphael
|
82bc5b097d
|
Use double quotes in locale files
|
2010-09-23 14:43:38 -07:00 |
|
Raphael
|
efedac7e32
|
Punctuate
|
2010-09-23 14:27:23 -07:00 |
|
Raphael
|
86c70b9698
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-09-23 14:26:37 -07:00 |
|
Raphael
|
e3c6926cf7
|
Moving installation instructions to a wiki page
|
2010-09-23 14:26:23 -07:00 |
|
UserAd
|
cfd3523030
|
Stupid error fix
|
2010-09-24 05:02:30 +08:00 |
|
UserAd
|
7a9e347b28
|
Improved russian locale
|
2010-09-24 05:02:30 +08:00 |
|
Maël Soucaze
|
49162a6ead
|
The underscore (fr_informal) is replaced by the hyphen (fr-informal).
|
2010-09-24 04:51:49 +08:00 |
|
Maël Soucaze
|
4cd83f9ae9
|
Change the file organization, and Casual Honorifics is now Informal Honorifics.
|
2010-09-24 04:51:49 +08:00 |
|
Maël Soucaze
|
d7eb828064
|
Language fix.
|
2010-09-24 04:51:48 +08:00 |
|
Maël Soucaze
|
c243304c97
|
Welcome to the French Casual Honorifics localization thanks to the brainchild of michael-k!
|
2010-09-24 04:51:03 +08:00 |
|
Raphael
|
cadcb81583
|
Gems we don't actually need...
|
2010-09-23 12:33:27 -07:00 |
|
ilya
|
c31489b42b
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-09-23 12:31:40 -07:00 |
|
ilya
|
04e670f0d0
|
deploy script now uses public url
|
2010-09-23 12:31:19 -07:00 |
|
Raphael
|
3381c46050
|
Revert "mongodb now in Fedora repos."
This reverts commit d55c0ae551.
|
2010-09-23 12:21:05 -07:00 |
|
Raphael
|
cfe019d7a9
|
Take out async controller until we actually put it in the app
|
2010-09-23 12:19:28 -07:00 |
|
danielvincent
|
af91eb51b4
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-09-23 10:49:41 -07:00 |
|
danielvincent
|
8c0bc4b9e6
|
fix in person partial
|
2010-09-23 10:49:35 -07:00 |
|
maxwell
|
40d736d233
|
MS changed the session page to show APP_CONFIG[:terse_pod_url]
|
2010-09-23 10:39:47 -07:00 |
|
maxwell
|
457be4385b
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-09-23 10:39:04 -07:00 |
|
danielvincent
|
5d0f4dd587
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-09-23 10:29:50 -07:00 |
|
danielvincent
|
e6d1b8b808
|
fixed syntax in welsch translation
|
2010-09-23 10:29:36 -07:00 |
|
Dan Cirnat
|
4be2fdef8f
|
Removed "sample" message from Romanian locale
|
2010-09-24 01:26:31 +08:00 |
|
Dan Cirnat
|
3d1ca6adc8
|
Romanian locale added
|
2010-09-24 01:26:31 +08:00 |
|
Raphael
|
95396cd9b2
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-09-23 10:24:17 -07:00 |
|
Raphael
|
ed6df7d1bf
|
Delete user.terse_url
|
2010-09-23 10:24:10 -07:00 |
|
danielvincent
|
6025bee819
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-09-23 10:17:21 -07:00 |
|
danielvincent
|
c000b31ffb
|
query for post through user
|
2010-09-23 10:17:13 -07:00 |
|
Alec Leamas
|
c1242a0984
|
typo fix
|
2010-09-24 01:16:08 +08:00 |
|
Alec Leamas
|
d55c0ae551
|
mongodb now in Fedora repos.
|
2010-09-24 01:16:08 +08:00 |
|
mousey
|
b1dd054fdb
|
More Welsh Localization
|
2010-09-24 01:14:33 +08:00 |
|