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
|
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 |
|
maxwell
|
8fe339b03b
|
EM websocket cleanly merged with master. webfingering is now async
|
2010-10-29 11:05:17 -07:00 |
|
danielvincent
|
51dd6d32b3
|
upload a photo button next to publisher
|
2010-10-29 10:38:53 -07:00 |
|
danielvincent
|
1d399598d3
|
user now has a uploads meta album for photos. fixed some view issues with photo#show, album#show
|
2010-10-29 10:38:17 -07:00 |
|
danielvincent
|
a7df1bca68
|
photos do not require an album. uploading files on a user's photos#index page will post to all aspects.
|
2010-10-29 10:38:17 -07:00 |
|
danielvincent
|
2b4e3e3a41
|
a person now has a photos#index page.
|
2010-10-29 10:38:17 -07:00 |
|
danielvincent
|
d02c36b53a
|
quickfix in add_friend_dropdown
|
2010-10-28 11:30:45 -07:00 |
|
danielvincent
|
a0d83e28a1
|
copy in manage page by clicking 'add a new friend' for now
|
2010-10-28 11:28:58 -07:00 |
|
danielvincent
|
bb9a6e47a4
|
added birthday and gender to Profile. fixed a view issue on getting_started#2
|
2010-10-28 11:01:16 -07:00 |
|
livefromthemoon@gmail.com
|
b7a586b1a5
|
allow user to change his language in his settings
|
2010-10-28 17:29:17 +02:00 |
|
danielvincent
|
06654b13b2
|
posts don't socket into services#index anymore.
|
2010-10-27 22:55:58 -07:00 |
|
danielvincent
|
dc89d984f1
|
put remove buttons on incoming requests, allowing a user to ignore again.
|
2010-10-27 18:36:15 -07:00 |
|
danielvincent
|
1d5b7a87f1
|
Merge branch 'master' into getting-started
|
2010-10-27 18:14:08 -07:00 |
|
danielvincent
|
db1a753add
|
major hack on getting_started#2 with aspect javascript. reload the page on ajax success on new aspect creation just to get it working.
|
2010-10-27 18:08:55 -07:00 |
|
danielvincent
|
05c5e770ee
|
removed real name from signup process.
|
2010-10-27 16:25:22 -07:00 |
|
danielvincent
|
bfb1c6df28
|
collapsed layout views
|
2010-10-27 13:33:42 -07:00 |
|
danielvincent
|
335bd9c96a
|
skip getting started button sets getting_started to false via js and redirects to root_path
|
2010-10-27 12:53:46 -07:00 |
|
danielvincent
|
cd726c0ba7
|
users#getting_started route -> getting_started. getting_started is now a mini-template referring to partials in users/getting_started/
|
2010-10-27 12:21:25 -07:00 |
|
danielvincent
|
4ec11691cd
|
user has a getting_started flag, set true by default. aspect#index checks to see if getting_started flag is set.
|
2010-10-27 10:36:13 -07:00 |
|
zhitomirskiyi
|
63c740fce7
|
Merge branch 'master' of github.com:diaspora/diaspora into contact-refactor
|
2010-10-27 09:53:50 -07:00 |
|
danielvincent
|
a8086f2990
|
further refinements. added back buttons, more explanation text.
|
2010-10-26 23:27:26 -07:00 |
|
danielvincent
|
f1fbb68fd8
|
added success to getting_started. fixed birthday selectors to display years down to 1930. made buttons rounder. all save and continue buttons step forward.
|
2010-10-26 18:35:14 -07:00 |
|
danielvincent
|
385e1673ab
|
Merge branch 'master' into getting-started
Conflicts:
app/controllers/users_controller.rb
app/views/users/_account.haml
app/views/users/_profile.haml
|
2010-10-26 16:50:57 -07:00 |
|
danielvincent
|
e62afae045
|
deselected tabs in top nav, made user drop down a bit clearer
|
2010-10-26 16:12:58 -07:00 |
|