danielvincent
601284a171
make profile photo action uses :remote=>true rails ajax helpers. added photos#make_profile_photo.
2010-11-30 15:58:26 -08:00
Raphael
366734ca5e
Take queries out of aspect contacts pane on home page
2010-11-30 15:35:32 -08:00
Raphael
e86a5563ed
Override request started log line
2010-11-29 14:03:29 -08:00
maxwell
bf79d62317
Merge branch 'master' of github.com:diaspora/diaspora
2010-11-29 13:41:38 -08:00
maxwell
4ef7c4d6d1
make the build pass (we no longer socket photos at all) and also more test fixing around request. we were saving requests to early in the cycle, most likely cruft before it was refactored.
2010-11-29 13:39:48 -08:00
Raphael
eccc25e20a
Add pending specs for log_overrider... hit a wall when I wanted more information than is being passed to ActiveSupport::Notifier
2010-11-29 13:14:27 -08:00
danielvincent
d7c5e12d64
move photo-show js to assets. remove EM::next_tick from controller#create actions. make photo show pages render again.
2010-11-28 02:30:25 -05:00
Raphael
845e1fe7a3
Fix comments ajax response
2010-11-28 01:31:05 -05:00
Raphael
cbe98a1479
Add spec to commentscontroller
2010-11-28 00:39:23 -05:00
Raphael
703e8e0426
Add spec for js requests on stmc create
2010-11-28 00:36:05 -05:00
Raphael
6d6b07fb92
Use form_tag, not form_for, in _new_comment
2010-11-27 23:24:29 -05:00
danielvincent
f59c6e2427
refactored comments to work like status_messages in the controller. weird stuff was happening when using EM::next_tick; holding off on that for now.
2010-11-27 23:06:34 -05:00
Raphael
d2bfffca92
Fix PeopleController, add specs
2010-11-27 21:46:07 -05:00
Raphael
7ca124c002
Refactor views to not be so dumb.
2010-11-27 21:27:27 -05:00
danielvincent
64f7a20ff4
fixed specs, took out that nasty raise.
2010-11-27 16:20:46 -05:00
maxwell
c65c62906c
pushing so dan can look at how to stub EM:next_tick correctly
2010-11-27 16:20:46 -05:00
Raphael
7030ed0fed
Putting youtube titles back into status messages
2010-11-27 11:43:24 -05:00
Raphael
d5d4a08f03
Start moving youtube title getting into the post/comment flow
2010-11-27 01:00:47 -05:00
Raphael
d81db97054
take out request routed
2010-11-26 21:15:03 -05:00
Raphael
0fa93706a6
Make request completed log line complete
2010-11-26 21:15:02 -05:00
Raphael
e09b544f26
Add specs to log overrider
2010-11-26 21:15:02 -05:00
danielvincent
ce63e13eca
aspect ids normalized to posts to minimize queries on views.
2010-11-26 18:55:06 -05:00
Raphael
fb85ffe406
Adding specs for log_overrider
2010-11-26 18:38:08 -05:00
Sarah Mei
abae16472d
pagination works on aspects#show
2010-11-26 13:09:05 -08:00
danielvincent
417301088f
fixed build
2010-11-26 00:56:53 -05:00
Raphael
690951dcd1
Take a query out of the views
2010-11-25 23:53:45 -05:00
Raphael
33ba00377e
Add performance spec
2010-11-25 23:53:45 -05:00
Raphael
08ba387311
More sane redirect on failing to accept an invitation
2010-11-25 00:39:13 -05:00
zhitomirskiyi
9ca54a2282
accepting an invitation correctly adds the request to the user
2010-11-23 18:58:26 -08:00
zhitomirskiyi
a9b503b65e
made the dev. util things pending
2010-11-23 15:49:50 -08:00
zhitomirskiyi
3f737116d6
since there is only one person with that name in the db, it returns a redirect
2010-11-23 11:02:17 -08:00
maxwell
da16e3ee1e
PALINDROME invite form can now take comma seperated multiple emails, so you only have to click the box once
2010-11-23 00:08:30 -08:00
maxwell
7c09117230
fixing build
2010-11-22 19:05:35 -08:00
zhitomirskiyi
1519fd46bf
Sending a request to someone who requested you autoaccepts the request
2010-11-22 12:21:26 -08:00
danielvincent
b3ec4d10c2
user can now remove contact from aspects on contact's profile page. a contact's posts are retained in a given aspect reflecting the duration of said contact's inclusion.
2010-11-21 16:30:45 -08:00
maxwell
9b7d2ed0f6
DG MS; status messages can now have photos.
2010-11-21 16:13:01 -08:00
danielvincent
242d0ab9c5
a search yielding exactly one person will redirect to that person's page. hotkey ctrl+f triggers focus on search box.
2010-11-21 16:11:55 -08:00
Raphael
4ce2de55e2
Fix photo show, js on people search page
2010-11-21 13:29:50 -05:00
zhitomirskiyi
c2dcf9a074
fixed the invite spec
2010-11-18 16:55:44 -08:00
zhitomirskiyi
d0d261fdae
zero default invites, the rake task starts people with 5 invites
2010-11-18 16:23:35 -08:00
Sarah Mei
c19ebcece3
Request delete now returns head :ok instead of redirecting. On client side, request div is removed.
2010-11-17 22:28:24 -08:00
danielvincent
056dc7d3ba
DG MS; added homecontroller to take care of landing page and aspects index redirecting in regards to user's logged in state.
2010-11-17 19:37:08 -08:00
Raphael
f3a301d314
Don't expect raises in request specs, redirect to :back on all requesting
2010-11-16 16:18:16 -08:00
Raphael
0f1517af15
Redirect directly to the login page no registrations closed
2010-11-15 12:24:58 -08:00
Raphael
d3098cf6bc
Add option to close registration in app_config
2010-11-15 12:15:40 -08:00
Sarah Mei
830a43ec2f
Add destroy specs for RequestsController.
...
Cucumber feature for contact requests.
2010-11-14 09:43:28 -08:00
danielvincent
ed50fe7f1f
Aspect.people -> Aspect.contacts. Fixed diaspora.en to reflect friend -> contact changes.
2010-11-12 20:22:56 -08:00
danielvincent
aa9966ea26
removed the word friend everywhere minus translation files
2010-11-12 20:22:55 -08:00
danielvincent
a21af7cac6
friend_users -> connect_users in helper_methods
2010-11-12 20:22:54 -08:00
Raphael
8232a92ca0
Update _person and person show, add specs for those pages
2010-11-10 12:41:18 -08:00
Sarah Mei
a39bd2badb
AspectsController#manage now works if you have pending friend requests.
2010-11-10 12:05:28 -07:00
maxwell
4037ae9f33
fixing controller test
2010-11-09 16:55:54 -08:00
Raphael
390fffdee6
Fix new request view
2010-11-09 15:03:56 -08:00
Raphael
bfa0917ce4
add a couple specs
2010-11-09 14:07:26 -08:00
zhitomirskiyi
77fe7a1462
Revert "IZ local comment destroy"
...
This reverts commit cb9fb0ad94
2010-11-08 19:32:43 -08:00
zhitomirskiyi
34179d60db
Merge branch 'master' of github.com:diaspora/diaspora
2010-11-08 18:21:02 -08:00
zhitomirskiyi
cb9fb0ad94
IZ local comment destroy
2010-11-08 18:19:55 -08:00
maxwell
a84f9437b0
trying another thing to get the redirect working
2010-11-08 17:43:59 -08:00
maxwell
4164ceaf90
trying another thing to get the redirect working
2010-11-08 16:30:46 -08:00
maxwell
52908cec1a
services controller should now go back to the referer. this might not actually work
2010-11-08 16:18:15 -08:00
maxwell
3fd5852d44
Merge branch 'master' of github.com:diaspora/diaspora
2010-11-08 15:56:18 -08:00
maxwell
2162a2e3f9
collapse person's photos and status message into their profile; also, made these nested on a person
2010-11-08 15:55:58 -08:00
zhitomirskiyi
cbabc547a2
Merge branch 'master' of github.com:diaspora/diaspora
2010-11-08 15:10:32 -08:00
zhitomirskiyi
e50f29b032
the profile cannot massassign diaspora handle
2010-11-08 15:10:23 -08:00
maxwell
4d2820e31c
MS RS fixed photo show bug
2010-11-08 14:05:01 -08:00
Raphael
9970ee0e22
Write comments controller spec
2010-11-05 14:15:40 -07:00
Raphael
0ce37bbfa8
Remove some extra receives in tests
2010-11-05 14:15:40 -07:00
Raphael
693847480b
Take out notifier stubbing, it's in test mode.
2010-11-05 11:31:52 -07:00
Sarah Mei
c816a1f78e
RegistrationsController#create re-renders the form instead of redirecting, so user doesn't lose what they've entered.
...
Took out RegistrationsController#update, since all it was doing was calling super.
Took out stubbing of user save, because I actually want to check that save is doing the right thing.
2010-11-04 22:51:30 -07:00
Raphael
f6d899f1d9
Move prep_image_url into profile image_url setter
2010-11-04 18:46:15 -07:00
danielvincent
82c82b8ccc
killed albums
2010-11-04 10:17:19 -07:00
zhitomirskiyi
a55878f2a3
invitations controller test, tnx coyote
2010-11-03 22:58:42 -07:00
zhitomirskiyi
2da1f860cd
validate user ownership on status message destroy
2010-11-03 18:04:10 -07:00
zhitomirskiyi
6a6cedbc62
oops did not save the pending
2010-11-03 16:43:10 -07:00
zhitomirskiyi
8246882067
MS IZ fixed some permissions in photo controller
2010-11-03 16:42:33 -07:00
zhitomirskiyi
3578daa14e
IZ MS more photo controller specs
2010-11-03 12:21:32 -07:00
maxwell
62c25057e6
adding photocontroller spec for IZ
2010-11-03 10:43:27 -07:00
Raphael
5cdeed6c54
Add a spec to people_controller, make those specs a little clearer
2010-11-02 17:10:19 -07:00
Raphael
ccd92fb850
make requests controller spec a little clearer
2010-11-02 16:55:23 -07:00
Raphael
bbd8cadc14
Retaining specs and line from robustdj's patch
2010-11-02 11:27:51 -07:00
Raphael
9d273c6d24
Now expecting a 500 on someone passing an id to create, should really be a 422
2010-11-01 12:31:00 -07:00
Raphael
488df6eaa0
RS IZ a good test to overwrite ids
2010-11-01 11:35:37 -07:00
Raphael
7f7697c11d
Merge remote branch 'traction/441-failed-aspect-creation-redirect'
2010-10-31 23:22:10 -07:00
Sarah Mei
ce213513eb
PeopleController#update handles getting an empty string for :image
2010-10-31 17:49:47 -07:00
danielvincent
b08c4fb84e
removed user#aspect method. all aspect creation should be scoped through the user -> aspect association proper: user.aspects.create(opts)
2010-10-31 12:34:26 -07:00
Raphael
ccf3b7d87b
stub out some stuff in publics_controller
2010-10-29 19:10:29 -07:00
Raphael
f7708fb9bf
Get rid of deprecation warning
2010-10-29 18:55:30 -07:00
Raphael
49e1bde150
Stub user creation in registrations_controller
2010-10-29 18:46:57 -07:00
Raphael
555c15dfef
Simplify validations on user
2010-10-29 16:56:04 -07:00
maxwell
15bd24a64f
Merge branch 'master' of github.com:diaspora/diaspora
...
Conflicts:
spec/lib/message_handler_spec.rb
spec/spec_helper.rb
2010-10-29 16:23:33 -07:00
Raphael
99eb25762d
Moving to make_user, a few specs broken
2010-10-29 15:53:21 -07:00
maxwell
a272b22208
Merge branch 'master' of github.com:diaspora/diaspora
2010-10-29 15:16:17 -07:00
danielvincent
7acc138a21
resolved issue regarding profile images referenced at https:// locations.
2010-10-29 14:56:41 -07:00
maxwell
7e7c4c3431
refactored message handler spec
2010-10-29 14:26:11 -07:00
Raphael
86ddc2561a
fix spec in users_controller
2010-10-29 13:22:25 -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
1b48572674
MS tests are now green
2010-10-29 11:16:50 -07:00
zhitomirskiyi
534cc112bf
IZ MS rebase master
2010-10-29 11:15:13 -07:00
maxwell
acd977a115
adding pending spec to check for error within webfinger process
2010-10-29 11:14:55 -07:00
maxwell
eddcb71fcb
EM websocket cleanly merged with master. webfingering is now async
2010-10-29 11:11:05 -07:00
