Raphael
|
5f85cf2588
|
Simplifying validations a little
|
2010-10-29 17:26:28 -07:00 |
|
Raphael
|
05cd57b02c
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-29 16:56:40 -07:00 |
|
Raphael
|
555c15dfef
|
Simplify validations on user
|
2010-10-29 16:56:04 -07:00 |
|
danielvincent
|
5a9bfa7405
|
DG IZ; post senders are now verified by diaspora handles
|
2010-10-29 16:49:59 -07:00 |
|
Raphael
|
3d2dd073ea
|
Take diaspora_handle out of user
|
2010-10-29 15:52:54 -07: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
|
7acc138a21
|
resolved issue regarding profile images referenced at https:// locations.
|
2010-10-29 14:56:41 -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 |
|
maxwell
|
a7b3fc48ec
|
https is now a valid url for people. thx grippi
|
2010-10-29 12:30:38 -07:00 |
|
maxwell
|
9c2ca15e93
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-29 12:09:32 -07:00 |
|
maxwell
|
c6fbcd28f7
|
stubbing out the hub publish method
|
2010-10-29 12:09:10 -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
|
6d139ab946
|
more tests pass
|
2010-10-29 11:17:39 -07:00 |
|
maxwell
|
1b48572674
|
MS tests are now green
|
2010-10-29 11:16:50 -07:00 |
|
maxwell
|
fddec49655
|
adding nexttick
|
2010-10-29 11:15:14 -07:00 |
|
zhitomirskiyi
|
8b3a9cd801
|
adding some zombie friend puts
|
2010-10-29 11:15:14 -07:00 |
|
maxwell
|
dae9f6540b
|
adding case for error message being emmited
|
2010-10-29 11:14:28 -07:00 |
|
maxwell
|
eddcb71fcb
|
EM websocket cleanly merged with master. webfingering is now async
|
2010-10-29 11:11:05 -07:00 |
|
maxwell
|
0aae89aa03
|
adding case for error message being emmited
|
2010-10-29 11:06:31 -07:00 |
|
maxwell
|
c645e2aff9
|
removing double fetch in dev utils controller
|
2010-10-29 11:05:18 -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
|
4776f4810e
|
fixed failing spec for photos_controller#edit
|
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 |
|
Sarah Mei
|
14fedf5369
|
GAHHH STOP EMAILING ME (specs pass)
Also, added attr_protected to Photo#person and Photo#person_id.
|
2010-10-29 00:59:26 -07:00 |
|
Raphael
|
f1ae95fac9
|
443- patch trim on validation + spec
|
2010-10-28 20:03:49 -07:00 |
|
Raphael
|
78acdb7368
|
Pushing broken photo controller spec for dan to fix
|
2010-10-28 16:19:18 -07:00 |
|
Raphael
|
512f40eac2
|
attr_accessible on Post
|
2010-10-28 15:50:19 -07:00 |
|
zhitomirskiyi
|
55b38585d6
|
Merge branch 'master' of github.com:diaspora/diaspora
|
2010-10-28 12:13:50 -07:00 |
|
zhitomirskiyi
|
f484eb957f
|
comments now don't imbed the person in the xml
|
2010-10-28 12:13:39 -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
|
6626b00961
|
fix on aspect#show in @friends_not_in_aspect
|
2010-10-28 11:11:05 -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
|
52522c102e
|
add some basic verification when loading the languages config file
|
2010-10-28 18:09:25 +02:00 |
|
livefromthemoon@gmail.com
|
c4d8f4e587
|
remove two useless lines of code
|
2010-10-28 17:38:45 +02:00 |
|
livefromthemoon@gmail.com
|
b7a586b1a5
|
allow user to change his language in his settings
|
2010-10-28 17:29:17 +02:00 |
|
livefromthemoon@gmail.com
|
6e1121179d
|
guess locale from browser 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
|
59858cd86b
|
opts[:person] set to empty hash only if not already defined. same with opts[:person][:profile]. rake db:reset works properly again.
|
2010-10-27 18:34:51 -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 |
|