maxwell
|
a0ce9630b1
|
added test for facebook posting
|
2010-10-15 16:03:02 -07:00 |
|
maxwell
|
3af3e86911
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-15 16:02:43 -07:00 |
|
ilya
|
d06c6ced38
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-15 15:30:39 -07:00 |
|
danielvincent
|
47be7b1f0a
|
correct html5 search box
|
2010-10-15 15:29:57 -07:00 |
|
maxwell
|
d56800f9e8
|
fixing facebook posting
|
2010-10-15 14:53:36 -07:00 |
|
ilya
|
2c9c4b0e14
|
Merge branch 'master' of github.com:diaspora/diaspora
Conflicts:
app/views/invitations/_new.haml
|
2010-10-15 14:36:49 -07:00 |
|
danielvincent
|
3b01e86f90
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-15 14:22:43 -07:00 |
|
danielvincent
|
6f282e77ff
|
make public checkbox
|
2010-10-15 14:22:28 -07:00 |
|
ilya
|
0074aadd48
|
added a select tag to email invitations
|
2010-10-15 14:21:08 -07:00 |
|
Raphael
|
35ebe38cac
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-15 14:14:43 -07:00 |
|
Raphael
|
a8e8480e94
|
Add vendor/bundle to gitignore
|
2010-10-15 14:14:32 -07:00 |
|
maxwell
|
e8c49feca4
|
made the public info link in all aspects publisher
|
2010-10-15 14:10:10 -07:00 |
|
maxwell
|
7e0825e492
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-15 13:58:40 -07:00 |
|
danielvincent
|
12bdd1712d
|
share on facebook checkbox instead of broadcast button
|
2010-10-15 13:56:49 -07:00 |
|
maxwell
|
6a7538b273
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-15 11:29:31 -07:00 |
|
maxwell
|
a61c126aad
|
manage page now uses partial
|
2010-10-15 11:29:23 -07:00 |
|
danielvincent
|
db31357172
|
another typo change
|
2010-10-15 11:16:04 -07:00 |
|
danielvincent
|
d18b59f3d3
|
typo fix
|
2010-10-15 11:12:12 -07:00 |
|
maxwell
|
20f164fd45
|
fixing some of the invite copy
|
2010-10-15 11:11:25 -07:00 |
|
Sarah Mei
|
2a6279207e
|
Replace ref to github issues with link to redmine. Also, fussy copy edits.
|
2010-10-14 23:27:30 -07:00 |
|
maxwell
|
733fb3b68e
|
dump typo in spec
|
2010-10-14 23:12:44 -07:00 |
|
maxwell
|
0f75072477
|
make import spec pending with diaspora handle bug
|
2010-10-14 23:03:23 -07:00 |
|
maxwell
|
341009e20f
|
Merge branch 'master' of github.com:diaspora/diaspora into maxwell
Conflicts:
Gemfile
Gemfile.lock
spec/models/user/invite_spec.rb
|
2010-10-14 23:02:06 -07:00 |
|
Sarah Mei
|
85865bc9b1
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-14 20:51:59 -07:00 |
|
Sarah Mei
|
5e8d34621a
|
ohai rails 3.0.1
|
2010-10-14 20:51:54 -07:00 |
|
maxwell
|
11925ded2b
|
moving branches
|
2010-10-14 19:15:32 -07:00 |
|
ilya
|
b4b338b3cd
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-14 18:12:34 -07:00 |
|
ilya
|
4a7c4e0848
|
requests are made on invite but perhaps they should be made on signup so that we have a person
|
2010-10-14 18:12:18 -07:00 |
|
Raphael
|
0680c2b5a6
|
Merge remote branch 'maelsoucaze/fr-locales'
|
2010-10-14 17:43:27 -07:00 |
|
Raphael
|
9e90463455
|
Fix bug if app_config[url] has no trailing slash. Thanks to binarycleric.
|
2010-10-14 17:29:26 -07:00 |
|
Raphael
|
ecc7a55f8b
|
Merge remote branch 'flea/master'
Conflicts:
.gitignore
|
2010-10-14 17:24:46 -07:00 |
|
Raphael
|
51c5b73256
|
Merge branch 'empty-page'
Conflicts:
public/stylesheets/application.css
|
2010-10-14 17:00:19 -07:00 |
|
Raphael
|
08e629668d
|
I18ning empty_messages
|
2010-10-14 16:55:00 -07:00 |
|
maxwell
|
d61a227fc7
|
posts now serialize their created_at time
|
2010-10-14 16:49:08 -07:00 |
|
maxwell
|
a30a2666c6
|
merging
|
2010-10-14 16:32:37 -07:00 |
|
danielvincent
|
45d7d54c66
|
added an empty message for the case of an aspect with no friends
|
2010-10-14 16:23:29 -07:00 |
|
maelsoucaze
|
9134c4545c
|
Fixes and updates French (Informal Honorifics) localization.
|
2010-10-15 01:17:33 +02:00 |
|
maelsoucaze
|
753deedc65
|
Fixes and updates French (Formal Honorifics) localization.
|
2010-10-15 01:17:17 +02:00 |
|
Raphael
|
65958cf85c
|
Should close Issue 368
|
2010-10-14 15:53:43 -07:00 |
|
danielvincent
|
750b4b4388
|
empty message re-appears if all stream posts are deleted
|
2010-10-14 15:40:34 -07:00 |
|
danielvincent
|
8daf2d0fd5
|
add none message to aspect#index
|
2010-10-14 15:23:15 -07:00 |
|
danielvincent
|
cf2a4c25ae
|
DG RS; remove empty message from stream upon adding something
|
2010-10-14 15:19:37 -07:00 |
|
danielvincent
|
5722f85c85
|
message in aspect if stream is empty
|
2010-10-14 15:00:47 -07:00 |
|
Raphael
|
4341b85a12
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-14 14:47:04 -07:00 |
|
Raphael
|
c287e30f07
|
fix db seeds
|
2010-10-14 14:46:46 -07:00 |
|
danielvincent
|
32a0f60a2f
|
moved photos link to the side bar for now
|
2010-10-14 14:38:19 -07:00 |
|
Raphael
|
1ab34ab07a
|
Removing generated CSS from git
|
2010-10-14 14:05:51 -07:00 |
|
Raphael
|
d66c1e70bc
|
Merge remote branch 'bigbash/280-bug-fix'
|
2010-10-14 13:21:50 -07:00 |
|
Raphael
|
be8cacdc79
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-14 13:15:38 -07:00 |
|
Raphael
|
fc8dc3f041
|
Add generated CSS to gitignore
|
2010-10-14 13:15:01 -07:00 |
|