maxwell
|
1a642e044a
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-11-05 17:43:30 -07:00 |
|
danielvincent
|
1a481d43d2
|
Use _stream_element.haml as a wrapper for posts in the stream.
|
2010-11-05 17:40:28 -07:00 |
|
maxwell
|
4a39d1a516
|
date now has a default nil value
|
2010-11-05 17:38:51 -07:00 |
|
danielvincent
|
9a055b6cba
|
Photo partial now has a description and a link to view all photos by that person.
|
2010-11-05 17:27:36 -07:00 |
|
maxwell
|
4300b20c34
|
cleaned up profile page a bit more
|
2010-11-05 14:28:39 -07:00 |
|
danielvincent
|
bd9aa90278
|
User receives notification on new comment on post on any page.
|
2010-11-05 14:18:22 -07:00 |
|
Raphael
|
4233e45bc5
|
Adjust wording
|
2010-11-05 11:23:21 -07:00 |
|
maxwell
|
997f9ad8d0
|
making profile not look so bad
|
2010-11-05 00:54:09 -07:00 |
|
Sarah Mei
|
a230763879
|
gender is a text field
|
2010-11-04 22:02:27 -07:00 |
|
Raphael
|
1bba4c60f7
|
Merge remote branch 'MrZYX/untranslated-strings'
Conflicts:
app/views/aspects/manage.html.haml
config/locales/diaspora/en.yml
|
2010-11-04 20:05:57 -07:00 |
|
Derrick Camerino
|
087f7e90d4
|
removing aspect in ui only if ok is clicked on confirmation
|
2010-11-04 19:54:11 -07:00 |
|
Raphael
|
abebd18c98
|
Move getting_started self link color to a css class
|
2010-11-04 19:29:15 -07:00 |
|
Raphael
|
c1c631d5ed
|
Merge remote branch 'jdeisenberg/496-eliminate-self-links-getting-started' into 496-jdeisenberg
Conflicts:
config/locales/diaspora/en.yml
|
2010-11-04 18:56:43 -07:00 |
|
danielvincent
|
be916384a1
|
collapsed remove from aspect and remove person into one function on aspects#manage
|
2010-11-04 17:50:48 -07:00 |
|
Raphael
|
20508ad37a
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-11-04 16:45:03 -07:00 |
|
Raphael
|
3634658cbf
|
The Governator's party has lost the election.
|
2010-11-04 16:44:17 -07:00 |
|
danielvincent
|
b74dfcf5fd
|
comments autolink
|
2010-11-04 16:18:49 -07:00 |
|
MrZYX
|
1102fcd565
|
made flash messages translatable
|
2010-11-04 20:49:50 +01:00 |
|
MrZYX
|
63a5fdb000
|
made a bunch of strings translatable
|
2010-11-04 20:49:50 +01:00 |
|
MrZYX
|
f84b14bd19
|
unscope are_you_sure in photos/show.html.haml
|
2010-11-04 20:49:50 +01:00 |
|
danielvincent
|
82c82b8ccc
|
killed albums
|
2010-11-04 10:17:19 -07:00 |
|
danielvincent
|
3e001c74d6
|
Albums#index hidden from views. Photos must be accessed through a person.
|
2010-11-03 12:21:14 -07:00 |
|
danielvincent
|
a31c22adb3
|
mailer doesn't break everything anymore. attachments are also inlined.
|
2010-11-02 17:59:50 -07:00 |
|
Raphael
|
ae039442c3
|
Websocket now uses cookie to authenticate
|
2010-11-02 17:39:50 -07:00 |
|
danielvincent
|
a79d1f5240
|
tabbing on publisher to everyone focuses submit button
|
2010-11-02 17:35:12 -07:00 |
|
danielvincent
|
a995d250f1
|
added white text on grey asset to mailer
|
2010-11-02 17:19:49 -07:00 |
|
danielvincent
|
da8124f8a7
|
hcard has searchable field, and is taken in to account when building Person from webfinger
|
2010-11-02 16:12:43 -07:00 |
|
danielvincent
|
fff43bf650
|
profile defaults key searchable to true. search takes searchable into account.
|
2010-11-02 16:12:42 -07:00 |
|
Raphael
|
6503cefd68
|
Get rid of some repeated ids, fix infieldlabels on manage page
|
2010-11-02 15:37:06 -07:00 |
|
Raphael
|
bfcb2a9e18
|
Remove random href
|
2010-11-02 12:37:32 -07:00 |
|
Raphael
|
a9b429d163
|
Merge remote branch 'ed0h/helper-method-for-markdown'
|
2010-11-02 12:14:41 -07:00 |
|
Raphael
|
8778bdab3b
|
Merge remote branch 'ed0h/503-language-html-tag'
|
2010-11-02 11:43:12 -07:00 |
|
danielvincent
|
a3ce5f1cd7
|
REMOVED IMPORTER
|
2010-11-02 11:17:47 -07:00 |
|
Raphael
|
67219248b0
|
unscope i18n calls
|
2010-11-02 10:32:34 -07:00 |
|
livefromthemoon@gmail.com
|
aab74cf1ff
|
Added markdown support for status messages
|
2010-11-02 03:55:14 +01:00 |
|
Hexagon
|
938d146405
|
Common translations are used without the namespace
|
2010-11-02 00:07:24 +01:00 |
|
danielvincent
|
3a4f100806
|
remove *
|
2010-11-01 15:01:49 -07:00 |
|
Hexagon
|
1acc206fa4
|
#475: Fixed more untranslated strings
|
2010-11-01 22:22:13 +01:00 |
|
livefromthemoon@gmail.com
|
2b890e6ef2
|
Added 'lang' attribute in the html tag
|
2010-11-01 21:31:12 +01:00 |
|
Raphael
|
07e96e5a37
|
Merge remote branch 'jdeisenberg/492-vague-signup-wording'
|
2010-10-31 23:44:50 -07:00 |
|
zhitomirskiyi
|
c86a3eb608
|
moved getting started logic to the controller
|
2010-10-31 19:33:11 -07:00 |
|
Sarah Mei
|
0817409e9a
|
Fixed deprecation warning
|
2010-10-31 17:48:38 -07:00 |
|
J David Eisenberg
|
f54820f456
|
Issue #496: Eliminate self-links in Getting Started
|
2010-10-31 12:16:07 -07:00 |
|
J David Eisenberg
|
14ccf7229b
|
Issue #492: Informal, vague description when signing up as a new user
|
2010-10-30 22:07:37 -07:00 |
|
Hexagon
|
bba3aaa684
|
Translating a huge amount of untranslated strings
|
2010-10-30 15:25:42 +02:00 |
|
danielvincent
|
8ec49e685b
|
going to a non-friend's page contains a way to add them.
|
2010-10-29 15:43:44 -07:00 |
|
danielvincent
|
f2b7e4010e
|
edit profile link on owner's profile page.
|
2010-10-29 15:02:56 -07:00 |
|
danielvincent
|
6eb50ea934
|
profile photo uploader is now a standard form file element. Upload new image through people#update, which calls current_user.post to do so.
|
2010-10-29 14:11:59 -07:00 |
|
danielvincent
|
79ec02c6ad
|
photo uploader on edit profile page.
|
2010-10-29 14:11:59 -07:00 |
|
Raphael
|
d753e31205
|
Merge remote branch 'ed0h/309-user-choose-language'
Add explicit language set to spec in users_controller_spec.rb
Conflicts:
app/models/user.rb
|
2010-10-29 12:06:14 -07:00 |
|