Raphael Sofaer
e2f78a8b8c
Protect against pre-existing post_visibilities, log them so we can find out where they are coming from.'
2011-03-18 14:52:27 -07:00
maxwell
93f7f28b07
if you search for a hash (with a '#') it will just take you to that hash page
2011-03-17 19:16:29 -07:00
maxwell
924dc13adc
profile tagging now federates #FO #REAL
2011-03-17 18:05:49 -07:00
maxwell
562c0d40ac
profile tags now federate
2011-03-17 16:28:17 -07:00
Raphael Sofaer
1c14e2676b
Fix another expectation
2011-03-17 16:14:01 -07:00
Raphael Sofaer
325eeb0ca2
Fix expectation
2011-03-17 15:40:26 -07:00
Raphael Sofaer
bef06d18d8
Move notifying iteration into resque job
2011-03-17 15:19:26 -07:00
zhitomirskiyi
2b6165d8ea
wip
2011-03-17 14:32:07 -07:00
maxwell
4e419f7d1a
photo specs pass
2011-03-17 13:59:53 -07:00
maxwell
82a79c95fe
wrote a test for the callback, need to make it pass...
2011-03-17 13:59:53 -07:00
maxwell
bca184eaf3
photos are now successfully delayed
2011-03-17 13:59:53 -07:00
maxwell
b987b47f5f
there is a job to process photos and it is called from the controller
2011-03-17 13:59:53 -07:00
Raphael Sofaer
0aa5193434
Use the new local batch receive job
2011-03-17 13:41:30 -07:00
Raphael Sofaer
d2cdc20e2b
Finish receive local batch job
2011-03-17 12:56:23 -07:00
Raphael Sofaer
72523cc7f9
SocketsController now takes a user object or a user id, so that we only instantiate the user if we need to
2011-03-17 12:56:23 -07:00
danielgrippi
f0df6deed3
added job and spec for BatchLocalReceive. wip
2011-03-17 12:56:23 -07:00
Raphael Sofaer
3718a72f46
log renders of collections of partials with more info
2011-03-17 11:36:16 -07:00
zhitomirskiyi
a30affe8d3
moved the fixture to the right place
2011-03-17 10:56:59 -07:00
zhitomirskiyi
3d34e3bd35
publishing from a person profile page wip
...
mentioning a person from their profile page, added js & jasmine, still need to add the mention style, and prevent deselecting the last one
a tiny sass add
publishing from the profile works, need js translation
added the translation
made the hover state consistant
need to fix the cucumber spec
specs are green need to add a button
added the buttion to mention people
moved the publisher to the facebox
fixed the cucumbers for the modal window
2011-03-17 10:56:58 -07:00
Kiran Soumya
6d113da242
Bug Fix:868 for Users unable to download photos
2011-03-17 01:14:05 +05:30
danielgrippi
68479481cf
made websockets far less dumb. don't render partials for people not connected.
2011-03-15 18:21:09 -07:00
danielgrippi
8c7ad9a0a3
Remove unused receive local job
2011-03-15 16:13:09 -07:00
danielgrippi
c608c70ca7
tagging profiles complete
2011-03-15 13:21:36 -07:00
danielgrippi
1988e195fb
a user can put tags in their profile and they show up on the person/show page.
2011-03-15 13:21:36 -07:00
danielgrippi
20f5105e5d
breaking out Diaspora::Taggable wip
2011-03-15 13:21:36 -07:00
MrZYX
00bb5167f8
fixed spec
2011-03-15 18:35:27 +01:00
Raphael Sofaer
1666843aa9
Fix 500 in publicsController
2011-03-14 16:48:07 -07:00
Raphael Sofaer
ae22dcc274
Fix jasmine spec
2011-03-14 12:37:20 -07:00
maxwell
b14ac9606f
fix typo, puts in a test, and made the emails types a constant in UserPreferences
2011-03-14 12:21:30 -07:00
Raphael Sofaer
2cd6e89e5c
Fix merge error from message - text refactor
2011-03-14 11:49:10 -07:00
Raphael Sofaer
1b0445563e
Specs passing with text
2011-03-14 11:39:31 -07:00
Raphael Sofaer
4b4654a408
Changing message to text, partway done, deleted data conversion
2011-03-14 11:39:31 -07:00
maxwell
adbd23ec50
more tests for mailing. the bug was i think we have to restart the resque workers
2011-03-14 11:32:59 -07:00
Sarah Mei
03f90a999d
refactor aspects controller spec
2011-03-13 21:32:59 -07:00
Sarah Mei
1d6a69ea82
refactor photos controller spec
2011-03-13 20:54:47 -07:00
Sarah Mei
1702081af7
refactor querying spec a bit
2011-03-13 20:08:53 -07:00
Kiran Soumya
7c3a173010
Bug Fix for #913 with Rspec and Cucumber test cases, for a scenario, where a user is mentioned on a post and when that user closes his account, then his contacts cannot see their homepages due to this post
2011-03-12 11:08:40 +05:30
maxwell
d825eeaaa0
updated to listen to disable mail
2011-03-11 15:43:40 -08:00
maxwell
580f0576c8
added test for edit
2011-03-11 15:43:29 -08:00
maxwell
52b970098b
add specs for updating email settings in the controller, and user#mail
2011-03-11 15:43:29 -08:00
maxwell
e9a843b095
email prefs are now saved. need more tests and use it in user#mail
2011-03-11 15:42:53 -08:00
Raphael Sofaer
7ac3692a92
Fix specs, migrate to downcase tags, still testing migration
2011-03-11 14:23:03 -08:00
Raphael Sofaer
8f1a6f502e
Change equals to sort-of-equals
2011-03-11 14:23:03 -08:00
Sarah Mei
a80179e77f
Fix requires for 1.9 build. Hopefully now it will just fail for perf reasons :p
2011-03-10 23:18:52 -08:00
zhitomirskiyi
35cabd469f
fixed the merge for the author convention
2011-03-10 20:13:52 -08:00
zhitomirskiyi
9b00b2c786
Merge branch 'mnutt-9925139-user-shouldnt-mention-non-friends'
...
Conflicts:
app/models/user.rb
spec/integration/receiving_spec.rb
spec/models/mention_spec.rb
spec/models/status_message_spec.rb
2011-03-10 19:59:12 -08:00
danielgrippi
9ad96726de
just use tag search for now
2011-03-10 19:42:24 -08:00
Raphael Sofaer
b86098055e
Add tag search on public page
2011-03-10 18:37:45 -08:00
Raphael Sofaer
ea98b1ca81
Tags now link to meaningless query in PostsController
2011-03-10 18:37:45 -08:00
Raphael Sofaer
c1bcfef90c
TAGS ARE SO COOL
2011-03-10 18:37:45 -08:00
Dan Hansen
10345b14a8
generate jasmine fixture with posts
2011-03-10 19:12:16 -06:00
Dan Hansen
d7c7775b6c
fallback gracefully, break build if videos can't embed
2011-03-10 18:26:55 -06:00
Raphael Sofaer
05f9d79689
Fix public posts page when signed in
2011-03-10 15:26:55 -08:00
Raphael Sofaer
8f929d2b85
Show local public posts in /p
2011-03-10 14:41:03 -08:00
Michael Nutt
8c5621158d
notification now only created when message is received, not when message is first saved
2011-03-10 16:41:03 -05:00
Raphael Sofaer
8a419a84a6
fix up some specs
2011-03-10 12:55:05 -08:00
Raphael Sofaer
ddbd5febb3
Make people pages publicly accessible
2011-03-10 12:55:05 -08:00
MrZYX
6d314e9394
fixed ostatus builder + spec
2011-03-10 15:17:56 +01:00
maxwell
1baafac84b
added content to rss feed
2011-03-09 19:11:09 -08:00
maxwell
90aac1d175
spec to have ostatus builder still build rss even if an object does not respond to activity
2011-03-09 18:54:09 -08:00
maxwell
337831bba2
move ostatus builder, actually added the file.
2011-03-09 18:01:48 -08:00
maxwell
5b73e9ca06
rename ostatus builder spec to have the correct name
2011-03-09 17:35:21 -08:00
maxwell
1ac688f82c
moved an ostatus builder query out to the controller, where it belongs, and corrected the order
2011-03-09 17:33:47 -08:00
maxwell
9d480b0961
remove status_message#public_message: we never use it
2011-03-09 17:14:37 -08:00
maxwell
f9279f9bbc
fixed public route not fetching posts, also an error in status_message activity markup
2011-03-09 17:08:41 -08:00
Raphael Sofaer
5cc7aa4496
Change some person_ids to author_ids
2011-03-09 15:28:27 -08:00
Raphael Sofaer
e38a136c49
don't quote floats
2011-03-09 15:28:08 -08:00
Raphael Sofaer
3c4ec6d39d
LOG MORE STUFF
2011-03-09 14:29:49 -08:00
Raphael Sofaer
cf93bfc89b
improve hash logger a bit
2011-03-09 14:06:48 -08:00
danielgrippi
d0569fb881
simplified functionality on aspect edit faceboxes
2011-03-09 12:00:49 -08:00
Raphael Sofaer
c259fc65f0
You can now pass hashes to the logger
2011-03-09 11:48:29 -08:00
danielgrippi
1f5edb1d92
Merge branch 'private_messages'
...
Conflicts:
app/controllers/status_messages_controller.rb
app/models/data_point.rb
app/models/status_message.rb
db/schema.rb
lib/fake.rb
public/stylesheets/sass/application.sass
spec/models/mention_spec.rb
2011-03-08 21:23:41 -08:00
zhitomirskiyi
c252cfa025
added the email notification, the notification is not persisted, fixed the receive callback spec
2011-03-08 18:24:56 -08:00
zhitomirskiyi
8bcf1b49c7
notifier for the messages, we're so close
2011-03-08 10:53:49 -08:00
danielgrippi
fca5310c77
dispatch the conversation in ConversationsController
2011-03-07 17:54:25 -08:00
Raphael Sofaer
909a198380
Post photos without text
2011-03-07 10:03:43 -08:00
zhitomirskiyi
80a3a3446a
pulling in
2011-03-06 21:37:27 -08:00
zhitomirskiyi
e537104fb4
pulling in
2011-03-06 21:36:03 -08:00
Raphael Sofaer
e00a033e9e
Update rspec-instafail, test git headers
2011-03-06 10:18:37 -08:00
danielgrippi
48fff29bf6
fixed conversation receive. made visibilities on conversation :dependent => :destroy
2011-03-04 11:19:01 -08:00
Raphael Sofaer
435451bc5b
admins can resend invitations
2011-03-03 16:59:33 -08:00
Raphael Sofaer
da12954d22
Move statusmessage create view out to partial
2011-03-03 11:10:44 -08:00
zhitomirskiyi
9d7611f8d8
addedthe controllers and the views for the message and the conversation inbox, going to pull in some left nav styling
2011-03-02 12:27:57 -08:00
Raphael Sofaer
770091e82b
Don't retrieve all the user's contacts again unnecessarily
2011-03-02 12:11:25 -08:00
zhitomirskiyi
f58c477673
added the forgotten files
2011-03-01 23:55:11 -08:00
Sarah Mei
1590b69569
WTF. Seriously. It works with 1.9 now though.
2011-03-01 21:43:49 -08:00
zhitomirskiyi
3812612c86
added a validation of participant, as well as messages controller spec wip
2011-03-01 19:24:07 -08:00
Raphael Sofaer
68f0f7ec21
Add rcov task
2011-03-01 18:12:42 -08:00
danielvincent
21fd546cd0
posts now have authors instead of people
2011-03-01 18:05:05 -08:00
Raphael Sofaer
0cb218bba0
Delete statistic and data point models
2011-03-01 16:54:12 -08:00
danielvincent
11309574cf
messages are now relayable, a comment has an author as opposed to a person.
2011-03-01 12:39:42 -08:00
danielvincent
c62e9db397
private messages wip
2011-03-01 12:28:34 -08:00
danielvincent
f4e6d0d82b
broke out some comment logic to a replayable module
2011-03-01 12:28:33 -08:00
zhitomirskiyi
bd908a9b95
conversations federate
2011-03-01 12:25:55 -08:00
danielvincent
1072806d8f
PrivateMessage -> Conversation, Message.
2011-03-01 12:25:55 -08:00
danielvincent
a179bac689
fixed migrations, added unread to PrivateMessageVisibilities
2011-03-01 12:25:54 -08:00
danielvincent
979d9d7fb4
added delete actions for private messages
2011-03-01 12:14:31 -08:00
danielvincent
c5801ffb37
basic views / controller actions for private messages
2011-03-01 12:14:31 -08:00
danielvincent
9fe0320881
added PrivateMessage and PrivateMessageVisibility models and migrations
2011-03-01 12:14:31 -08:00
Raphael Sofaer
1c1fba63e7
Refactor notification to have subclasses, just a start
2011-03-01 10:30:29 -08:00
Raphael Sofaer
ebfebb16d7
Fix integration spec
2011-02-28 17:22:40 -08:00
Raphael Sofaer
d8956a7cd5
Add foreign key constraints
2011-02-28 15:18:35 -08:00
Raphael Sofaer
8a4ca3af0e
fix error on account deletion
2011-02-28 11:24:31 -08:00
Sarah Mei
cd8deca4bb
fix jasmine specs
2011-02-26 06:16:34 -08:00
MrZYX
afecfe5e93
save the correct url on redirect in http_multi job; be tolerant about messed up urls in the db
2011-02-26 14:22:14 +01:00
maxwell
782dc55d63
remove puts, fix admins controller test
2011-02-26 14:22:13 +01:00
Dan Hansen
c1e679ff8d
fix syntax error and spec
2011-02-25 18:56:03 -06:00
Raphael Sofaer
22d83ec502
update http_multi to adjust urls when you get a redirect
2011-02-25 14:46:21 -08:00
Sarah Mei
40fa91ead9
Start refactor of comment_spec.
2011-02-24 20:46:05 -08:00
zhitomirskiyi
83576d75ef
stubbing the httpmulti in the test, now you can post to services individually
2011-02-24 17:50:01 -08:00
zhitomirskiyi
c27e2de478
removed pending test
2011-02-24 17:31:54 -08:00
zhitomirskiyi
ec93faa2c4
added the post to services icon on every page added a manage icon and moved the RSS link to the public explain
2011-02-24 17:31:54 -08:00
zhitomirskiyi
adfcc59631
can now select individual services to be added
2011-02-24 17:31:54 -08:00
zhitomirskiyi
e61cc2fd34
made the postzord take the services in individually
2011-02-24 17:31:54 -08:00
zhitomirskiyi
126925f28f
wip
2011-02-24 17:31:54 -08:00
zhitomirskiyi
78b242b110
removed post to services since we are not using it
2011-02-24 17:31:54 -08:00
Raphael Sofaer
50cd06129a
Adjust expected string in mention spec'
2011-02-24 16:01:36 -08:00
Raphael Sofaer
126a4b2547
LOG MORE, on resque job errors
2011-02-24 13:11:57 -08:00
Raphael Sofaer
22c4ebd6de
return a string from a stub
2011-02-24 10:36:06 -08:00
Raphael Sofaer
faf026dec6
Update dispatcher to use HttpMulti job
2011-02-23 16:06:55 -08:00
maxwell
638311125f
typhoeus should now be in. there is a new dependancy on curl and the curl dev headers, so install
2011-02-23 16:06:55 -08:00
maxwell
c9dd2d5b50
add files
2011-02-23 16:06:54 -08:00
zhitomirskiyi
97e00f9ee3
changed the delete to a destroy on retraction, also removed a puts
2011-02-23 12:00:42 -08:00
maxwell
16e8ecc72c
fixing debugging statement in smcontroller, also fix the spec
2011-02-22 22:38:23 -08:00
maxwell
ec21230756
make status_message_controller#create return the error message
2011-02-22 22:01:08 -08:00
Dan Hansen
f41bc0c14d
<3z
2011-02-22 23:19:57 -06:00
Raphael Sofaer
74b8921c09
make video urls have correct href
2011-02-22 18:51:40 -08:00
Sarah Mei
33c7400919
clean up fixture builder
2011-02-21 20:06:54 -08:00
Sarah Mei
814ef38fa9
Don't actually need 36 notifications.
2011-02-21 13:20:39 -08:00
Sarah Mei
26779889d0
To run specs without perf tests: rake spec SPEC_OPTS="--tag ~performance"
2011-02-20 14:40:51 -08:00
Sarah Mei
183c840108
And this is why we pair. ::sigh::
...
(Revert silly change to aspects#index spec.)
2011-02-20 01:54:06 -08:00
Sarah Mei
8c1fc12d82
Don't use sleep when you want different timestamps on your posts. Just set created_at directly.
2011-02-20 01:47:10 -08:00
Sarah Mei
ad141bc5a2
rm -f the fixture builder yml file, to avoid the no-such-file warnings.
2011-02-20 01:17:28 -08:00
Sarah Mei
ee8796fc79
I should know better than to commit after midnight when I'm soloing.
...
(Let's require the support files in the right order.)
2011-02-20 01:08:13 -08:00
Sarah Mei
dc499293b3
Took 90 seconds off the build. Fixture builder FTFW.
...
Cleaned up spec_helper - moved stuff into support files.
2011-02-20 00:35:51 -08:00
Sarah Mei
b0d98b9ce8
Add people#show specs around showing the right set of posts.
2011-02-19 22:17:45 -08:00
Sarah Mei
77adc02cbd
Fix spec failure related to presence of app config settings. Also, you can't test application controller directly.
2011-02-19 22:17:22 -08:00
Sarah Mei
51df11aafc
Fix build failure related to addition of default scope on Contact
2011-02-19 21:44:37 -08:00
Sarah Mei
edf15aa5bd
Add specs for people#show when you're viewing your own page
2011-02-19 21:13:30 -08:00
Sarah Mei
11a4544882
Refactor people controller specs to be more sensible
2011-02-19 12:15:37 -08:00
MrZYX
3a26673298
fixed the spec I broke…
2011-02-19 17:55:31 +01:00
zhitomirskiyi
61dd5a835a
default scope on contact
2011-02-18 17:38:02 -08:00
maxwell
37a699ace1
stream order can take created at to be sorted by origin post time
2011-02-18 16:01:04 -08:00
zhitomirskiyi
6dc35c516a
added two pending specs for mnutt
2011-02-18 13:15:48 -08:00
maxwell
a1fdd3cdf9
i think the ci app_config has some setup i am unaware of, so this makes it not depend on that setting
2011-02-18 12:38:29 -08:00
maxwell
585ca4820b
make redirect_to test more explicit, hopefully 1.9.2 will like it slightly more
2011-02-18 11:58:04 -08:00
maxwell
0bf3cae54a
MS IZ added spec from admin page, moved it to its own controller where it belongs
2011-02-18 11:35:24 -08:00
Raphael Sofaer
5823da8d25
Make translation failure error out, there are at least 1 uncovered translation failures (share with lightbox)
2011-02-18 11:12:20 -05:00
zhitomirskiyi
16b7ec3990
pulled out share_with to be contact new and contact show
2011-02-17 18:05:21 -08:00
zhitomirskiyi
ba779e18d6
aspect memberships are now dependant delete_all on contact
2011-02-17 18:05:21 -08:00
maxwell
7ace73b84b
iz ms wip fixing contactController destroy
2011-02-17 18:05:21 -08:00
maxwell
8c2e6dd8cb
aspect membership refactor complete
2011-02-17 18:05:21 -08:00
maxwell
c6eb5d0340
IZ MS; refactored aspect_membership_controller, moved and updated views accordingly
2011-02-17 18:05:21 -08:00
maxwell
8ae23f5705
wip
2011-02-17 18:05:21 -08:00
maxwell
17a801394e
work in progress. need to update the views for the controller changes
2011-02-17 18:05:21 -08:00
Raphael Sofaer
51bc26c3df
Fix notificationscontroller spec
2011-02-17 15:27:50 -05:00
MrZYX
dc74aed79b
I </3 those performance specs…
2011-02-17 15:23:29 +01:00
Raphael Sofaer
cd7e4d6e8f
Requests create a read, rather than unread, notification
2011-02-16 23:44:25 -05:00
danielvincent
a636ceec7f
search does not wildcard on both sides of search term; is less dumb.
2011-02-16 12:41:45 -05:00
maxwell
d1b91e1eac
wip, profiles controller and specs, with cucumber failures
2011-02-15 14:17:25 -08:00
Gonzalo Rodriguez
2b3926c629
Disable share button when whitespaces on status message input.
2011-02-15 09:50:39 -02:00
danielvincent
164fe1c1b5
adjust column width, leading, serifs, etc. in stream for better readability.
2011-02-13 15:27:14 -08:00
Raphael Sofaer
6a0a945986
Switch dispatch_post and add_to_streams
2011-02-12 13:36:46 -08:00
Raphael Sofaer
de475ec4eb
Take error out of posting status messages with photos
2011-02-11 19:20:19 -08:00
Raphael Sofaer
ff0f37ceea
eliminate one source of dup pvs
2011-02-11 18:25:57 -08:00
maxwell
2784f641ba
fix 500 when viewing a nonexsitaint status message
2011-02-11 18:13:01 -08:00
maxwell
fd6d6350c8
make html status message create redirect, also correctly name status_messageS_controller_spec.rb
2011-02-11 18:00:23 -08:00
maxwell
e78ab6bca1
make html status message create redirect, also correctly name status_messageS_controller_spec.rb
2011-02-11 18:00:07 -08:00
maxwell
4b47de5b9e
do not 500 on public photo viewing, also redirect if there is no photo rather than 500ing
2011-02-11 17:47:29 -08:00
Raphael Sofaer
fcad60d908
Delete empty spec file
2011-02-11 12:18:59 -08:00
zhitomirskiyi
3b2d323448
fixed the notifications to call the base_class
2011-02-11 11:49:47 -08:00
zhitomirskiyi
36d7973005
fixed the problem where notifications are not keeping track of the target id as well as making notifications for a mention be destroyed when a post is
2011-02-10 19:23:01 -08:00
zhitomirskiyi
d1771bbe17
notifications for mentions
2011-02-10 12:39:05 -08:00
zhitomirskiyi
7b1abacfe6
wip
2011-02-10 12:39:05 -08:00
Raphael Sofaer
f1fe913527
Change up logging a little bit
2011-02-10 11:52:00 -08:00
Raphael Sofaer
7a6d1d3378
add shadow/transparency to autocompletion. removed a hide()/show() from publisher hide and show functions.
2011-02-10 11:09:14 -08:00
Raphael Sofaer
f1c63939f9
Revert "added sliding animation to stream elements, shadow on autocomplete box."
...
This reverts commit dc760f9583
2011-02-10 10:36:30 -08:00
danielvincent
dc760f9583
added sliding animation to stream elements, shadow on autocomplete box.
2011-02-09 20:07:25 -08:00
zhitomirskiyi
4105f90aaa
forgot to add
2011-02-09 19:07:02 -08:00
Raphael Sofaer
5eb487ed20
204, not 201
2011-02-09 18:04:44 -08:00
zhitomirskiyi
1da965616b
added an option to remove a contact from the last aspect, after a prompt
2011-02-09 17:47:27 -08:00
Raphael Sofaer
acd55cf7d6
Put keycodes.js in jasmine
2011-02-09 17:42:53 -08:00
Raphael Sofaer
04f33c8034
Render an empty 201 in users update with a js request
2011-02-09 17:22:45 -08:00
Raphael Sofaer
7b3a2b07ee
Removed n-query, created mentions table
2011-02-09 16:07:25 -08:00
Raphael Sofaer
c11ffe93c0
Actually close the publisher on and with Publisher.close()
2011-02-09 16:07:25 -08:00
Raphael Sofaer
f8cec95d7a
no authentication, n-query in stream
2011-02-09 16:07:24 -08:00
Raphael
0000185875
Status messages now process mentions and output links
2011-02-09 16:07:24 -08:00
Raphael Sofaer
99f84de368
Javascript for mentions is functional
2011-02-09 16:07:24 -08:00
Raphael Sofaer
0ec2d918bb
adding keycodes file, moving keyup stuff to keydown
2011-02-09 16:07:24 -08:00
danielvincent
2b25823253
autocomplete wip. separated keyup and keydown. wip.
2011-02-09 16:07:24 -08:00
danielvincent
3efc31c68f
mention js working minus tracking keypresses with the hidden message field.
2011-02-09 16:07:24 -08:00
danielvincent
7d21f7bfdd
publisher autocomplete correctly adds name into status_message_fake textarea
2011-02-09 16:07:24 -08:00
danielvincent
77403596aa
mentions in publisher autocomplete within context
2011-02-09 16:07:24 -08:00
Raphael Jedidiah Sofaer
150f676332
Do a bunch of work on publisher autocompletion JS
2011-02-09 16:07:23 -08:00
Raphael
216a2c3cdb
write formatted_message
2011-02-09 16:07:23 -08:00
Raphael Sofaer
51e129b5c6
Don't call hashes_for_people if it is a json request in search
2011-02-09 16:05:02 -08:00
zhitomirskiyi
dbf1452968
fixed an outdated integration test
2011-02-09 15:59:17 -08:00
zhitomirskiyi
e4d9ec64cd
moved tests and slayed the profile not updating bug
2011-02-09 13:33:42 -08:00
zhitomirskiyi
6be63b88f0
added the pending request to the finder
2011-02-08 18:53:18 -08:00
zhitomirskiyi
4e96d11cd0
Revert "refactored local person person friend finder functionality to use the partial"
...
This reverts commit 9f4035ab019803fc53844e70884b0519142deb18.
Conflicts:
app/views/services/_remote_friend.html.haml
app/views/users/getting_started/_step_3.html.haml
refactored invitations, added them to the last page
fixed styling on adding an aspect to the aspect list
added a facebook for person edit aspect memberships
touched up and simplified sign-up flow
fix styling on step 3
2011-02-08 16:40:33 -08:00
zhitomirskiyi
d147da1b4a
invitation text
...
setting the invites
added requests to the fb hash
finder has options
remove the requester from the list
typo
making a block
another typo
remove the if statement for the notifications
checking on the right field
translations and correct indenting
fixed stuff added
added a temp puts
added a temp puts
now actually referencing the service
not double nesting
remove stream element
updated remote friends to old style
removed it from the h1 block
putting the stream element back
2011-02-08 16:40:32 -08:00
zhitomirskiyi
a06ba9105b
uniqueness of aspect name through user non case sensitive
2011-02-08 14:52:47 -08:00
maxwell
a649d18cd7
add tests to see if timestamps are updated on recevie...they are not
2011-02-08 14:07:25 -08:00
danielvincent
bf20e5a9e8
remove some js assets from mobile
2011-02-06 23:09:04 -08:00
zhitomirskiyi
59f0dca7c7
Revert "publisher is now a hot widget"
...
This reverts commit 8039ab312a
2011-02-05 15:24:20 -08:00
zhitomirskiyi
4a925d192f
refactored the api
2011-02-05 15:01:05 -08:00
zhitomirskiyi
78c30b847e
added files
2011-02-05 15:01:04 -08:00
zhitomirskiyi
2c1c2a4a8a
WIP
2011-02-05 15:01:04 -08:00
zhitomirskiyi
83a9e916e4
resending of invitation in resque and works
2011-02-05 15:01:04 -08:00
zhitomirskiyi
da6e16b3a4
WIP
2011-02-05 15:01:04 -08:00
Dan Hansen
8039ab312a
publisher is now a hot widget
2011-02-05 16:47:43 -06:00
Raphael
8a2e0eef7c
No semicolons in names
2011-02-02 16:57:04 -08:00
Raphael
cd8d9989cf
Refactor publisher JS, use hidden field for submitting
2011-02-02 14:27:14 -08:00
maxwell
3b77663481
people controller takes so much time on CI
2011-02-02 13:37:54 -08:00
zhitomirskiyi
21e3c2ae73
Merge branch 'open-aspects'
...
Conflicts:
app/controllers/aspects_controller.rb
app/controllers/home_controller.rb
app/helpers/application_helper.rb
db/migrate/20110201013408_add_open_aspects_to_user.rb
spec/controllers/aspects_controller_spec.rb
spec/controllers/home_controller_spec.rb
2011-02-01 17:32:08 -08:00
zhitomirskiyi
59f1bff046
storing it as a boolean in the aspect
2011-02-01 17:25:15 -08:00
zhitomirskiyi
7f026e8271
now updating the open aspects in js
2011-02-01 16:58:33 -08:00
Raphael
cfd6639f4d
Revert "Merge branch 'open-aspects'"
...
This reverts commit 181bd823c42c3ed2ab73
2011-02-01 13:15:20 -08:00
zhitomirskiyi
27f1231479
Merge branch 'master' of github.com:diaspora/diaspora
2011-02-01 12:11:49 -08:00
zhitomirskiyi
181bd823c4
Merge branch 'open-aspects'
2011-02-01 12:10:12 -08:00
Raphael
7d18e2bcd8
Finish autocomplete
2011-02-01 11:56:56 -08:00
Raphael
518642d0d7
Move image_url defaulting logic into profile
2011-02-01 11:56:56 -08:00
Raphael
9080649180
Starting work on an autocomplete feature
2011-02-01 11:56:56 -08:00
maxwell
06013fabec
fix sm show
2011-01-31 21:50:06 -08:00
maxwell
13f482f3fe
Merge branch 'master' of github.com:diaspora/diaspora
2011-01-31 21:45:05 -08:00
maxwell
7bb7bb396a
Revert "persists open aspects across logins also fixed the status message controller spec broken in master"
...
This reverts commit 9e7f03236e
2011-01-31 21:41:05 -08:00
Sarah Mei
59a6c3b3a0
Fix import database errors by not importing notifications
2011-01-31 21:36:10 -08:00
zhitomirskiyi
9e7f03236e
persists open aspects across logins also fixed the status message controller spec broken in master
2011-01-31 18:37:20 -08:00
zhitomirskiyi
789ff679a9
persists open aspects across logins also fixed the status message controller spec broken in master
2011-01-31 18:31:41 -08:00
zhitomirskiyi
a6c1b5bf59
mark notification as read on the status message show page
2011-01-31 15:26:20 -08:00
zhitomirskiyi
7a667abc73
unread true on notification receive
2011-01-31 15:09:01 -08:00
zhitomirskiyi
d6ab633e2c
Merge branch 'notification-migration'
2011-01-31 14:41:15 -08:00
zhitomirskiyi
ac50a0119a
spec for not raising on already existant actor
2011-01-31 10:23:26 -08:00
zhitomirskiyi
cfef9a747e
all green
2011-01-30 20:10:34 -08:00
Dan Hansen
a5365559d7
specs for view.flashes.render
2011-01-30 16:01:28 -06:00
zhitomirskiyi
a4988a28b4
WIP
2011-01-30 10:00:03 -08:00
zhitomirskiyi
17a2c9e311
moving over some code migration successful
2011-01-29 23:34:11 -08:00
Dan Hansen
55bee713e9
add more specs
2011-01-29 16:45:03 -06:00
Dan Hansen
be2413b9a8
load timeago widget
2011-01-29 16:02:04 -06:00
Dan Hansen
4484bf33fa
fix javascript i18n specs
2011-01-29 13:31:45 -08:00
Dan Hansen
9046273ebd
some specs for the i18n widget
2011-01-29 13:31:45 -08:00
Dan Hansen
d03119f7e9
Embedder is now a widget, show videos before comments
2011-01-29 13:22:34 -06:00
zhitomirskiyi
5940292840
build should be green now
2011-01-28 21:21:14 -08:00
Raphael
7302a54710
Fix translation missing error
2011-01-28 17:50:34 -08:00
zhitomirskiyi
9d091bbf6a
facebook invitations actually work
2011-01-28 17:22:18 -08:00
Raphael
07850c7cb2
fix fb finder, flesh out test
2011-01-28 17:13:20 -08:00
Raphael
8151f3b540
correct partial name
2011-01-28 16:54:30 -08:00
zhitomirskiyi
3b68fc3e9a
the friend finder is respecting of searchable
2011-01-28 13:45:58 -08:00
Raphael
dde8fd65e5
Fix build
2011-01-28 12:18:56 -08:00
Raphael
5967ce25fd
add spec for youtube_titles
2011-01-28 11:43:15 -08:00
Raphael
a8306f9f37
don't select duplicate people
2011-01-27 13:41:22 -08:00
Raphael
31e4683183
Finished contacts of contacts for local users
2011-01-27 13:41:22 -08:00
Raphael
a23290986a
add contacts_visible field in aspects
2011-01-27 13:41:22 -08:00
Raphael
a6f8b2c14e
Add splunk logging for errors
2011-01-27 11:44:35 -08:00
zhitomirskiyi
01ce26cbf3
fixed errror on services inviter action, specs
2011-01-27 10:58:09 -08:00
Philip Champon
0588dafe6b
added enumeration to args and a spec to verify it
2011-01-27 12:46:02 -05:00
Raphael
f892a00b99
Fix data conversion, fixture generation in publicscontroller
2011-01-26 18:39:09 -08:00
Raphael
b67aca0ffc
Put in a lot of non nullable fields, edit the specs to match, drop a couple superfluous columns
2011-01-26 18:29:23 -08:00
zhitomirskiyi
a037575ebc
added invites in the tests
2011-01-26 18:14:17 -08:00
zhitomirskiyi
a610618057
display resend link if already sent invitation in friend finder
2011-01-26 16:57:39 -08:00
zhitomirskiyi
9e22f4a6e6
checks if you already invited the person
2011-01-26 16:31:34 -08:00
zhitomirskiyi
1a911a8b99
translation of invitation message, better checking of existing users and unique index on user(invitation_service and invitation_identifier)
2011-01-26 16:01:57 -08:00
zhitomirskiyi
6242ac64ed
removed unique index on email to a regular index in order to make inviting users through fb work (no email present)
2011-01-26 15:04:46 -08:00
zhitomirskiyi
be57170bf9
added the empty email spec
2011-01-26 14:22:04 -08:00
zhitomirskiyi
89a8817ce6
made service#invite redirect to the right place
2011-01-26 12:16:48 -08:00
zhitomirskiyi
3392f11b64
Job::InviteUser -> Job::InviteUserByEmail
2011-01-26 12:16:48 -08:00
zhitomirskiyi
5c5e450a1e
Invitation.new_or_existing_user_by_email -> Invitation.new_or_existing_user_by_service_and_identifier
2011-01-26 12:16:47 -08:00
zhitomirskiyi
d595a64169
new interface to send invitation WIP
2011-01-26 12:16:47 -08:00
zhitomirskiyi
b3467b5d17
pending specs for facebook inviter
2011-01-26 12:16:47 -08:00
zhitomirskiyi
cf45f31712
facebook friend finder is now contact-aware
2011-01-26 12:16:47 -08:00
zhitomirskiyi
f3f38cf4fd
fetch person object associated with facebook id in friend finder
2011-01-26 12:16:46 -08:00
zhitomirskiyi
8bc52cdb55
facebook friend finder gathers fb friends.
2011-01-26 12:16:46 -08:00
Raphael
e890d73de7
Remove mocha
2011-01-26 11:52:14 -08:00
Raphael
e4ad229a5a
Requestors are now high in search
2011-01-25 18:24:11 -08:00
Raphael
906cb36adf
Fix double notifications on comments, write a bunch of comment dispatch tests. Alliterate.
2011-01-25 16:46:51 -08:00
Raphael
def20a4d31
Make person_id on profile unique, delete duplicate profiles in migration
2011-01-25 12:10:24 -08:00
Raphael
5fe0613a97
Remove extra token from search
2011-01-25 10:47:11 -08:00
zhitomirskiyi
2314c08265
current password requirement to change password
2011-01-24 22:39:57 -08:00
zhitomirskiyi
716899f919
don't dispatch locally on comments if you're the post owner
2011-01-24 19:13:48 -08:00
maxwell
d040de541a
fix error in stream and puts in fake
2011-01-24 19:09:38 -08:00
zhitomirskiyi
8f05b638b3
holy crap fixed that comment dispatch bug
2011-01-24 18:21:27 -08:00
maxwell
ed1dc584d1
make aspects#index slow for ci
2011-01-24 18:03:14 -08:00
maxwell
a28a861509
fix url helpers on fakes
2011-01-24 18:01:40 -08:00
zhitomirskiyi
e9e01e965e
fixed error with comments saving twice on the same pod
2011-01-24 17:24:29 -08:00
maxwell
1b3c58c2c2
Use a fake to not allocate an AR model for every reference to a person
2011-01-24 15:13:52 -08:00
Sarah Mei
0b39359d1c
Standardize how we're requiring config/environment
2011-01-23 12:42:09 -08:00
Dan Hansen
ace9e8c3d8
whoops, add license to embedder.js and it's spec
2011-01-22 23:43:48 -06:00
Dan Hansen
bdf559bb2b
remove video embedding from stream.js, use embedder.js
2011-01-22 23:40:08 -06:00
Dan Hansen
8619a2035c
green for the night
2011-01-22 01:16:52 -06:00
Dan Hansen
67100aa7bb
fix the build
2011-01-22 00:39:53 -06:00
Raphael
eea5b0a748
fix hcard link in webfinger profile
2011-01-21 15:03:11 -08:00
zhitomirskiyi
41993fe5da
use highcharts.js for stats
2011-01-21 12:19:05 -08:00
zhitomirskiyi
190daa76dd
getting rid of gruff and it's imagemagic deps. made graphs on stats pending.
2011-01-21 11:11:58 -08:00
zhitomirskiyi
403490364a
fixed datapoint_spec. fixed labels on graph
2011-01-21 10:50:53 -08:00
zhitomirskiyi
46cb9dd346
before auth filter
2011-01-21 10:39:10 -08:00
zhitomirskiyi
46b94bc130
all the specs pass with before each
2011-01-21 10:29:07 -08:00
zhitomirskiyi
56831cec63
stats WIP
2011-01-21 10:29:07 -08:00
zhitomirskiyi
69d6de2fe7
added views and graph generation for statistics
2011-01-21 10:29:07 -08:00
zhitomirskiyi
f89c442730
statistics class does distributions and averages on its DataPoints
2011-01-21 10:29:07 -08:00
zhitomirskiyi
55bfbfd5b0
added users_with_posts_today to DataPoint
2011-01-21 10:29:07 -08:00
zhitomirskiyi
ecb059b661
added Statistic and DataPoint models
2011-01-21 10:29:06 -08:00
Maxwell Salzberg
fe0f16812f
ci sucks
2011-01-20 18:57:20 -08:00
maxwell
b21b0adca7
remove single user redirect
2011-01-20 15:02:46 -08:00
Raphael
7217bba7e7
Allow no 2 character queries
2011-01-20 12:18:42 -08:00
Raphael
971c88da5e
Sort search results by friend status
2011-01-20 10:20:17 -08:00
Maxwell Salzberg
a612f55739
aspects needs more time on ci
2011-01-19 19:12:46 -08:00
Raphael
5eb0bf6736
Speed up person show
2011-01-19 18:45:45 -08:00
Raphael
0f978b983a
be more generous to CI with times
2011-01-19 18:20:40 -08:00
Raphael
2c68bb0305
Remove n-query problem from contact_list
2011-01-19 18:06:35 -08:00
Raphael
e97081e8cd
Delete some pending specs, fix a minor bug
2011-01-19 17:11:33 -08:00
Raphael
a5b4dd2604
fix js bug, add spec
2011-01-19 16:58:01 -08:00
Raphael
ad48f4796c
Remove warning in aspectscontroller
2011-01-19 16:08:14 -08:00
maxwell
e7a065a521
make jobs have a base class, which will verify the activerecord connection before trying the job
2011-01-19 14:10:42 -08:00
Sarah Mei
b43c29745b
Fix build by turning off transactional fixtures in the import spec.
2011-01-19 00:16:11 -08:00
maxwell
72e10cfad6
remove the fixtures everytime, until we actually figure out how to do this right. also clean up some spec helper includes to prevent everything getting included many times
2011-01-18 22:45:43 -08:00
maxwell
7a02a31440
fix invitations#new, and a post spec which was mongo specific
2011-01-18 22:11:58 -08:00
danielvincent
4f25dfa6d3
publics controller merge fix
2011-01-18 17:14:32 -08:00
danielvincent
3dd2384458
Merge branch 'fixturebuilder'
...
Conflicts:
spec/controllers/people_controller_spec.rb
spec/controllers/publics_controller_spec.rb
spec/lib/diaspora/parser_spec.rb
2011-01-18 17:05:44 -08:00
danielvincent
1fa39ad20d
fixed issue in attack_vectors_spec
2011-01-18 16:58:59 -08:00
danielvincent
511a48adde
fixed publicscontroller specs
2011-01-18 16:52:11 -08:00
zhitomirskiyi
ef1b7644f3
got rid of more hash from
2011-01-18 16:38:31 -08:00
zhitomirskiyi
004094d66f
fixed the querying in the controllers got rid of hashes
2011-01-18 16:21:14 -08:00
Raphael
6ccf8a4d2d
Fixed connecting spec, magic import failure disappearance
2011-01-18 16:05:50 -08:00
Raphael
bad7399eeb
Remove yml files from git
2011-01-18 15:18:58 -08:00
Raphael
88ebd14799
Fixture builder working, need to make specs not require a clean db
2011-01-18 14:53:46 -08:00
Raphael
1353929d44
Made specs work with fixtures, spec_helper needs work
2011-01-18 13:31:10 -08:00
Raphael
ac3d037dc4
Comments controller spec using fixtures
2011-01-18 10:48:06 -08:00
Raphael
b580b7bd2c
Putting fixtures in specs...
2011-01-18 10:42:50 -08:00
Raphael
fdc9534fc7
Fix specs in the presence of fixture_builder
2011-01-18 10:25:26 -08:00
Raphael
345d346224
Initial fixture_builder
2011-01-18 10:00:48 -08:00
Raphael
6474ca9540
display photos correctly
2011-01-17 19:34:33 -08:00
maxwell
0c24510682
remove an invalid spec
2011-01-17 18:33:30 -08:00
zhitomirskiyi
8818a9bb6f
Merge branch 'master' of github.com:diaspora/diaspora
2011-01-17 18:04:21 -08:00
zhitomirskiyi
c28b5a22fb
here you go
2011-01-17 18:03:15 -08:00
Raphael
8bd784e5ab
Fix aspect edit
2011-01-17 17:36:36 -08:00
zhitomirskiyi
0c8aca3ef8
rebasing
2011-01-17 15:56:06 -08:00
danielvincent
7f87825186
fixed nil error in migration when dealing with remote images
2011-01-17 15:56:06 -08:00
danielvincent
1d52e06532
added rake task and spec for absolutifying existing image links
2011-01-17 15:56:06 -08:00
danielvincent
2eb1901073
s3 support minus rake migration.
2011-01-17 15:56:06 -08:00
Raphael
bd4efe8c2d
Escape youtube titles
2011-01-17 15:39:46 -08:00
Raphael
a7e30adc28
Better test for unique contacts
2011-01-17 14:23:50 -08:00
Raphael
6410355d71
Fix aspect edit page
2011-01-17 14:23:50 -08:00
Raphael
6eb0dfb43f
Improve User#posts_from
2011-01-17 14:23:50 -08:00
Raphael
72785a69cb
Correct ordering problem in posts_from
2011-01-17 12:21:38 -08:00
Raphael
36781481bb
Pulling in changes from master
2011-01-17 11:41:15 -08:00
Sarah Mei
2c91bfca96
Fix spec that fails under ruby 1.9.
2011-01-15 15:00:45 -08:00
Sarah Mei
eeba0e7a63
Remove a spec that tests a method that doesn't exist anymore.
2011-01-15 14:28:15 -08:00
Sarah Mei
795f715833
Fix notification spec to stub the right association.
2011-01-15 14:20:25 -08:00
Raphael
f87ddffc64
2 failures left in merge
2011-01-14 16:35:41 -08:00
Raphael
738e8c65c8
Merge almost complete, 4 failures
2011-01-14 16:00:10 -08:00
Dan Hansen
d4f30ded1b
Diaspora.js 2.0, added an official widget, don't use native alerts anymore
2011-01-14 14:54:44 -06:00
Raphael
ae57c7a232
Stop testing on created_at, because I am so not updating the fixtures and we do have to export the times.
2011-01-13 19:59:01 -08:00
Raphael
300e055933
It turns out comments weren't importing because I didn't write the code to make them import.
2011-01-13 18:48:32 -08:00
maxwell
27162e59b8
adding new js file to jasmine
2011-01-13 17:00:08 -08:00
maxwell
b116362c5d
notifications for local comments
2011-01-13 13:02:02 -08:00
Dan Hansen
f807bc25d1
whitelist certain keyCodes, e.g. tab, fixes #795
2011-01-13 01:24:05 -06:00
Sarah Mei
9c87fff295
Log specs don't check for specific number of renders.
2011-01-12 22:43:45 -08:00
Dan Hansen
ce4fe1938c
remove references to fancybox, we use facebox
2011-01-13 00:24:10 -06:00
Sarah Mei
57141fc305
Pull logging out to a shared behavior. Remove 4 pending specs.
2011-01-12 21:57:05 -08:00
zhitomirskiyi
9b6faa5644
added a notificaions read button
2011-01-12 16:24:14 -08:00
maxwell
1661158f95
IZ MS fix a nasty bug where status messages with posts were not persisted in a users aspects stream. also, fixed the code link for joindiaspora.com
2011-01-12 10:47:39 -08:00
Sarah Mei
756471be43
Fix 1.9 build. MAXWELL.
2011-01-11 19:58:27 -08:00
maxwell
49b172f192
up with convention, down with case. pubsubhubbub now adhears to ruby caseing, rather than its own name weirdness
2011-01-11 15:04:03 -08:00
Raphael
3684546335
Require pubsubhubbub
2011-01-11 14:34:30 -08:00
maxwell
85295015ee
DG MS tests now green, plus autotest works again
2011-01-11 14:23:19 -08:00
maxwell
25f388d903
MS DG made receive encapsulated in an object
2011-01-11 14:23:19 -08:00
maxwell
23de681cb8
DG MS moved receive methods to their respective models
2011-01-11 14:23:18 -08:00
maxwell
220c6894fa
--amend
2011-01-11 14:23:18 -08:00
maxwell
daab8e80ce
basic receive cleanup
2011-01-11 14:23:18 -08:00
Sarah Mei
68eedd578a
mysql timezones: PWND.
2011-01-10 20:40:27 -08:00
Raphael
ee20b00f58
Only the time zone errors are left, and those could probably be ignored
2011-01-10 18:30:52 -08:00
Raphael
079151eeea
Set target_id on notifications
2011-01-10 17:30:37 -08:00
Raphael
f1e8b5c01d
Found problem in notification import, need to finish post and notification polymorphic stuff
2011-01-10 16:57:15 -08:00
Raphael
c90f3cb1ef
export more things from mongo
2011-01-10 16:36:48 -08:00
Raphael
f277fb3bb8
Specs for post_visibilities and notifications imports
2011-01-10 15:55:59 -08:00
Raphael
f4465c9d32
Naive import of posts, still need to set status_message_id on photos
2011-01-10 15:41:53 -08:00
Raphael
fefc4ba60e
Posts are the next model to import, then postvisibility, then notifications
2011-01-10 13:22:05 -08:00
Raphael
92aecb3bec
Start profile import, fixtures are wrong
2011-01-10 12:25:13 -08:00
Raphael
47ed820dea
Invitations and requests importing
2011-01-10 11:51:34 -08:00
Raphael
52f1ce81fb
No syntax errors, but invitation and request importing still not working
2011-01-10 11:34:04 -08:00
Sarah Mei
f273d6938e
Fix pagination spec - we don't care which 25 things are returned, just that 25 are returned.
2011-01-09 20:44:23 -08:00
Sarah Mei
545fbe4679
Fix jasmine specs by replacing fancybox with facebox, and changing expectation to match new view.
2011-01-09 19:41:18 -08:00
Raphael
555932d67e
Import invitations
2011-01-09 02:25:35 -08:00
danielvincent
c16d0c46a2
comments do not queue up jobs for local users.
2011-01-08 17:53:01 -08:00
Sarah Mei
22f7d1d48b
Unix timestamps (output by mongo) are in milliseconds, but MySQL datetimes only have fidelity to seconds.
...
As a result we have to divide the exported value by 1000 before importing it (which coincidentally is the same as truncating the last 3 digits).
The remaining 8-hour difference is a time zone thing - haven't solved that one yet.
2011-01-08 17:18:09 -08:00
danielvincent
6cc5d6e3ab
fixed all rspec/cucumber
2011-01-08 16:53:16 -08:00
danielvincent
cadba3f2b7
fixed specs with a reload. added header gradient for firefox
2011-01-08 13:11:55 -08:00
danielvincent
44d3c4bacd
fixed inf scroll on filters issue. one spec failing in AspectsController.
2011-01-08 13:11:52 -08:00
danielvincent
79b7f62520
filter logic in aspects_controller#index
2011-01-08 13:11:51 -08:00
Raphael
e8d46982d8
Aspect memberships now importing
2011-01-07 16:58:39 -08:00
Maxwell Salzberg
24942d2f77
remove all keydown tests
2011-01-07 16:54:55 -08:00
maxwell
c7fb3d7296
remove keydown test since we do not do that anymore
2011-01-07 16:39:27 -08:00
Raphael
6abedf5f87
Contacts now importing
2011-01-07 16:28:52 -08:00
maxwell
047217f50c
fixed test to have postzord only socket on comments.... need to figure out a better way to abstract this exception...
2011-01-07 16:15:13 -08:00
Raphael
aa624b4df0
People now importing, additional failing tests on imported times
2011-01-07 16:09:08 -08:00
Raphael
8885b8a354
Services now importing
2011-01-07 15:19:04 -08:00
Raphael
9bd2de06ee
Services need a mongo_id
2011-01-07 15:14:45 -08:00
Raphael
62486a17b6
Aspects imported correctly
2011-01-07 14:54:50 -08:00
maxwell
8f1f01f0a3
if you write jobs, you should use them in you app
2011-01-07 14:03:46 -08:00
Raphael
1187c13170
Import for users, test for aspects import
2011-01-07 13:25:50 -08:00
Raphael
ff44003ea3
Import some more times
2011-01-07 10:56:46 -08:00
Raphael
686713dc4b
assert on type before typecasting, do not tolerate empty strings where NULL should be.
2011-01-07 10:49:07 -08:00
maxwell
3fa0af8b56
make the test slightly less pedantic
2011-01-06 18:19:15 -08:00
zhitomirskiyi
86154ba348
Merge branch 'master' of github.com:diaspora/diaspora
2011-01-06 17:26:42 -08:00
zhitomirskiyi
3e569c0c30
using set comparison instead of strict array comp.
2011-01-06 17:26:30 -08:00
Raphael
abdb5f7587
serialized hashes need a NULLIF, as do many other fields, probably
2011-01-06 17:26:08 -08:00
maxwell
153c4925d6
test for pubsubhububb jobs
2011-01-06 17:19:13 -08:00
zhitomirskiyi
8f2cad776b
Merge branch 'master' of github.com:diaspora/diaspora
2011-01-06 17:14:59 -08:00
zhitomirskiyi
a92a374b96
added the files and fixed the tests
2011-01-06 17:14:39 -08:00
Raphael
89a41826c1
Started raw post import
2011-01-06 17:01:17 -08:00
Raphael
7c3c17a418
Move fantasy_resque to the fake_resque file, add services to the mysql export fixture
2011-01-06 16:34:28 -08:00
maxwell
cff387d651
make sure receive unescapes the payload before sending it to the job
2011-01-06 16:30:22 -08:00
Raphael
e46b3e6cf3
Import raw services, I think we need to change the name of the type field (is it supposed to be in provider?) other than that, only posts remain.
2011-01-06 16:23:18 -08:00
zhitomirskiyi
0c8e6b0ba1
Merge branch 'master' of github.com:diaspora/diaspora
2011-01-06 15:56:20 -08:00
zhitomirskiyi
3fae950905
also commented notification and sending ids into resque so that it works
2011-01-06 15:56:03 -08:00
Raphael
7668276a99
Set booleans correctly
2011-01-06 15:42:34 -08:00
Raphael
770e90064d
nullif fixes raw person import
2011-01-06 15:16:32 -08:00
Raphael
283a5501be
Boolean values aren't importing; we may need SET statements for them
2011-01-06 14:58:42 -08:00
Raphael
7c4d35cf28
raw import of notifications, failing to pull in unread
2011-01-06 14:37:59 -08:00
Raphael
564dd993b7
raw import of Invitation
2011-01-06 14:30:38 -08:00
Raphael
a1419b9dc0
Person#owner_mongo_id should be null if the csv has an empty string
2011-01-06 14:16:51 -08:00
maxwell
5818227904
adding job for posting to services
2011-01-06 13:13:09 -08:00
maxwell
1d5b6fa675
unstubing and restubbing before doing pubsubhubub
2011-01-06 12:50:48 -08:00
Raphael
9ba43b148f
Move resque modifications out to spec/support
2011-01-06 12:33:12 -08:00
Raphael
0284f0fd6d
Write fixture for mysql export
2011-01-06 12:33:12 -08:00
Raphael
f4d176011d
Got some fixtures in, comment import specs are passing
2011-01-06 12:20:42 -08:00
maxwell
f02ed1e3c4
unstubing and restubbing before doing pubsubhubub
2011-01-06 12:19:36 -08:00
maxwell
11808e3233
adding tests for pubsub client'
2011-01-06 11:47:16 -08:00
maxwell
a7d651236f
make the postman work across everything. remove lots of now useless methods
2011-01-05 17:44:08 -08:00
maxwell
5e58eba240
new years resolution: commit more. make the websocket take user objects, rather then just ids, since postman now gets all of them at once, rather than querying them n times
2011-01-05 17:43:25 -08:00
maxwell
7ea6b4dd8d
more cleanup
2011-01-05 17:43:25 -08:00
maxwell
8819d288c4
i am greeen
2011-01-05 17:43:25 -08:00
maxwell
80edb498f2
--amend
2011-01-05 17:43:25 -08:00
maxwell
3fe30cde12
removed message handler, postzord::dispatch is almost done, now i need to rip a bunch of methods out
2011-01-05 17:43:25 -08:00
Raphael
ff1cad6e63
raw import for requests
2011-01-05 17:38:00 -08:00
Raphael
0d80ded2d3
Raw import for post_visibilities
2011-01-05 17:25:11 -08:00
zhitomirskiyi
ce470e74ee
notification calls email notification
2011-01-05 17:21:55 -08:00
zhitomirskiyi
02ca5793bc
checking the string
2011-01-05 17:21:54 -08:00
Raphael
7b721836c8
Add the fixtures I've been using, fix a problem in person export
2011-01-05 16:49:04 -08:00
Raphael
b34acfd4eb
Add contact raw import, fixtures have no comments
2011-01-05 16:40:16 -08:00
Raphael
e4ef2641f8
raw import of aspects and aspect memberships
2011-01-05 15:40:04 -08:00
zhitomirskiyi
82852db5ec
added the files this time
2011-01-05 15:04:28 -08:00
zhitomirskiyi
7254db5cbc
Revert "Revert "added comment on post mail method""
...
This reverts commit c9b3066599
2011-01-05 14:59:15 -08:00
zhitomirskiyi
c9b3066599
Revert "added comment on post mail method"
...
This reverts commit c00226238b
2011-01-05 14:56:04 -08:00
zhitomirskiyi
c00226238b
added comment on post mail method
2011-01-05 14:55:17 -08:00
Raphael
079e2f4cb2
Get a little further in importing times
2011-01-05 11:51:36 -08:00
Sarah Mei
7f86a9e1ba
ImportToMysql now loads users.csv. Spec currently failing on datetime conversion.
2011-01-04 22:43:32 -08:00
Sarah Mei
55191c6838
Move more stuff in to DataConversion::Base, refactor method names. Add spec for importer.
2011-01-04 20:28:10 -08:00
Sarah Mei
7453130c63
Namespacin'.
2011-01-04 20:12:11 -08:00
Raphael
429087ef83
Merge remote branch 'tomk/729-retain-input-on-failure'
2011-01-04 16:39:07 -08:00
Raphael
83d6b95c46
Merge remote branch 'nickvdb/763-notifications-paginate'
2011-01-04 16:18:46 -08:00
zhitomirskiyi
f134cfd43f
moved the test to the controller
2011-01-04 15:44:55 -08:00
Raphael
06d7ddbe0d
Hopefully get rid of some problems with deleted accounts moving forward
2011-01-04 15:36:42 -08:00
Raphael
16d7ccdf0b
fix youtube title stting
2011-01-04 11:48:02 -08:00
zhitomirskiyi
d3daa32558
mark a notification as read when you ignore a request
2011-01-04 11:27:25 -08:00
Raphael
0966889ab9
continue work on mongo export
2011-01-04 10:58:22 -08:00
danielvincent
055fbe3e00
stream is now a div. generalized some partial extentions for mobile site.
2011-01-01 23:09:18 -05:00
Thomas R. Koll
5e1f5ff5b1
Starting spec for rails.js
2010-12-29 17:43:50 +01:00
Nick van der Burgt
8bbb142c85
Set a limit on the second page
2010-12-29 12:32:24 +01:00
Nick van der Burgt
46e9be88d1
Wrote spec test for notifications pagination
2010-12-29 12:27:39 +01:00
Alec Leamas
215d6a8504
Build test diaspora_handle properly.
2010-12-29 10:10:08 +01:00
Sarah Mei
f18439fa14
ZOMG specs pass on mysql!
...
Make '_type' column on services into 'type'.
2010-12-28 21:08:54 -08:00
Raphael
4fec1bf717
1 failure left in mysql specs
2010-12-28 11:38:26 -08:00
Sarah Mei
787d550a1f
Fix StatusMessagesController. Refactor specs to take out stuff that's tested elsewhere. MOAR REFAKTRNG PLZ. Is ugly.
2010-12-27 21:48:51 -08:00
Raphael
3d7d8b51d2
Add a spec to user, fix a cucumber step for mysql
2010-12-26 21:05:48 -08:00
Raphael
5a1bd13831
Fix a couple more specs in mysql
2010-12-26 20:52:15 -08:00
Raphael
a6dcaa2327
Photo specs passing, 9 failures left in mysql
2010-12-26 20:33:21 -08:00
Raphael
3e7e99831a
14 failures after updating mysql branch to master
2010-12-26 17:25:07 -08:00
Raphael
b642cd6840
Merging master into mysql
2010-12-26 16:30:17 -08:00
Dorian
b348f094ab
Test for XSS in comment
2010-12-26 02:16:53 +01:00
danielvincent
4ff9622bfc
notifications now properly socket (not a hack through comments like before). notification badge updates on new messages.
2010-12-25 16:07:31 -05:00
Sarah Mei
de502bf67c
Convert aspect-edit-spec.js to use actual DOM fixtures generated by AspectsControllerSpec.
2010-12-24 18:39:20 -08:00
Sarah Mei
a1ea193fb9
Methods to generate jasmine fixtures in controller specs, and methods to load those fixtures in jasmine specs.
2010-12-24 16:08:45 -08:00
Michael Sofaer and Raphael Sofaer
7175200779
Fix a spec, need to move to a computer with firefox.
2010-12-24 15:17:24 -08:00
Sarah Mei
9c50f900ed
Merry Christmas! I got you someting green.
...
Remove callback to decrementRequestCounter in aspect-edit.js, since we don't have a request counter on that page anymore. The callback was failing, so the ajax request was never officially completing. Cucumber hates that.
I am going to add jasmine fixture generation in the controller specs, so that next time, a jasmine test will fail in this situation.
Also: clean up manages_aspects.feature.
2010-12-24 14:14:24 -08:00
Michael Sofaer and Raphael Sofaer
30d60021f4
11 Controller specs remain in mysql. ALMOST DONE
2010-12-24 14:12:55 -08:00
Sarah Mei
5ae16c15a3
Fix bug in :pod_uri generation.
2010-12-24 13:00:06 -08:00
Sarah Mei
1f67cc2485
Replace APP_CONFIG with lib/app_config.rb so that it's testable.
2010-12-24 12:31:09 -08:00
Michael Sofaer and Raphael Sofaer
82b226712f
Posting spec green
2010-12-24 09:58:11 -08:00
Dorian
5cbccda33a
Spec for not allowing user to do the XSS
2010-12-24 15:49:26 +01:00
Michael Sofaer and Raphael Sofaer
331e6645c6
Just don't use count with select DISTINCT
2010-12-24 00:31:36 -08:00
Michael Sofaer and Raphael Sofaer
426651d827
Fixed a few more specs, having trouble getting AR to return the count of distinct (once for all aspects a post is visible in) posts a user can see
2010-12-24 00:23:37 -08:00
Michael Sofaer and Raphael Sofaer
22a5832c01
Fix retraction related failures in mysql
2010-12-23 23:04:04 -08:00
Michael Sofaer and Raphael Sofaer
44093c9342
Status message spec now passes
2010-12-23 12:56:49 -08:00
Sarah Mei
2b7eeffd5b
Fix searching in mysql. It now does one query for all tokens. And person_spec is green!
2010-12-22 22:24:04 -08:00
Raphael
924bcca0e2
Isolated problem in status message marshalling, mysql
2010-12-22 21:34:45 -08:00
Raphael
d01fbeac04
33 failures left in mysql
2010-12-22 16:37:41 -08:00
Raphael
55492535c6
Fix some more specs, aspects controller is green in mysql
2010-12-22 14:15:45 -08:00
Raphael
baf0533466
logical failures on person spec, 25 failing model specs
2010-12-21 18:59:28 -08:00
Raphael
cbda6b8c58
58 failures with mysql
2010-12-21 17:14:52 -08:00
Raphael
319452537e
Below 70 failures, GUIDs are next
2010-12-21 15:46:15 -08:00
danielvincent
a1f3ab3046
mark requests as read when a user responds to the request
2010-12-21 10:31:18 -08:00
Raphael
659dfd36ed
Querying spec passes, 63 model spec failures
2010-12-20 18:49:07 -08:00
Raphael
f043c9cc7e
Took MongoMapper out of the bundle, trying to fix querying.
2010-12-20 16:53:56 -08:00
Raphael
049670654e
Connecting spec passes with mysql
2010-12-20 14:22:44 -08:00
Raphael
dcf630fd9a
Request spec passes, no more scope on requests
2010-12-20 13:59:46 -08:00
Raphael
4c47d8334c
Add PostVisibility model, some more specs working
2010-12-20 13:23:05 -08:00
maxwell
e0883fb176
remove object_id for notifications thx sarahmei for pointing out my evil ways
2010-12-20 12:06:50 -08:00
maxwell
ed0e739ac3
updated rails, and incorrect respond_to :location calls. you must supply an object with respond_with
2010-12-20 11:22:52 -08:00
Sarah Mei
c1bfbd358e
Fix 1.9 build. Apparently mongo mapper in 1.9 does not like contacts(:pending => false) - it has to be contacts.where(:pending => false). And now you know.
2010-12-20 02:50:38 -08:00
Raphael
d44e76a6aa
Down to 250 failures in mysql
2010-12-20 00:36:48 -08:00
Raphael
51083e9659
Another 50 passes in mysql
2010-12-19 13:57:46 -08:00
Raphael
0c67e271df
Services are in mysql, contact_for and add_contact_to_aspect work again
2010-12-19 13:11:41 -08:00
Raphael
232de40457
Only service hasn't been migrated, there are a good 100 passing examples in mysql
2010-12-19 12:27:32 -08:00
MrZYX
1b6f341348
made linking more robust, this fixes #732
2010-12-19 13:49:46 +01:00
Mike Sofaer, Raphael Sofaer & Sarah Mei
3fe2924a60
WIP moving to mysql
2010-12-18 21:16:39 -08:00
Mike Sofaer, Raphael Sofaer & Sarah Mei
5c21e220ff
post_spec now passes with mysql
2010-12-18 20:23:16 -08:00
Mike Sofaer, Raphael Sofaer & Sarah Mei
58f757b91d
profile_spec is passing with mysql... baby steps.
2010-12-18 18:45:55 -08:00
Raphael
36b622c998
Fix build
2010-12-18 15:22:56 -08:00
Raphael
02f745900f
Get rid of youtube-title failure
2010-12-18 15:16:05 -08:00
maxwell
427cf18324
fix birthday spec
2010-12-17 19:41:42 -08:00
Raphael
a64d8943b4
Pulled in spec refactor, thanks blackxored
2010-12-17 18:49:34 -08:00
maxwell
13407f700e
fix test
2010-12-17 17:25:11 -08:00
maxwell
e7cca604e6
refactored notifications
2010-12-16 17:30:35 -08:00
Raphael
5e6c14fce8
Simplify connect_users for a huge test speedup
2010-12-16 14:47:37 -08:00
danielvincent
1465024f10
skipping receive process for incoming local posts, calling receive_object directly
2010-12-16 14:39:19 -08:00
Raphael
eb56521a66
Don't query inside of loops...
2010-12-16 12:25:31 -08:00
danielvincent
f821f49db1
added similar contacts to contact pages
2010-12-16 11:49:08 -08:00
Raphael
b467d12d83
Fix spec in peoplecontroller
2010-12-16 11:37:16 -08:00
maxwell
226d95ec2c
Merge branch 'master' of github.com:diaspora/diaspora
2010-12-15 19:15:26 -08:00
Raphael
837ad20045
unpend spec in aspects controller spec
2010-12-15 18:11:09 -08:00
maxwell
d5ba34f245
Merge branch 'master' of github.com:diaspora/diaspora
2010-12-15 18:05:54 -08:00
Raphael
e881edab96
Fix missing partials on last commit, you can now accept a request from the requestor's profile page
2010-12-15 18:05:18 -08:00
Raphael
3b727dc887
Add share_with fancybox on search page, fix a couple of queries
2010-12-15 17:45:12 -08:00
maxwell
8ec85d3b12
basic notifications
2010-12-15 17:31:36 -08:00
Raphael
b22398951e
Send requests from the aspect list on the person show page
2010-12-15 14:48:14 -08:00
Raphael
80a9b97f8d
add_person_to_aspect is now add_contact_to_aspect, some methods now take models rather than ids
2010-12-15 14:48:14 -08:00
maxwell
9555fae33d
no notifications on retractions
2010-12-15 13:14:46 -08:00
maxwell
61b2bbbd7d
Merge branch 'master' of github.com:diaspora/diaspora
2010-12-15 12:28:09 -08:00
maxwell
b6754d92b7
adding basic notification class
2010-12-15 12:11:47 -08:00
maxwell
a7d36615e6
adding basic notification class
2010-12-15 12:11:37 -08:00
Dan Hansen & Sarah Mei
82e2f23f91
Merge branch 'master' of github.com:diaspora/diaspora
2010-12-15 14:29:33 -05:00
Raphael
bd31ff3ee3
Fix request validations, build.
2010-12-15 10:48:29 -08:00
Dan Hansen & Sarah Mei
fbfe28bcfa
added vimeo method, still needs support from lib/youtube_titles.rb. updated locales
2010-12-15 01:20:53 -05:00
Dan Hansen & Sarah Mei
c4a7745c88
Refactored the markdownify method.
2010-12-15 01:00:20 -05:00
danielvincent
f1ee32145d
Remove pending_requests from user, just use Request.from and Request.to.
2010-12-14 19:00:03 -08:00
maxwell
0119de4afc
adding task to fix users with periods
2010-12-14 18:45:10 -08:00
maxwell
6bd42874e8
adding a task to fix person object with spaces in their name
2010-12-14 17:36:27 -08:00
maxwell
d24be269f2
small refactor of admin mail. don't call deliver in the method
2010-12-14 17:36:26 -08:00
danielvincent
b1c0facfe6
initiating a request now just creates a pending contact instead of persisting a request
2010-12-14 17:11:43 -08:00
Raphael
06b7b1c99a
WIP pending contacts
2010-12-14 17:11:42 -08:00
Raphael
251cdec2ec
Add full request cycle cucumber feature
2010-12-14 17:11:42 -08:00
Raphael
e63a8a4bfa
Take contact.person query out of the views, only query people once in hashes_for_aspects
2010-12-14 12:11:36 -08:00
maxwell
0bd13ec106
use blank instead of empty for the person#name helper
2010-12-14 11:30:06 -08:00
maxwell
42c22cedf9
Merge branch 'master' of github.com:diaspora/diaspora
2010-12-13 14:38:47 -08:00
MrZYX
045ba7c419
Merge branch 'email-validation' of https://github.com/themasch/diaspora into themasch-email-validation
2010-12-13 22:49:50 +01:00
maxwell
502db347cc
removed homepage detail into a partial, which you should redefine
2010-12-13 12:52:23 -08:00
Raphael
f861955d80
profile.image_url is set to :thumb_large in update_profile
2010-12-13 12:11:54 -08:00
Mark Schmale
4cc62ffaca
added spec for email validation
2010-12-13 15:46:19 +01:00
MrZYX
1284fcc92d
fix for #699
2010-12-13 15:04:11 +01:00
Sarah Mei
3eaf7c48e6
white space police
2010-12-12 13:43:01 -08:00
Sarah Mei
7cd8e0f16b
Fix jasmine specs so that they fail when they're supposed to.
2010-12-12 12:57:11 -08:00
danielvincent
d19353ed8f
added newline support to markdownify
2010-12-12 00:44:54 -08:00
Sarah Mei
646603ffe0
Don't show rake output when running migrations_spec
2010-12-11 12:32:33 -08:00
danielvincent
6f62161442
invitation emails stripped of whitespace from form
2010-12-10 18:10:24 -08:00
danielvincent
2c5d5d9328
show already invited users on invitation#new
2010-12-10 18:05:08 -08:00
MrZYX
0b57ccd47f
fixed require
2010-12-10 21:49:09 +01:00
Raphael
2c141baf78
Capitalization...
2010-12-10 12:12:34 -08:00
Raphael
4bb9370c5d
Correctly stub the websocket redis method
2010-12-10 11:53:18 -08:00
maxwell
076d0e5edd
Merge branch 'master' of github.com:diaspora/diaspora
2010-12-10 11:47:20 -08:00
maxwell
c774685d52
users can now disable email notfications
2010-12-10 11:47:10 -08:00
Raphael
0e77577fbd
Websocket now uses redis
2010-12-10 11:25:38 -08:00
MrZYX
36043845ca
fixed requires for ruby 1.9
2010-12-10 17:25:02 +01:00
Alec Leamas
eacee54846
Replace APP_CONFIG[:terse_pod_url] with uri object.
...
Adds a new APP_CONFIG[:pod_uri] item, an uri object parsed from
pod_url. Replace all occurrences of APP_CONFIG[:terse_pod_url] with
APP_CONFIG[:pod_uri].host. Closes http://bugs.joindiaspora.com/issues/684 ,
using the well-defined semantics of the uri object.
The pod_url is normalized using module URI's functions, always with a
trailing /.
The diaspora-handle will always reflect the pod_url with this patch
i. e., a pod_url like www.dpod.se will give the handle xx@www.dpod.se ;
previous code stripped the www. prefix. If this is a problem, it
should be addressed by another setting, since one cannot presume that
www.domain.tld resolves to the same address as domain.tld.
2010-12-10 14:29:19 +01:00
Raphael
fc73c02c3a
Fix hashes_for_person spec
2010-12-09 20:01:37 -08:00
maxwell
dfbc01ca7a
added a test for the converter rake task
2010-12-09 19:29:25 -08:00
maxwell
bf56364019
tests for post to services resque job
2010-12-09 19:29:25 -08:00
maxwell
d81aa7dfe1
added specs for push_to_services, also rename the socket webfinger job spec because since it did not end with '_spec' it was not getting run
2010-12-09 19:29:25 -08:00
maxwell
a4336a8e72
moar tests for services
2010-12-09 19:29:25 -08:00
maxwell
041e747db6
MSSM services are now broken out into seperate classes, and we cleaned up posting to them
2010-12-09 19:29:25 -08:00
Raphael
2be0666d80
Remove query from aspects manage, correct spec in User spec
2010-12-09 19:11:47 -08:00
Raphael
e406426b81
select only profile on most Person queries
2010-12-09 15:04:40 -08:00
maxwell
13740da9b9
fix for people controller where Person.search was returning a non-deterministic order of people
2010-12-09 14:37:07 -08:00
Raphael
3a4caca397
Fix photo uploading in profile photos, style photo upload button better
2010-12-09 13:06:31 -08:00
Raphael
b8589c457d
Refactor people edit page, now using form_tag
2010-12-09 13:03:30 -08:00
zhitomirskiyi
23d2a92bf1
pushing the profile to to all the contacts
2010-12-09 11:51:35 -08:00
danielvincent
46793179db
people#show displays shows public posts for non-contacts as well
2010-12-08 16:53:24 -08:00
danielvincent
b94e6ae4a0
shift+enter submits new messages/comments
2010-12-07 21:30:29 -08:00
Raphael
18319f8e42
Hopefully cut down the stream rendering time by memoizing the new comment form
2010-12-07 09:28:11 -08:00
Raphael
f421f1327c
Take nested queried out of aspects manage
2010-12-07 00:21:05 -08:00
Raphael
9442553504
Refactor aspectscontroller and aspect_contacts.haml
2010-12-06 17:20:21 -08:00
Raphael
8a19e9f961
Fix spec
2010-12-06 13:56:40 -08:00
Raphael
32a2264af5
Refactor peoplecontroller index
2010-12-06 13:36:20 -08:00
maxwell
97c1ce54c1
fixed the batch emailer tests... sorry it took me so long
2010-12-06 10:56:04 -08:00
Raphael
3ef5ac5252
Add some specs to Invitation, use I18n in InvitationsController
2010-12-05 14:37:43 -08:00
danielvincent
e9742acc32
reverting http_post to a working state
2010-12-05 02:08:29 -08:00
danielvincent
d7407b7aa6
request -> resource
2010-12-05 02:03:03 -08:00
danielvincent
737e6084df
actually setting the timeout in restclient
2010-12-05 01:54:16 -08:00
Sarah Mei
ecc537c737
Stub Jobs::ReceiveSalmon.perform in controller test
2010-12-05 01:31:19 -08:00
maxwell
65c22020e8
fixing photo controllers spec
2010-12-05 00:45:13 -08:00
maxwell
2c09c35425
MS DG photos now delete sm if they are empty status messages, and status messages delete their photos
2010-12-05 00:45:13 -08:00
maxwell
a415ff5c5f
fixed the build. made photos dependent destroy with parent status message
2010-12-05 00:45:13 -08:00
Raphael
36e1fb8b2c
Fix a couple local-posting specs
2010-12-04 23:38:31 -08:00
Raphael
c99796f5db
Extra spec on find_for_authentication
2010-12-04 23:15:22 -08:00
maxwell
03a5514400
Merge branch 'master' of github.com:diaspora/diaspora
2010-12-04 23:06:58 -08:00
Raphael
61e40debb5
Fix in find_for_authentication
2010-12-04 22:25:28 -08:00
maxwell
fb310560df
Merge branch 'master' of github.com:diaspora/diaspora
2010-12-04 19:37:47 -08:00
Michael Sofaer
9e575ea765
MS RS Get the fake queue working when it's nested, and push local dispatch onto the queues
2010-12-04 19:36:22 -08:00
danielvincent
4c4f5c6aa4
dispatch moved to resque. one failing test, globally stubbed out resque enqueue temporarily. TO AMEND.
2010-12-04 19:36:22 -08:00
maxwell
b56b2fbd1b
added spec for periods in usernames; unpendify a couple of specs
2010-12-04 19:33:58 -08:00
Sarah Mei
c9f7866955
Random extra spec for people_controller
2010-12-04 18:13:15 -08:00
Michael Sofaer
3ca89bde57
Put photos create spec back in. I am not going to check who left it pending.
2010-12-04 17:18:08 -08:00
danielvincent
d1ad2efed1
HttpPost job now follows redirects
2010-12-04 15:23:54 -08:00
danielvincent
177cc16e2f
fixed the build
2010-12-04 14:26:13 -08:00
OhaiBBQ
ba23bd7a0a
Many JS improvements, moved a few things in view.js to stream.js, moved the clearForm plugin from view.js to rails.js (where we actually use it), refactored view.js and wrote specs
2010-12-04 11:54:59 +03:00
maxwell
7dce94814c
fixing the invite user job
2010-12-03 22:41:16 -08:00
Sarah Mei
713c98ce51
don't require redis for cucumber
2010-12-03 20:49:41 -08:00
maxwell
0a831cfbf4
invites are now on the queue
2010-12-03 19:33:54 -08:00
danielvincent
f9e4a744a5
put spec helper methods in spec_helper
2010-12-03 15:50:17 -08:00
danielvincent
a7823485c7
made http calls synchronous. messagehandler enqueues POSTs into resque.
2010-12-03 15:26:52 -08:00
danielvincent
71cae6b89f
Move request mail into resque
2010-12-03 11:51:04 -08:00
maxwell
c43077d318
fixed twitter, added logging for constants, added job for local recieve
2010-12-03 11:34:42 -08:00
MrZYX
acc8803cee
try at fixing specs for ruby 1.9, SystemTimer isn't needed anymore for 1.9
2010-12-03 16:33:28 +01:00
Raphael
3ee246d873
Merge branch 'resque-receive'
...
Conflicts:
Gemfile.lock
2010-12-02 19:42:05 -08:00
maxwell
579a288351
public posts are now accessible by your friends, and facebook and twitter include a permalink. we prob want to link shorten these bad boys(and it has a max length of 140 chars, with a permalink), also, facebook and twitter posting are sync, but that will make it more reliable
2010-12-02 18:48:50 -08:00
maxwell
38d9d75162
posts now have public permalinks
2010-12-02 18:47:48 -08:00
danielvincent
756824d072
removed referring text from users#edit. render_views in both users_controller_spec and photos_controller_spec.
2010-12-02 18:42:21 -08:00
danielvincent
6c05d01177
enabling dragging and dropping between aspects on aspect manage. removed ability to remove a contact from aspects#manage after removing from a single aspect. fixed notification popup z-index.
2010-12-02 17:36:46 -08:00
Raphael
8798f05ff7
Revert "Revert redis merge to fix bugs on master"
...
This reverts commit 30698d674b
2010-12-02 15:33:26 -08:00
Raphael
30698d674b
Revert redis merge to fix bugs on master
2010-12-02 15:20:27 -08:00
Raphael
c76f38ca23
Write webfinger job for search
2010-12-02 12:35:26 -08:00
Raphael
6cfa6577a5
Add first resque job
2010-12-02 12:35:26 -08:00
Raphael
cee5e4c26e
Bring in resque recipes and rake tasks
2010-12-02 12:35:26 -08:00
Raphael
db0106f13c
Rename EMWebfinger to Webfinger, clean up some related things
2010-12-02 12:35:25 -08:00
maxwell
be00a2f1b3
webfingering is now syncrounous
2010-12-02 12:35:25 -08:00
maxwell
9aa093a0a3
api compatabile, but ugly
2010-12-02 12:35:25 -08:00
maxwell
119599bfeb
Revert "Commented-on posts bubble up to the top"
...
This reverts commit 6da410079b
2010-12-02 09:51:26 -08:00
MrZYX
c3356af8d1
mardownify doesn't strip _/__/*/** without context anymore and allow __/** to be escaped with \__/\** instead of \_\_/\*\*. probably makes it less robust against weired constructs though
2010-12-02 13:54:39 +01:00
Sarah Mei
1f789e5f2b
typeof regex implemented inconsistently across browsers...sigh
2010-12-01 23:08:57 -08:00
Sarah Mei
c7b1fcc806
Merge branch 'master' of https://github.com/OhaiBBQ/diaspora into OhaiBBQ-master
2010-12-01 22:53:58 -08:00
Sarah Mei
ef89d49b1a
Revert "Added some specs for grammatical_gender (User model and Users controller)."
...
This reverts commit 1295417224
2010-12-01 22:29:19 -08:00
Dan Hansen
f81dc0fed6
remove empty specs
2010-12-01 21:25:58 -08:00
root
5d31a24e9e
fixed spec, jquery event binding doesnt call the function itself, but a 'clone' of the function
2010-12-02 02:54:38 +03:00
Raphael
6da410079b
Commented-on posts bubble up to the top
2010-12-01 15:38:56 -08:00
Raphael
8d853a88a3
Remove some old views, clean up routes, clean up.
2010-12-01 15:38:56 -08:00
Raphael
f0df1ec8df
Remove dev utilities controller
2010-12-01 15:38:56 -08:00
Raphael
c07b9b1874
Fix rest of specs
2010-12-01 15:38:56 -08:00
Raphael
199eb8945d
clean up posting spec, move socket_to_uid into add_to_streams
2010-12-01 15:38:56 -08:00
Raphael
836b5685f7
Change prune_aspect_ids to aspects_from_ids, seperate out non-backgroundable piece of posting from dispatch_post
2010-12-01 15:38:56 -08:00
Raphael
e63a29be64
Change v_aspect_ids to prune_aspect_ids
2010-12-01 15:38:55 -08:00
root
5cd0a60073
Moved to it's own file, added specs
2010-12-02 02:22:05 +03:00
maxwell
75caecc6a3
reset to local to english in tests
2010-12-01 12:16:21 -08:00
maxwell
7fc9d239b9
you can no longer send a request to yourself at the Request model level
2010-12-01 11:37:54 -08:00
Raphael
ef083c6770
Merge branch 'master' of github.com:diaspora/diaspora
2010-12-01 11:21:36 -08:00
Raphael
5791ffba79
Add administrative mail method
2010-12-01 11:20:10 -08:00
Hexagon
5651ea1d33
Merge branch '619-gender-aware-translations' of https://github.com/siefca/diaspora into siefca-619-gender-aware-translations
2010-12-01 19:13:39 +01:00
Paweł Wilk
1295417224
Added some specs for grammatical_gender (User model and Users controller).
2010-12-01 18:19:48 +01:00
Josh Lubaway
ecd1d2ecd6
Bug #624 Can't unset birthday
...
This change allows users to "unset" their birthday.
Previously the logic checked to see if all values for birthday were
present (year, month, day). If all values were present the update
would proceed.
Now, there is another condition. If all values are empty, then
also proceed with the update. Thus, allowing a user to "unset" their
birthday.
2010-11-30 21:23:47 -08:00
Dan Hansen & Sarah Mei
b2f4e064fc
stream.js now semi-split into functions (still needs work); specs for toggling comments
2010-11-30 16:24:11 -08:00
Raphael
a520c756ea
Fix spec
2010-11-30 16:02:14 -08:00
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
maxwell
c5f71184be
profile now knows about three images sizes, even in federation case
2010-11-30 15:58:25 -08:00
Hexagon
160198c152
Added rake task to check pod_url and terse_pod_url
2010-11-30 15:58:25 -08:00
maxwell
fdbc7dff86
profile now knows about three images sizes, even in federation case
2010-11-30 15:56:43 -08:00
Hexagon
b15032de39
Added rake task to check pod_url and terse_pod_url
2010-11-30 15:56:43 -08:00
Raphael
366734ca5e
Take queries out of aspect contacts pane on home page
2010-11-30 15:35:32 -08:00
Raphael
57485e7093
Move aspect contacts pane js to public
2010-11-30 13:55:37 -08:00
maxwell
ec05c21472
profile now knows about three images sizes, even in federation case
2010-11-30 13:40:41 -08:00
Hexagon
ec5145777e
Added rake task to check pod_url and terse_pod_url
2010-11-30 13:32:46 -08:00
Hexagon
c98f6f21c8
config spec now makes sense
2010-11-30 22:27:19 +01:00
danielvincent
185e84537e
fixed build
2010-11-30 13:19:25 -08:00
danielvincent
828635def9
Person#real_name -> Person#name
2010-11-30 13:01:53 -08:00
Hexagon
4fa3e801a8
Added rake task to check pod_url and terse_pod_url
2010-11-30 20:48:55 +01:00
Raphael
fcb0e07dd7
Stop regenerating fixtures on every spec run
2010-11-29 23:22:49 -08:00
Hexagon
7d2b46c7c0
public helper spec superfluous, fixing build
2010-11-30 00:17:01 +01: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
2c22941e2f
fixed listener for delete action on aspect-edit. scope through a manage_aspect_zones div to avoid confusion on aspects#show.
2010-11-28 20:16:57 -05:00
Sarah Mei
5ae8a06016
unpendingify comment specs
2010-11-28 17:16:22 -08:00
danielvincent
c35be73978
added pending specs. traced the whole comment thing -- it works, but i couldn't figure out how to make these pending specs pass (re: should_receive)
2010-11-28 18:51:27 -05:00
danielvincent
05174436c0
comments should only be dispatched out to remote people from owner. for local people on the same pod, the comment has already been verified by the comment's authority (post owner).
2010-11-28 18:51:27 -05: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
4e15745170
Add spec to comment
2010-11-28 00:55:20 -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
fef6d84f4b
markdownify performance spec
2010-11-26 22:16:33 -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
Sarah Mei
f8229d07e8
Adding copyright to js files
2010-11-26 12:16:10 -08:00
Michael Sofaer and Raphael Sofaer
b54164cef8
Don't do expensive things on invalid users
2010-11-26 11:55:54 -05:00
Dan Hansen & Sarah Mei
257d6f414a
Top-level Diaspora object for js widget management
2010-11-25 22:24:25 -08:00
danielvincent
417301088f
fixed build
2010-11-26 00:56:53 -05:00
danielvincent
94d08954d9
401 -> 406 in controllers resolving http basic auth prompt on failed comment/status message creation. fixed status message validation.
2010-11-26 00:19:19 -05:00
Dan Hansen & Sarah Mei
5075a7384b
allow hyphens in YouTube video IDs
2010-11-25 21:05:54 -08: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
Dan Hansen & Sarah Mei
eb314aa300
Fix application helper specs around youtube links
2010-11-25 16:29:30 -08:00
Sarah Mei
ef2fa21d06
person_image_link and object_path return empty strings if parameter is nil.
2010-11-25 12:26:46 -08:00
Sarah Mei
050918a310
Added link to manage aspects page from sidebar.
...
Now you can drag requests from that page, but not existing contacts. d&d interface for moving contacts between aspects needs some thought.
2010-11-25 10:29:35 -08:00
Sarah Mei
287b79ab17
Merge branch 'master' of github.com:diaspora/diaspora
2010-11-24 22:09:25 -08:00
Sarah Mei
aa4a61870c
you can click on photos in manage aspects to see profiles
2010-11-24 22:09:14 -08:00
Raphael
08ba387311
More sane redirect on failing to accept an invitation
2010-11-25 00:39:13 -05:00
Raphael
a85f47041a
This file is generated by rake fixtures:users
2010-11-24 14:07:00 -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
zhitomirskiyi
ebaf2c081e
returning nothing on empty query and limit the returning of the query to 90
2010-11-23 10:02:01 -08:00
danielvincent
c9c84794af
fixed build. publisher lights up on hover on aspect#index page. updated login page text.
2010-11-23 03:10:47 -08:00
maxwell
709e348457
Merge branch 'master' of github.com:diaspora/diaspora
...
Conflicts:
spec/fixtures/users.yaml
2010-11-23 00:15:26 -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
Dan Goldenberg
bfc1fa4da0
added getting_started text and new press logos
2010-11-22 21:07:01 -08:00
maxwell
7c09117230
fixing build
2010-11-22 19:05:35 -08:00
maxwell
173ec5f73b
Revert "remove a duplicate view, hence many files updated, and fixed the js to socket people to the aspect sidebar"
...
This reverts commit c45893d07d
2010-11-22 17:11:34 -08:00
maxwell
c45893d07d
remove a duplicate view, hence many files updated, and fixed the js to socket people to the aspect sidebar
2010-11-22 16:38:10 -08:00
zhitomirskiyi
7df35ade12
Merge branch 'master' of github.com:diaspora/diaspora
2010-11-22 12:24:34 -08:00
zhitomirskiyi
1519fd46bf
Sending a request to someone who requested you autoaccepts the request
2010-11-22 12:21:26 -08:00
danielvincent
857a4b5f11
photo large is now at 300px. a person's profile photo now references the larger size instead of medium.
2010-11-22 10:32:14 -08:00
danielvincent
9a18b7e6f3
photo show pages display comment streams for their original post. pending spec to do this *correctly* on the model level.
2010-11-22 00:32:46 -08:00
danielvincent
c841a47a37
status messages validate on presence of message OR one or more photos. took gifs out of carrierwave's whitelist, SORRY JAMIE.
2010-11-21 23:42:49 -08:00
Sarah Mei
218aa1c0d6
MSSM aspect switcher in mobile interface plus tests; added check for ipad useragent
2010-11-21 19:56:35 -08:00
danielvincent
bd0c21a634
button for adding photos works again. pulled _aspect_nav into _header. fixed all but one cucumber test.
2010-11-21 16:30:46 -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
4ce337bbed
display a users username in the final step
2010-11-21 16:13:02 -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
b991df9d3a
WSR spec working
2010-11-21 16:19:25 -05:00
Raphael
6f0d008914
Move WebSocketReceiver out to a js file
2010-11-21 16:14:36 -05:00
Raphael
0daffb7fed
Add a couple specs, refactor in connecting
2010-11-21 14:09:39 -05:00
Raphael
4ce2de55e2
Fix photo show, js on people search page
2010-11-21 13:29:50 -05:00
zhitomirskiyi
3d5cf8f625
added a panding cross path request spec
2010-11-19 18:53:46 -08:00
Raphael
655e92ebdd
Add some scopes for Request, take putses out of specs
2010-11-18 18:04:29 -08: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
maxwell
c0d10ef174
Merge branch 'master' of github.com:diaspora/diaspora
2010-11-18 15:36:47 -08:00
maxwell
747ab761a0
pushing mailer spec for ilya
2010-11-18 15:36:30 -08:00
zhitomirskiyi
0e171e8504
added a fixed the pending request query
2010-11-18 15:22:14 -08:00
Raphael
61692c1da6
Fix translation missing in inv mailer
2010-11-18 12:50:46 -08:00
Raphael
be55384628
Add pending spec to invitations
2010-11-18 11:21:35 -08:00
maxwell
9882fa183d
Merge branch 'master' of github.com:diaspora/diaspora
2010-11-17 23:19:27 -08:00
maxwell
2ffd2d93e3
made mailchimp form ssl
2010-11-17 23:19:12 -08:00
Sarah Mei
64237534fd
Merge branch 'master' of github.com:diaspora/diaspora
2010-11-17 22:31:21 -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
maxwell
f01fca1877
letting jammit do its default thing
2010-11-17 22:18:15 -08:00
danielvincent
1a9041a3c0
DG MS; fixed cucumber tests to work with new landing page flow
2010-11-17 19:49:01 -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
4853a55d9b
Don't expect raises from user receive
2010-11-17 15:35:25 -08:00
maxwell
2c627cdb2b
updating jas
2010-11-17 00:16:11 -08:00
maxwell
f81bb1d7e7
i broke the jasmine tests. this is me fixin them
2010-11-16 22:02:18 -08:00
Raphael
2d347ec36d
Delete an accepted friend request
2010-11-16 16:47:06 -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
538c6ce4b9
Take handle validations out of em-webfinger
2010-11-16 16:18:16 -08:00
Raphael
7876da8fb8
Refactor raises in requesting to validations in request, move to better controller structure
2010-11-16 16:18:16 -08:00
Sarah Mei
44bd4534ce
I found where we needed the one-line addition. Ruby 1.9 build now works.
...
I feel pretty badass.
2010-11-15 22:44:55 -08:00
Sarah Mei
2cf4350fab
Clean up unused variable
2010-11-15 22:42:09 -08:00
Sarah Mei
686cea6595
1.9.2 doesn't like friending people when the target doesn't have any aspects. ::sigh:: And with that, I fix the cucumber feature that was failing under 1.9.
2010-11-15 21:52:02 -08:00
Sarah Mei
9fa47c9bfa
Fix a failing spec under 1.9 in receive_spec
2010-11-15 21:19:21 -08:00
Raphael
248e768846
search now sockets a person
2010-11-15 19:13:45 -08:00
Raphael
1b39b79446
Make invitation view with no inviters sensible
2010-11-15 16:35:00 -08:00
Raphael
70bcab3abc
adding a couple specs to invitation_spec
2010-11-15 16:34:59 -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
23c1ac4936
Cucumber feature for managing contact requests
2010-11-14 21:49:56 -08:00
Sarah Mei
45e47513c2
AspectEdit#onDeleteRequestSuccess now adds and drops attributes properly
2010-11-14 21:49:36 -08:00
Sarah Mei
830a43ec2f
Add destroy specs for RequestsController.
...
Cucumber feature for contact requests.
2010-11-14 09:43:28 -08:00
Raphael
2ad74d397c
fix build
2010-11-13 19:05:12 -08:00
danielvincent
86470dc15b
jasmine references move_contact instead of move_friend
2010-11-12 20:39:49 -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
Sarah Mei
6c439608f0
started specs for AspectEdit.deletePersonFromAspect
2010-11-12 17:04:15 -06:00
Sarah Mei
9586ebb67e
specs for AspectEdit.onMovePersonSuccess
2010-11-12 16:44:22 -06:00
Sarah Mei
737c812e08
Specs for AspectEdit.onDeleteRequestSuccess
2010-11-12 16:38:02 -06:00
Sarah Mei
506d13335a
Finally have complete specs for AspectEdit.onDropMove.
2010-11-12 16:05:17 -06:00
Sarah Mei
b77547e940
Responding to a friend request now only calls RequestsController#delete instead of also calling AspectsController#move_friend
2010-11-12 14:51:16 -06:00
Raphael
1e842f1a88
Render mail css as a partial, fix spec
2010-11-12 12:26:34 -08:00
Raphael
a4d7b25bac
Merge branch 'master' of github.com:diaspora/diaspora
2010-11-12 11:54:19 -08:00
Raphael
ae9f4ab969
Refactor mail views, add a spec to make sure CSS is rendered
2010-11-12 11:47:59 -08:00
Sarah Mei
feec6d971d
More specs for aspect edit JS
2010-11-12 13:40:23 -06: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
Sarah Mei
c113ee2b7c
Finish specs for AspectEdit#stopDrag.
2010-11-10 10:54:12 -07:00
Sarah Mei
72bf683c87
Renaming publisher_spec to publisher-spec since js likes dashes. Fix typo in spec.
2010-11-10 10:53:23 -07:00
maxwell
4037ae9f33
fixing controller test
2010-11-09 16:55:54 -08:00
maxwell
034d7ee2b1
first commit
2010-11-09 15:29:43 -08:00
Raphael
390fffdee6
Fix new request view
2010-11-09 15:03:56 -08:00
Raphael
98fe1d357b
accept_friend_request no longer takes ids
2010-11-09 14:15:02 -08:00
Raphael
bfa0917ce4
add a couple specs
2010-11-09 14:07:26 -08:00
Raphael
6dd58fe875
Specs pass again, invitations moved to Invitation model, refactor possibly complete
2010-11-09 14:07:26 -08:00
Raphael
ae28a6f70c
Don't pluralize in model spec name
2010-11-09 14:07:26 -08:00
Raphael
4818973643
Beginning to refactor invitations into an Invitation class
2010-11-09 14:07:26 -08:00
Raphael
71ab919ad3
Remove urls from requests, invitations are broken
2010-11-09 14:07:26 -08:00
Sarah Mei
16e2ccc614
Specs for aspect edit during and stop drag.
2010-11-09 06:53:55 -08:00
Sarah Mei
16ea7a321b
specs for AspectEdit#animateImage
2010-11-08 21:19:49 -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
7d39f8ae5f
Merge branch 'master' of github.com:diaspora/diaspora
2010-11-08 15:36:11 -08:00
zhitomirskiyi
a6dff4f78e
removing the posts from the aspect on unfriending
2010-11-08 15:35:37 -08:00
Raphael
70af10ee62
user#friends is now a many-foreign_key assoc, rather than a many-in
2010-11-08 15:19:23 -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
Sarah Mei
1a4fa2713a
More specs for aspect-edit.js. Initialize now fully covered.
...
Also, bundler upgraded our cucumber and rspec.
2010-11-07 16:58:51 -08:00
Sarah Mei
32d953f457
Reorganized public folder - third-party js is now in public/javascripts/vendor. Third-party css is now in public/stylesheets/vendor.
2010-11-06 16:50:07 -07:00
maxwell
e4f8f558a0
aspects now have a max length of 20 characters
2010-11-05 17:18:20 -07: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
maxwell
cc92f61583
mailer queue now works
2010-11-05 11:58:25 -07:00
zhitomirskiyi
d793bdc3c7
inital commit for mailqueue
2010-11-05 11:46:43 -07:00
Raphael
693847480b
Take out notifier stubbing, it's in test mode.
2010-11-05 11:31:52 -07:00
Raphael
c69e2b8900
rename spec file
2010-11-05 11:26:49 -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
4eba0595f9
Fix 328 profile images dying, thanks to theBernd
2010-11-04 18:46:15 -07:00
Raphael
f6d899f1d9
Move prep_image_url into profile image_url setter
2010-11-04 18:46:15 -07:00
danielvincent
f4dba54ff3
posting to a person with a user on the same pod will send internally, skipping the http queue and encryption.
2010-11-04 15:33:16 -07:00
danielvincent
d5cc0ed6dc
separating object receiving in user#receive
2010-11-04 15:33:16 -07:00
Raphael
7e568db032
Add a couple specs to user_spec
2010-11-04 15:23:58 -07:00
zhitomirskiyi
7f5b98a6cb
the photo image url is now randomized
2010-11-04 14:37:08 -07:00
danielvincent
b33aa9a0fb
retracting on a non existant post does not raise a permissions error.
2010-11-04 12:43:26 -07:00
danielvincent
82c82b8ccc
killed albums
2010-11-04 10:17:19 -07:00
zhitomirskiyi
9389d99ba8
Merge branch 'master' of github.com:diaspora/diaspora
2010-11-03 23:05:47 -07:00
zhitomirskiyi
a55878f2a3
invitations controller test, tnx coyote
2010-11-03 22:58:42 -07:00
Sarah Mei
dbdd6884a7
SM MS jasmine specs for aspect edit
2010-11-03 22:19:20 -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
Raphael
03b272db60
Requests are no longer tracked by id across servers, DELETED USELESS PUTS IN EM-WEBFINGER SPEC
2010-11-03 15:26:58 -07:00
Raphael
2eef9f7ad1
Refactor ostatus builder spec
2010-11-03 15:26:58 -07:00
zhitomirskiyi
0ac4c5b04f
IZ MS refactored invites to use user.build
2010-11-03 13:16:45 -07:00
zhitomirskiyi
3578daa14e
IZ MS more photo controller specs
2010-11-03 12:21:32 -07:00
zhitomirskiyi
5e9d70f88c
Merge branch 'master' of github.com:diaspora/diaspora
2010-11-03 11:00:04 -07:00
zhitomirskiyi
c6e9b94f4f
IZ MS moved contact_for to querying and added tests
2010-11-03 10:59:56 -07:00
maxwell
62c25057e6
adding photocontroller spec for IZ
2010-11-03 10:43:27 -07:00
maxwell
0343e7a226
Merge branch 'master' of github.com:diaspora/diaspora
2010-11-03 00:10:11 -07:00
maxwell
545577a950
em-webfinger ssl should work
2010-11-02 19:16:08 -07:00
Raphael
d5a4de58b3
User#post is now like a future controller, Photo#instantiate no longer saves
2010-11-02 19:16:02 -07:00
Raphael
1c67211ebc
Move post dispatching to dispatch_post
2010-11-02 19:16:02 -07:00
maxwell
d482334ca2
Revert "Revert "IZ MS webfinger now trys ssl first, then http""
...
This reverts commit 153265aae8
2010-11-02 18:59:18 -07:00
maxwell
0ecc27a935
MS IZ posts should now update
2010-11-02 18:56:00 -07:00
maxwell
4de89df4dc
MS IZ setting the diaspora handle in photo instantiate
2010-11-02 18:32:02 -07:00
Raphael
ab4e3a9f7f
add a couple specs to album_spec
2010-11-02 18:16:14 -07:00
danielvincent
bf12dc6bc7
fix spec
2010-11-02 17:44:13 -07:00
maxwell
153265aae8
Revert "IZ MS webfinger now trys ssl first, then http"
...
This reverts commit af3247b62f
2010-11-02 17:37:45 -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
maxwell
1951df8d9c
Merge branch 'master' of github.com:diaspora/diaspora
2010-11-02 16:49:54 -07:00
maxwell
3baa8b4552
IZ MS two pending photo specs now pass
2010-11-02 16:49:40 -07:00
danielvincent
e9f3efea79
person searchable by diaspora_handle
2010-11-02 16:48:58 -07:00
maxwell
8c89f8d87a
Merge branch 'master' of github.com:diaspora/diaspora
2010-11-02 16:42:52 -07:00
Raphael
20d5daafbc
Two pending specs on photo serialization for Max and Ilya
2010-11-02 16:41:53 -07:00
Raphael
15ecc22130
Unpending user spec
2010-11-02 16:41:31 -07:00
Raphael
2c903ea519
check that User#build does not save a Person
2010-11-02 16:28:55 -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
maxwell
34f190ce75
MS IZ added a check for person in webfinger response in receive_salmon method
2010-11-02 16:10:17 -07:00
maxwell
af3247b62f
IZ MS webfinger now trys ssl first, then http
2010-11-02 15:49:41 -07:00
maxwell
449a6f3ea0
MS IZ removed a refrence to REDFINGER
2010-11-02 15:14:40 -07:00
maxwell
4332174525
Merge branch 'master' of github.com:diaspora/diaspora
2010-11-02 13:58:36 -07:00
maxwell
3251b8ba2e
MS IZ fixed a hole where another user could update another friends post
2010-11-02 13:58:27 -07:00
Sarah Mei
cd7bdf6758
Merge branch 'master' of github.com:diaspora/diaspora
2010-11-02 13:37:40 -07:00
Sarah Mei
fad9c09212
refactor aspect-edit.js in prep for jasmine testing
2010-11-02 13:37:27 -07:00
maxwell
c3d0c78bd1
Merge branch 'master' of github.com:diaspora/diaspora
...
Conflicts:
lib/diaspora/user/receiving.rb
2010-11-02 12:46:08 -07:00
maxwell
19bbf8ce4d
IZ MS; fixed post update. Posts which implement the mutable? method now can be updated via receive
2010-11-02 12:38:30 -07:00
Raphael
a9b429d163
Merge remote branch 'ed0h/helper-method-for-markdown'
2010-11-02 12:14:41 -07:00
Raphael
ff21c827e4
Revert "Merge remote branch 'ed0h/336-markdown-for-status-messages'"
...
This reverts commit 2b128d88ec8778bdab3b
2010-11-02 12:14:12 -07:00
Raphael
2b128d88ec
Merge remote branch 'ed0h/336-markdown-for-status-messages'
...
Conflicts:
pkg/ubuntu/dist
2010-11-02 11:45:16 -07:00
Raphael
bbd8cadc14
Retaining specs and line from robustdj's patch
2010-11-02 11:27:51 -07:00
danielvincent
a3ce5f1cd7
REMOVED IMPORTER
2010-11-02 11:17:47 -07:00
Raphael
0b8425cbde
user.aspect is gone
2010-11-02 11:02:08 -07:00
Raphael
c031416ca8
Merge branch 'master' into HEAD
...
Conflicts:
lib/diaspora/user/receiving.rb
pkg/ubuntu/dist
2010-11-02 10:54:37 -07:00
Sarah Mei
dc97c852f4
Person delegates first_name and last_name to profile.
2010-11-01 22:22:15 -07:00
livefromthemoon@gmail.com
aab74cf1ff
Added markdown support for status messages
2010-11-02 03:55:14 +01:00
maxwell
15d6cff837
MS IZ everything now uses diaspora handle. this feels so good
2010-11-01 18:42:42 -07:00
maxwell
3c8b40c427
IZ MS retractions now use diaspora handle
2010-11-01 17:11:06 -07:00
maxwell
06445901f8
IZ MS retrations for posts now green
2010-11-01 17:11:06 -07:00
maxwell
ccf897ed62
IZ MS; fixing parser spec
2010-11-01 14:56:31 -07:00
maxwell
922aa85fb7
MS IZ refactor green
2010-11-01 14:54:40 -07:00
danielvincent
f6b4be97a3
requests are almost there
2010-11-01 14:54:40 -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
6c0b187d40
Merge remote branch 'jwinky/446-user-name-length-limit'
...
Conflicts:
app/models/user.rb
2010-11-01 11:00:02 -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
dc330012d6
Merge branch 'master' of github.com:diaspora/diaspora
2010-10-31 12:35:56 -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
Derrick Camerino
b19cdf2e25
fixing N socketing bug
2010-10-31 03:15:58 -07:00
Sarah Mei
3bd3a63c5d
Enough jasmine specs to get us started.
2010-10-30 11:48:17 -07:00
livefromthemoon@gmail.com
bcb17aae16
Add support for markdown links
2010-10-30 19:26:11 +02:00
livefromthemoon@gmail.com
ebf9dd464f
Better support for imbricated markdown emphasis
2010-10-30 19:26:11 +02:00
livefromthemoon@gmail.com
112088ace3
add support for markdown emphasis in status messages
2010-10-30 19:26:11 +02:00
Sarah Mei
d819c98718
can haz working jasmine
2010-10-29 22:21:08 -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
bc5dc934d6
Speed up importer spec by 40 seconds
2010-10-29 18:08:36 -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
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
maxwell
c1c045a4cd
mocking
2010-10-29 16:21:39 -07:00
Raphael
581985990c
Delete no-longer-relevant spec, now down to master branch failures
2010-10-29 15:59:42 -07:00
Raphael
99eb25762d
Moving to make_user, a few specs broken
2010-10-29 15:53:21 -07:00
Raphael
5b78a31d29
make_user now makes a user from fixtures
2010-10-29 15:53:21 -07:00
Raphael
0c434ff66a
rake task to generate user fixtures, helper method which saves them
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
maxwell
3ce44d040f
mocking out emhttprequest everywhere
2010-10-29 15:16:11 -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
ce805c8167
Test pollution from locale being set
2010-10-29 13:26:54 -07:00
Raphael
86ddc2561a
fix spec in users_controller
2010-10-29 13:22:25 -07:00
maxwell
f75bd6bc2e
whoops, taking out queue stuff untill i finish
2010-10-29 13:05:35 -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
23db4fe278
merge complete
2010-10-29 11:33:31 -07:00
maxwell
39f66cc5d9
tests are green
2010-10-29 11:19:07 -07:00
maxwell
7c32649df4
rebasing master
2010-10-29 11:18:20 -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
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
68a44af856
making a few more cleanup and tests
2010-10-29 11:13:08 -07:00
maxwell
eddcb71fcb
EM websocket cleanly merged with master. webfingering is now async
2010-10-29 11:11:05 -07:00
maxwell
58f836ab46
adding pending spec to check for error within webfinger process
2010-10-29 11:06:31 -07:00
maxwell
9a2e3ef158
making a few more cleanup and tests
2010-10-29 11:05:17 -07:00
maxwell
8fe339b03b
EM websocket cleanly merged with master. webfingering is now async
2010-10-29 11:05: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
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
Justin Wienckowski
cdcb693c95
Issue #446 : Adding 32-character length limit to User#username, Profile#first_name, Profile#last_name
2010-10-28 21:12:36 -07:00
Gabriel Gilder
bdb77ff282
redirecting to :back instead of manage page on failed aspect creation +spec
2010-10-28 21:01:53 -07:00
Raphael
f1ae95fac9
443- patch trim on validation + spec
2010-10-28 20:03:49 -07:00
zhitomirskiyi
3fc5651e9d
Merge branch 'master' of github.com:diaspora/diaspora
2010-10-28 17:03:14 -07:00
zhitomirskiyi
f5d54ff6f8
another silly malicious friend spec
2010-10-28 17:02:55 -07:00
Raphael
78acdb7368
Pushing broken photo controller spec for dan to fix
2010-10-28 16:19:18 -07:00
Raphael
b5bea7f14d
Add specs for photo mass assignment
2010-10-28 16:19:18 -07:00
Raphael
512f40eac2
attr_accessible on Post
2010-10-28 15:50:19 -07:00
Raphael
f7d2665950
Merge branch 'master' of github.com:diaspora/diaspora
2010-10-28 14:29:40 -07:00
Raphael
4aaa921121
A couple specs for create overwriting users
2010-10-28 14:26:20 -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
livefromthemoon@gmail.com
b7a586b1a5
allow user to change his language in his settings
2010-10-28 17:29:17 +02:00
danielvincent
1d5b7a87f1
Merge branch 'master' into getting-started
2010-10-27 18:14:08 -07:00
danielvincent
05c5e770ee
removed real name from signup process.
2010-10-27 16:25:22 -07:00
Raphael
ae65b7fc9b
Merge branch 'master' of github.com:diaspora/diaspora
2010-10-27 11:13:41 -07:00
Raphael
6c94d40bd4
Factory.build saves users
2010-10-27 11:03:57 -07:00
zhitomirskiyi
a5099bb89f
IZ moved methods found in spec helper to helper methods file. now we can include them in the db scripts to keep friending behavior in sync
2010-10-27 10:32:09 -07:00
zhitomirskiyi
4a09eb2ece
IZ MS update pending aspects controller spec
2010-10-27 10:14:24 -07:00
zhitomirskiyi
63c740fce7
Merge branch 'master' of github.com:diaspora/diaspora into contact-refactor
2010-10-27 09:53:50 -07:00
Sarah Mei
0c8de9460c
Fix for 1.9 (no spaces between method name and parens)
2010-10-27 03:21:17 -07:00
zhitomirskiyi
fa484e95e4
MS IZ refactored querying
2010-10-26 17:05:38 -07:00
danielvincent
6e015790a7
settings are more restful with account settings submitting to users#update, and profile settings submitting to person#update
2010-10-26 16:02:53 -07:00
zhitomirskiyi
1024b8a3a7
Merge branch 'master' of github.com:diaspora/diaspora into contact-refactor
...
Conflicts:
app/controllers/aspects_controller.rb
2010-10-26 14:57:52 -07:00
zhitomirskiyi
8acdf21234
MS IZ got rid of the requests for me scope in the user
2010-10-26 14:49:37 -07:00
zhitomirskiyi
e776389d19
Merge branch 'master' of github.com:diaspora/diaspora into contact-refactor
2010-10-26 11:19:50 -07:00
danielvincent
060d8f9c7b
DG MS; fixed some bugs with posting publicly.
2010-10-25 19:24:48 -07:00
zhitomirskiyi
917d1838de
MS IZ specs are green
2010-10-25 18:55:51 -07:00
danielvincent
287d633c44
user#post now handles posting to services.
2010-10-25 17:41:59 -07:00
danielvincent
b2e8ebd0bc
OmniauthService -> Service. Cleaned up views.
2010-10-25 17:41:59 -07:00
maxwell
be39df75fe
removed fb_status from the factories. whoops.
2010-10-25 17:41:58 -07:00
maxwell
fdd222003a
fixed failing specs due to omitted factories.
2010-10-25 17:41:58 -07:00
maxwell
154b6e0ee7
MS DG added specs for posting to twitter, and basic services controller tests
2010-10-25 17:41:58 -07:00
maxwell
b17ae0bf38
DG MS removed unused fb_status model and respective specs, fixtures.
2010-10-25 12:26:08 -07:00
ilya
ff3dad2bff
adding assertion to album_spec many association
2010-10-24 14:03:03 -07:00
ilya
8d61fb0aeb
tiny bug in the spec
2010-10-24 01:45:26 -07:00
ilya
c27f05ed42
Initial refactor done, need to stop mapping user.friends to people so much
2010-10-22 18:11:04 -07:00
ilya
7083d2aa03
Moving friendships into a 'Contact' proxy object.
2010-10-22 18:11:04 -07:00
maxwell
606a6bb43a
status message length is limited to 1000 chars.
2010-10-22 17:42:59 -07:00
maxwell
6913381781
username now can only contain letters numbers, periods, and underscores
2010-10-22 17:26:10 -07:00
maxwell
5af3d5fa82
double checking that matches are in front or back
2010-10-22 16:34:08 -07:00
maxwell
6720fa2c59
added tests to make sure Person.by_webfinger only returns exact matches
2010-10-22 16:28:03 -07:00
ilya
637d35d673
Remove puts
2010-10-22 12:27:28 -07:00
ilya
d1a2ebd236
Merge branch 'master' of github.com:diaspora/diaspora
2010-10-22 11:56:04 -07:00
ilya
9a217d1fa8
MS IZ request acceptance email
2010-10-22 11:55:50 -07:00
Raphael
7dd86b3c87
Move comment signing spec to comment spec, make encryption spec not depend on message building
2010-10-22 11:18:43 -07:00
Raphael
d8bbe38019
Move spec to request_spec
2010-10-22 11:11:51 -07:00
Raphael
1a19c28199
Move spec to user_spec
2010-10-22 11:10:35 -07:00
Raphael
b67cee9af0
Trying to make spec directory structure the same as the lib and app structures
2010-10-22 11:09:20 -07:00
Raphael
61d539e555
Moving user_encryption_spec to lib
2010-10-22 11:06:31 -07:00
Raphael
6993f3e2b5
Fix spec in user_encryption
2010-10-22 11:05:37 -07:00
Raphael
b404346c40
Stop stubbing signature verification unless it's necessary
2010-10-22 11:01:58 -07:00
Sarah Mei
ffa467b795
more stubbing! yay?
2010-10-22 06:38:46 -07:00
Sarah Mei
7e4529f2bd
im in ur test stubbin ur mailers
2010-10-22 06:22:47 -07:00
maxwell
6620f33ae2
fixing spec with a mock on mailer
2010-10-22 01:07:57 -07:00
maxwell
5701c3a873
should send the email when a new request is received. emails in dev should be intercepted to email@joindiaspora.com for now
2010-10-22 00:49:01 -07:00
ilya
80cd4761f3
started the new invitation email
2010-10-22 00:49:01 -07:00
Raphael
41cfd36b19
Refactor user_spec a little
2010-10-21 16:06:47 -07:00
Raphael
fe1a6bce20
Attr-accessible on aspects, check whether built user is persisted
2010-10-21 12:49:50 -07:00
Raphael
705cef3696
Fix comment spec
2010-10-21 10:55:17 -07:00
Raphael
35a830aa03
Fix profile update spec
2010-10-21 10:39:19 -07:00
Sarah Mei
e414b1c553
Fix some comment specs (still one failing). Remove warning from receive spec.
2010-10-21 06:45:15 -07:00
Raphael
bef6d76bfd
Refactor specs a little more
2010-10-20 17:53:09 -07:00
Raphael
e1cdcc68c8
Cut 10 seconds off of visible_posts_spec
2010-10-20 17:48:16 -07:00
Raphael
f9919d1cce
Not calling friend_users until it is needed takes a couple seconds off
2010-10-20 17:43:13 -07:00
Raphael
abf27bbfb2
Take unused models out of webhooks spec
2010-10-20 17:43:13 -07:00
Raphael
ff3666df5e
Cut parser spec time by a couple seconds
2010-10-20 17:43:13 -07:00
ilya
6fa82490c9
remove friend from aspect box, with js call to remove the person from the aspect
2010-10-20 17:34:52 -07:00
ilya
554adeae69
MS IZ; querying through for person not in aspect is tested
2010-10-20 16:39:37 -07:00
ilya
62700387ad
MS IZ added an add to aspect form on the request partial
2010-10-20 15:30:30 -07:00
ilya
02c0bf3c43
fixed the seed script
2010-10-20 14:52:17 -07:00
ilya
94a7a3c6ad
IZ MS; deleted move_friends removed
2010-10-20 14:26:45 -07:00
ilya
02f37c6156
Merge branch 'master' of github.com:diaspora/diaspora
...
Conflicts:
spec/controllers/aspects_controller_spec.rb
2010-10-20 13:21:16 -07:00
ilya
8fddb4ecf5
MS IZ added test concerning people in multiple aspects
2010-10-20 13:19:32 -07:00
Raphael
4d81583533
Backfill spec on mass-assignment in aspect update
2010-10-20 12:29:36 -07:00
Raphael
dfef8d0113
Merge branch 'master' of github.com:diaspora/diaspora
2010-10-20 12:15:36 -07:00
Raphael
9c8e514642
Adding a spec for a mass-assignment attack through profile update
2010-10-20 12:15:13 -07:00
ilya
e6de6179e9
MS IZ dependant destroy is back for aspects
2010-10-20 11:47:09 -07:00
ilya
992bd42b55
Merge branch 'master' of github.com:diaspora/diaspora
...
Conflicts:
spec/models/aspect_spec.rb
2010-10-20 11:30:06 -07:00
ilya
ea1ab59c3a
MS, IZ finished adding and removing people from aspects methods, refactored the move friend method
2010-10-20 11:28:56 -07:00
Raphael
961510a8ed
Rename instantiate! to build, no more raising in build, no saving in build, no seeding of aspects in build.
2010-10-20 11:03:47 -07:00
Raphael
f97f63e2d1
Merge remote branch 'tristil/239-380-identity-error-handling'
2010-10-20 10:36:03 -07:00
Raphael
4986de2c33
Put reloads back in
2010-10-20 10:35:16 -07:00
Raphael
0758f9245f
Clean up specs a little, fix unfriending
2010-10-20 10:28:08 -07:00
Raphael
fd8028db33
Revert "Revert "Merge remote branch 'upstream/master'""
...
This reverts commit 1481056af2
2010-10-20 09:51:55 -07:00
ilya
4d1ce410d7
Merge branch 'master' of github.com:diaspora/diaspora
2010-10-20 09:39:32 -07:00
Alec Leamas
1481056af2
Revert "Merge remote branch 'upstream/master'"
...
This reverts commit fb70dc8c9953fef63a9a
2010-10-20 14:59:55 +02:00
maxwell
e7f764ffeb
attack vector where you take posts from valid (unknown) diaspora people is now fixed
2010-10-20 00:42:33 -07:00
Raphael
d3d0182164
Put database cleaner back in
2010-10-19 23:29:59 -07:00
Raphael
d98ac70155
Clean up some repetition in specs
2010-10-19 23:29:59 -07:00
Raphael
197bd8eb49
make user/receive spec less repetitive
2010-10-19 23:29:59 -07:00
Raphael
74ec629b01
user_friending_spec passes again
2010-10-19 23:29:59 -07:00
Raphael
52f7350f78
Fix a couple more specs
2010-10-19 23:29:59 -07:00
Raphael
43dd95147e
Starting to remove database-cleaner
2010-10-19 23:29:58 -07:00
Sarah Mei
b007ba1487
Fixed cucumber features. Backfilled tests for AspectsController#create.
2010-10-19 22:57:55 -07:00
Sarah Mei
81ef7386b3
validation errors in profile and person bubble up to user.
2010-10-19 22:33:12 -07:00
Joseph Method
4b588ccefb
Addresses [ #380 ] and [ #239 ] by handling the errors from bad identities
2010-10-19 23:44:43 -04:00
ilya
e3ffd2ffe7
Merge branch 'master' of github.com:diaspora/diaspora
2010-10-19 18:26:06 -07:00
ilya
b31b2de6f5
MS IZ aspect add and delete for a person
2010-10-19 18:25:59 -07:00
Raphael
360891496e
Check that time serializes correctly post-parse, not on string equality
2010-10-19 17:09:52 -07:00
Raphael
3557d66749
Merge branch 'master' of github.com:diaspora/diaspora
2010-10-19 16:07:03 -07:00
Raphael
9309be2d69
Merge branch 'import'
...
Conflicts:
spec/models/user/invite_spec.rb
2010-10-19 16:06:48 -07:00
ilya
24b136bbd9
Merge branch 'master' of github.com:diaspora/diaspora
2010-10-19 15:42:51 -07:00
ilya
4e9e716783
another attack vector spec
2010-10-19 15:42:40 -07:00
Raphael
2c66bbbe00
Strip profile names, resolve 357
2010-10-19 13:51:31 -07:00
Raphael
962f282cbc
Validate uniqueness of aspect name, 359
2010-10-19 12:23:24 -07:00
Raphael
fce902821b
Remove downcasing of diaspora_handle, verify that diaspora_handle querying and validation is case insensitive.
2010-10-19 11:06:43 -07:00
Raphael
2893c3766b
Delete em-webfinger file from other branch
2010-10-19 10:09:04 -07:00
maxwell
8ada8414c7
username can be any case, but diaspora handle should always, always, ALWAYS be lowercase, for webfinger reasons
2010-10-18 22:55:09 -07:00
ilya
d642928268
invite sends friend request if already friends, and raises if already friends
2010-10-18 16:27:02 -07:00
ilya
a8bf082e35
The invitation now has an optional personal message
2010-10-18 14:35:41 -07:00
Raphael
f90d38bb9c
Merge branch 'master' of http://github.com/tristil/diaspora into tristil-merge
2010-10-18 12:00:20 -07:00
Raphael
3436371a96
Merge remote branch 'archi/332-quickfix'
2010-10-18 11:44:47 -07:00
ilya
4fbe933158
removed pending
2010-10-18 10:57:22 -07:00
ilya
17bd9710dc
invitation tests we're evaluating before stubbing
2010-10-18 10:38:59 -07:00
ilya
e648042b15
the user destroy now deletes the aspects
2010-10-18 10:26:45 -07:00
archi
5e97fd3b52
Merge branch 'master' of git://github.com/diaspora/diaspora into 332-quickfix
2010-10-18 11:06:42 +02:00
danielvincent
1139299f42
removed loop and hidden checkboxes from publisher. hidden field passes single aspect id or :all to controller
2010-10-17 20:47:51 -07:00
Joseph Method
e3e4a6b319
Continuation of previous commit
2010-10-17 19:07:54 -04:00
Joseph Method
b58b6d380b
Controller and module specs and code to prevent a fatal error when you try to befriend yourself
2010-10-17 19:05:19 -04:00
archi
2f7bc02712
Some specs for the make_links function.
...
Can i haz youtubeZ? :P
2010-10-17 22:25:56 +02:00
archi
baa0b43655
Merge branch 'master' of git://github.com/diaspora/diaspora into 332-quickfix
2010-10-17 21:19:27 +02:00
Sarah Mei
fcdcf88a79
Person.by_webfinger preserves case of identifier. Backfill specs for PublicsController#webfinger.
2010-10-17 12:18:53 -07:00
archi
1d9aa4c43d
Modified spec (doesn't check Youtube handling due to disabled net::http)
2010-10-17 21:07:49 +02:00
Sarah Mei
50f9e8f240
Reorganize User model. Preserve case of username.
2010-10-16 23:58:01 -07:00
Sarah Mei
f688653936
disallow whitespace in username
2010-10-16 23:34:58 -07:00
Sarah Mei
798d904e7e
strip username on create
2010-10-16 23:27:18 -07:00
Sarah Mei
d25847a626
Error message for duplicate email; add email validation spec.
2010-10-16 22:46:13 -07:00
Sarah Mei
83b23a0ffe
Error message for duplicate username; refactor User validation specs.
2010-10-16 22:36:26 -07:00
Sarah Mei
d3a62c7a45
RegistrationsController#create deals with validation errors. Username, email, password now required on sign-up.
2010-10-16 22:02:51 -07:00
Sarah Mei
1b6726354f
Backfill specs for RegistrationsController#create.
...
Remove RegistrationsController#new (which just called super, so it's not necessary).
2010-10-16 21:14:37 -07:00
Sarah Mei
21d213059c
Found the magic incantation for devise controller specs.
2010-10-16 20:14:14 -07:00
Sarah Mei
2ae05f39cd
Rails.root isn't always defined when you get to the top of a spec file
2010-10-16 20:05:05 -07:00
archi
e1d5f86f7e
Here we go again - fixed sepcs
2010-10-17 02:58:19 +02:00
archi
75d372c737
Fixed the name of the status_message_helper spec
2010-10-17 02:43:34 +02:00
archi
482b2f5ffb
Added Links to posts
2010-10-17 02:05:59 +02:00
maxwell
4d3da589df
make the invite test pending until it doesnt take 300 seconds to run
2010-10-16 11:30:14 -07:00
maxwell
27bbbafe04
updated the hcard fixture, because the old one is not actually representive of what we are using
2010-10-16 11:16:33 -07:00
ilya
6a4b21753e
removed the random duplicated line
2010-10-15 17:28:11 -07:00
ilya
d4702aefa3
Merge branch 'master' of github.com:diaspora/diaspora
2010-10-15 17:20:19 -07:00
ilya
9727b356e1
the invitations add requests which are now correctly auto accepted
2010-10-15 17:20:04 -07:00
maxwell
f83bddadc5
forgot to add the test; and cleaned up the explain partial
2010-10-15 16:19:07 -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
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
maxwell
11925ded2b
moving branches
2010-10-14 19:15:32 -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
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
Raphael
d66c1e70bc
Merge remote branch 'bigbash/280-bug-fix'
2010-10-14 13:21:50 -07:00
Sarah Mei
007b06c8ea
Stub ::Devise.mailer for great justice. And/or fewer strange arity errors.
2010-10-14 00:26:07 -07:00
maxwell
adbc4dddbc
added pending spec for aspect removal on account deletion
2010-10-14 00:12:00 -07:00
maxwell
f2bdc98b47
Merge branch 'master' of github.com:diaspora/diaspora into import
2010-10-13 23:52:46 -07:00
maxwell
e1dd0cf6be
Fixed pending people_controller spec; cleaned up person.search(this is ruby :D ); fyi, calling should_receive stubs that method, hence this test confusion
2010-10-13 23:49:13 -07:00
maxwell
6ef1780008
removing pointless pending spec
2010-10-13 23:20:25 -07:00
maxwell
e218ab6780
Merge branch 'master' of github.com:diaspora/diaspora into import
...
Conflicts:
app/controllers/users_controller.rb
2010-10-13 23:09:48 -07:00
ilya
d0c6f12ea8
added another attack vector spec
2010-10-13 18:43:22 -07:00
maxwell
04f6cdaacf
MS DG; basic view support; it works, but it is ugly
2010-10-13 18:42:24 -07:00
maxwell
a86d965079
DG MS; importer now takes params for username, password, and diaspora handle
2010-10-13 17:07:16 -07:00
maxwell
f04934cbae
DG MS; ensure aspect post_ids are only for user
2010-10-13 16:54:18 -07:00
ilya
f82f241932
Merge branch 'master' of github.com:diaspora/diaspora
2010-10-13 16:53:17 -07:00
ilya
36b9f66f60
the invited user keeps track of who invited them, limit on invites,
...
removed the invites controller test
2010-10-13 16:52:33 -07:00
maxwell
b395208a51
DG MS; added more stuff to importer.
2010-10-13 16:42:27 -07:00
Raphael
3fb2ee6e1b
adding spec for password confirmation fail
2010-10-13 16:28:56 -07:00
maxwell
2c40fa5ebf
DG MS; spec for clean_aspects
2010-10-13 13:32:22 -07:00
ilya
3b8998ab71
Invitations contains the inviters
2010-10-13 13:29:45 -07:00
maxwell
637a79a99d
DG MS; spec for clean_aspects
2010-10-13 13:28:10 -07:00
maxwell
55227f3f72
DG MS; filter_post method, aspect_clean method
2010-10-13 13:10:08 -07:00
Shawn McGuire
5c26b895f2
Fixed trailing whitespace bug
2010-10-13 14:39:04 -05:00
Shawn McGuire
711dcdc5f4
Issue #280 Fixed trailing whitespace error
2010-10-13 14:36:03 -05:00
danielvincent
0315869a24
all specs should pass again after merge
2010-10-13 09:43:58 -07:00
danielvincent
59c3be41b3
Merge branch 'master' of github.com:diaspora/diaspora into import
2010-10-13 09:21:27 -07:00
ilya
add350ce16
Merge branch 'master' of github.com:diaspora/diaspora
2010-10-13 00:19:29 -07:00
Sarah Mei
56c6688c81
Take out reloads so specs run on 1.9.2
2010-10-12 20:54:00 -07:00
danielvincent
7ea3fe5bf1
MS DG; verifys implemented, but need more tests
2010-10-12 18:53:12 -07:00
ilya
324f14c719
setting the token to nil on accept of invite
2010-10-12 18:23:59 -07:00
danielvincent
92e5622247
DG MS; adding verification methods to importer.
2010-10-12 17:41:09 -07:00
danielvincent
8915eca3d5
DG MS; testing that posts actually get serialized into an array.
2010-10-12 15:39:52 -07:00
danielvincent
8720dfa950
DG MS; made test slower. posts now export correctly.
2010-10-12 15:33:08 -07:00
ilya
0896052b80
remote comment spec, which passed surprisingly, the comment contains the person
2010-10-12 15:31:54 -07:00
danielvincent
1d1ff7e330
Merge branch 'master' of github.com:diaspora/diaspora into import
2010-10-12 11:34:31 -07:00
danielvincent
2e8bba1a04
MS DG adding more to exporter and importer
2010-10-12 11:34:13 -07:00
ilya
a068ee532d
almost all green
2010-10-12 11:17:29 -07:00
Raphael
19b5fb0b84
Delete instead of destroy to simulate a remote user
2010-10-12 10:55:19 -07:00
ilya
a955dd308e
user_friending_spec green, did a slight refactor need more
2010-10-12 10:25:43 -07:00
ilya
ee2d134cb0
receiving spec is green
2010-10-11 19:20:00 -07:00
danielvincent
948c5d9b02
DG MS; end of day.
2010-10-11 19:04:27 -07:00
ilya
03df0ff716
parser spec is green
2010-10-11 18:22:19 -07:00
danielvincent
b2f3074eb0
DG MS; scenario for importer spec
2010-10-11 17:00:42 -07:00
ilya
bb7e2a9918
Merge branch 'master' of github.com:diaspora/diaspora
2010-10-11 14:58:22 -07:00
ilya
007f6cfb6f
close account
2010-10-11 14:58:11 -07:00
danielvincent
9bfb213465
Merge branch 'invites' of github.com:diaspora/diaspora into invites
2010-10-11 11:52:57 -07:00
Raphael
73e4d2b25b
Pull in search improvement, remove cruft
2010-10-11 11:08:54 -07:00
Raphael
bd6a8a85e2
Add spec for full name searching
2010-10-11 10:46:40 -07:00
Raphael
8cf72441b4
Make intended behavior on hcard action clearer, return 404 on nonexistent person
2010-10-11 10:13:52 -07:00
Raphael
c30155e9a1
Remove outdated photo spec
2010-10-10 15:04:57 -07:00
Sarah Mei
2a24de2ba7
Changing spec to pending because it hasn't been implemented yet
2010-10-10 13:29:03 -07:00
maxwell
fd0902abb4
Merge branch 'master' of github.com:diaspora/diaspora
2010-10-10 11:54:16 -07:00
maxwell
0541833c18
stop the file include madness. using File.join and Rails.root for includes everywhere I could
2010-10-10 11:54:08 -07:00
Sarah Mei
ac85fbcc64
DevUtilitiesControllerSpec runs under 1.9.2.
...
FileUtils.mv with the :force option works under 1.8.7 if the source file doesn't exist, but fails under 1.9.2.
2010-10-10 11:52:19 -07:00
ilya
1ac410b590
Merge branch 'master' of github.com:diaspora/diaspora
2010-10-09 21:44:26 -07:00
ilya
3887712115
slight refactor of receiving spec, wrote a spec that exposed malicious friend attack
...
vector
2010-10-09 21:34:53 -07:00
Sarah Mei
4da2f9cf58
Fix pending spec in SocketsControllerSpec
2010-10-09 21:58:46 -06:00
ilya
ef3e627bed
the users are now made with people
2010-10-08 15:40:42 -07:00
Raphael
6064b2e022
Add a spec, move another to posting
2010-10-08 14:37:22 -07:00
danielvincent
154ec95717
killed the public tab. made a broadcast button in everyone tab
2010-10-08 14:06:49 -07:00
danielvincent
b70cf713ec
removed old pending spec
2010-10-08 09:16:11 -07:00
Sarah Mei
4a88ac22c2
Merge branch 'master' of github.com:diaspora/diaspora
2010-10-08 02:15:17 -06:00
Sarah Mei
899d82b766
Fix 1 of 2 pending photo specs.
2010-10-08 02:15:07 -06:00
danielvincent
4bb26cfce4
Merge branch 'master' of github.com:diaspora/diaspora
2010-10-08 00:46:41 -07:00
danielvincent
fab9e8b6eb
cleaned request spec
2010-10-08 00:46:24 -07:00
Sarah Mei
ce9aa3600d
Refactor user friending spec
2010-10-08 01:42:48 -06:00
Sarah Mei
511cd8fa1c
Clean up reloading in user friending spec.
2010-10-08 01:23:33 -06:00
Raphael
3632143959
Take out pending on spec that exposes issue 150
2010-10-07 17:54:26 -07:00
Raphael
1d463d22a1
Person show for a nonexistent person now redirects to people index page, rather than giving a 500
2010-10-07 16:50:19 -07:00
Raphael
1fd3aeabd9
Add or later to license notice
2010-10-07 16:25:34 -07:00
danielvincent
0ebb597b72
DG MS; test for users#export
2010-10-07 15:22:03 -07:00
Sarah Mei
b63fb5d7a6
Merge branch 'master' of github.com:diaspora/diaspora
2010-10-07 15:27:18 -06:00
Sarah Mei
4dba2d7c35
Fix failing spec. Backfill spec for DevUtilitiesController#set_backer_number.
2010-10-07 15:27:04 -06:00
danielvincent
7a3d168123
Merge branch 'master' of github.com:diaspora/diaspora
2010-10-07 14:17:22 -07:00
Raphael
d7bbb66d27
Run whitespace:cleanup
2010-10-07 10:47:37 -07:00
maxwell
ec4c63ada7
Merge branch 'master' of github.com:diaspora/diaspora
2010-10-05 17:51:10 -07:00
maxwell
d638bdb018
MS IZ password change field is now in edit profile
2010-10-05 17:49:06 -07:00
Stoyan Gaydarov
dbacff250a
added extra user spec
2010-10-06 08:27:25 +08:00
Stoyan Gaydarov
9eb8fe0c5a
use the correct pod url in the user spec
2010-10-06 08:27:25 +08:00
danielvincent
f3c34692d8
pubsub support
2010-10-05 13:39:56 -07:00
ilya
7b690f5dcb
slight publics controller spec refactor
2010-10-02 13:20:23 -07:00
ilya
f9cecd9d89
specs are green
2010-10-02 13:03:11 -07:00
ilya
7dcde292e1
user posting spec is now green, now stubbing on the apropriate method
2010-10-02 12:34:16 -07:00
ilya
b6a912dd02
slowly getting specs to pass on with the new api
2010-09-30 15:17:53 -07:00
ilya
e9521d7144
tiny commit to switch branches
2010-09-29 12:15:54 -07:00
ilya
46bf0cfd99
roundtrip done, just need to clean and move to the new api
2010-09-28 15:11:01 -07:00
ilya
c7d29b29c8
the salmon now encrypts the activity, and stores the aes key in the header
2010-09-28 13:22:19 -07:00
ilya
6eede48f9f
started to refactor the salmon spec, changed data in to be parsed data
...
to be more clear
2010-09-28 12:39:55 -07:00
danielvincent
eac6b8a63b
builder is now a class initialized with a user. added director class.
2010-09-27 21:54:01 -07:00
danielvincent
58b688aa68
fixed builder spec
2010-09-27 21:28:21 -07:00
danielvincent
eb7244e07c
Merge branch 'master' of github.com:diaspora/diaspora
2010-09-27 19:07:01 -07:00
ilya
1225291fc2
Merge branch 'master' of github.com:diaspora/diaspora
2010-09-27 19:01:25 -07:00
danielvincent
26a4dc76a6
Merge branch 'master' of github.com:diaspora/diaspora
2010-09-27 18:34:55 -07:00
danielvincent
3b8ddf76a3
temp route for atom feed. also, public atom currently displays all posts.
2010-09-27 18:34:47 -07:00
ilya
7852c346f2
mode the visible posts api more general and moved to it on the public controller
2010-09-27 18:31:37 -07:00
Raphael
6100b318e4
More accurately describe a spec
2010-09-27 18:12:55 -07:00
danielvincent
df800dc87e
ostatus builder
2010-09-27 17:58:44 -07:00
ilya
6e407572c4
removed unused repost method, going through the warden object
2010-09-27 17:27:49 -07:00
Raphael
591347a77a
Merge branch 'master' of github.com:diaspora/diaspora
2010-09-27 16:54:18 -07:00
Raphael
e9f433e12f
Add spec for not overwriting the image_url on profile update
2010-09-27 16:54:08 -07:00
ilya
08b9aa864a
Merge branch 'master' of github.com:diaspora/diaspora into fb
...
Conflicts:
app/views/layouts/application.html.haml
app/views/shared/_publisher.haml
app/views/shared/_sub_header.haml
app/views/users/edit.html.haml
config/deploy_config.yml
config/routes.rb
2010-09-27 15:39:50 -07:00
ilya
8f55852ea9
Merge branch 'master' of github.com:diaspora/diaspora
2010-09-27 15:30:27 -07:00
michael.scheffler
2c55e70067
Replaced hardcoded '@example.com' with APP_CONFIG[:terse_pod_url]
2010-09-28 02:50:56 +08:00
Raphael
1ab536bf04
Merge branch 'master' of http://github.com/sarahmei/diaspora
2010-09-27 11:09:14 -07:00
ilya
98bc2df841
removed the encryption key= method, and user with private key factory
2010-09-27 10:10:54 -07:00
ilya
cf0df90dae
moved the private key into user where it belongs, two failing cucumber tests
2010-09-26 22:08:42 -07:00
Sarah Mei
68a8ecb05f
Merge branch 'master' of github.com:diaspora/diaspora
2010-09-26 13:08:56 -07:00
Sarah Mei
5d1afe21be
Refactor user specs to speed up spec runs.
2010-09-26 13:08:30 -07:00
Sarah Mei
0ec074be6d
Remove annoying deprecation warning from spec runs
...
Add spec for validation hook
2010-09-26 10:00:29 -07:00
Dorian
6ffc03a4c9
Big clean up: delete trailing whitespace
2010-09-26 12:48:40 -04:00
Sarah Mei
64e1912c37
Disabled image resizing in specs => 15% faster test suite. FTW
2010-09-26 00:40:40 -07:00
Sarah Mei
17757a2e2d
Merging upstream changes
2010-09-25 15:57:59 -07:00
Stephen Caudill
72cefc6265
Move relationship_flow spec to its helper spec
2010-09-25 13:18:46 -04:00
Stephen Caudill
8c6dff35c0
Remove unnecessary includes
2010-09-25 13:11:44 -04:00
Stephen Caudill
536cea5e44
Remove consecutive empty lines
2010-09-25 12:06:39 -04:00
Stephen Caudill
821643deb9
Use the new style of spec_helper require
2010-09-25 11:27:59 -04:00
Sarah Mei
e3ec00595d
Cleaned up file path joining in some of the dev utilties.
...
Backfilled tests where necessary to make sure changes didn't break existing code.
2010-09-25 04:34:48 -07:00
ilya
e414558f79
passing the right things to the partial
2010-09-24 15:52:29 -07:00
Raphael
ae7c869bc3
Add specs for album controller failure
2010-09-24 15:01:36 -07:00
ilya
bb58678556
added a fb_status model & parser method
2010-09-24 14:41:31 -07:00
Raphael
950c6a7cab
Merge branch '1.9.2' into HEAD
...
Conflicts:
app/models/photo.rb
2010-09-24 14:36:00 -07:00
Raphael
19199dabfe
fix spec_helper for 1.9.2
2010-09-24 11:49:30 -07:00
Raphael
ed6df7d1bf
Delete user.terse_url
2010-09-23 10:24:10 -07:00
Steve Conover
5edd054ac7
MS Use class_eval because of some sort of load ordering issue
2010-09-22 22:22:18 -07:00
danielvincent
e9d16cc09b
DG IZ; cleanup
2010-09-22 15:48:50 -07:00
danielvincent
6dd7911c8c
DG IZ; update_or_repost
2010-09-22 10:52:29 -07:00
danielvincent
4c0dc58458
spec cleanup
2010-09-21 20:02:37 -07:00
danielvincent
4a3bfea1ba
DG MS; cleaned spec
2010-09-21 17:43:46 -07:00
danielvincent
03638ee68e
Merge branch 'master' of github.com:diaspora/diaspora
2010-09-21 16:35:25 -07:00
danielvincent
107c05ef6f
DG MS; validate_aspect_permissions broken out of post method
2010-09-21 16:35:18 -07:00
ilya
394bf1acb5
Merge branch 'master' of github.com:diaspora/diaspora
...
Conflicts:
app/models/user.rb
spec/models/user_spec.rb
2010-09-21 16:15:01 -07:00
ilya
efd901dcd9
RS, IZ; Pod url moved to app_config.yml, app_config.yml refactored, diaspora_handle now set based on APP_CONFIG
2010-09-21 15:46:57 -07:00
danielvincent
44db21ffd4
DG MS; cleaned up spec
2010-09-21 15:41:29 -07:00
Raphael
50414fef40
Remove unused method from message handler
2010-09-21 11:03:21 -07:00
Raphael
8dd11c0c95
Add a couple specs to friending
2010-09-20 16:41:03 -07:00
danielvincent
5bb4ee5d36
DG IZ; posting now ensures aspect ownership.
2010-09-20 15:15:37 -07:00
danielvincent
af9cda52af
DG IZ; always query through the current_user in the controllers.
2010-09-20 13:18:11 -07:00
Michael Sofaer
27c00bae90
MJS RJS Fix initialization of album test
2010-09-19 18:12:42 -07:00
Raphael
60e29f6572
Magent should use the same settings as mongomapper, app config should load first, websocket spec is a little better.
2010-09-19 16:37:34 -07:00
danielvincent
08f833ba7a
case insensitivity on search
2010-09-18 17:21:18 -07:00
Stephen Caudill
81d753e773
Refactor Album spec
...
* use let(!) where appropriate (see [1] for more info).
* use `context` to portray scenarios
* use `describe` to portray method and Class specifications
* omit the word "should" from example descriptions (Dave Chelimsky
remarked to me that it was "tantamount to line-noise" and I'm of the
opinion that it adds no value.
* use more idiomatic Ruby (prefer things like 2.times to 1.upto(2))
* use more idiomatic Rails (prefer 1.minute.from_now to Time.now +
60*60)
* use more idiomatic Rspec (prefer album.should be_valid to
album.valid?.should be_true
* also ensure to only make one assertion per example
Other sundry cleanups.
[1] http://rdoc.info/github/rspec/rspec-core/master/RSpec/Core/Let/ClassMethods#let-instance_method
2010-09-17 16:41:58 -04:00
Raphael
71ac61c01d
Fix websocket specs
2010-09-17 12:49:05 -07:00
Raphael
ce2260b747
Merge branch 'master' of github.com:diaspora/diaspora into production
2010-09-17 11:57:36 -07:00
Raphael
99ad001d28
Fix websocket spec, take out puts in by_webfinger
2010-09-17 09:52:31 -07:00
Raphael
2e8ecceaf7
Merge branch 'master' of github.com:diaspora/diaspora into production
2010-09-16 21:53:34 -07:00
Raphael
7c02200a67
Finish moving out websocket server, add task to start it
2010-09-16 21:42:16 -07:00
danielvincent
25b4b409be
Merge branch 'master' of github.com:diaspora/diaspora into production
2010-09-16 16:19:48 -07:00
danielvincent
cbb692b6a3
Merge branch 'master' of github.com:diaspora/diaspora
2010-09-16 16:06:28 -07:00
danielvincent
0c7ba49e34
DG IZ; aspect deletion
2010-09-16 16:03:18 -07:00
Federico Brubacher
05808456d8
fixed small issue in albums#update anad added corressponding controller test
2010-09-16 12:21:08 -03:00
Raphael
1e646fb0a9
Merge branch 'master' of github.com:diaspora/diaspora into production
2010-09-15 23:54:57 -07:00
Raphael
d760725145
Don't webfinger another server on receiving a webfinger request
2010-09-15 23:01:13 -07:00
Raphael
c67a8ea100
Merge branch 'master' of github.com:diaspora/diaspora into production
...
Conflicts:
config/deploy.rb
config/environments/production.rb
spec/models/request_spec.rb
2010-09-15 22:37:05 -07:00
Jamie Wilkinson
fbdd50172d
Cleanup stray whitespace
2010-09-16 10:07:59 +08:00
Raphael
de93fd2818
Merge branch 'master' of github.com:diaspora/diaspora into production
2010-09-15 18:10:13 -07:00
Raphael
708e9f88a5
Spell our own name right
2010-09-15 17:56:18 -07:00
Raphael
33048fe6db
Merge branch 'master' of github.com:diaspora/diaspora into production
...
Conflicts:
app/models/user.rb
spec/models/aspect_spec.rb
2010-09-15 17:24:00 -07:00
Raphael
01d26f6d0e
Using custom registrations controller
2010-09-15 17:05:21 -07:00
Daniel Vincent Grippi
ee89bfaf8f
removed do bad things
2010-09-15 16:18:33 -07:00
maxwell
8828707c45
MS fixed the login bug, deploying to master
2010-09-15 15:15:15 -07:00
maxwell
c57f6b2d9a
fixing merge
2010-09-15 13:29:39 -07:00
maxwell
84c60e5f2e
DG MS fixing webfinger, i hope to goodness
2010-09-15 13:28:06 -07:00
Daniel Vincent Grippi
a925c14310
fixing webfinger/salmon
2010-09-15 12:35:23 -07:00
Raphael
1006e8a680
Merge branch 'master' of github.com:diaspora/diaspora into production
2010-09-15 11:01:11 -07:00
Raphael
aa3ebe372c
License notices replaced
2010-09-15 10:58:48 -07:00
Daniel Vincent Grippi
8647220328
Merge branch 'master' of github.com:diaspora/diaspora into production
2010-09-14 20:44:47 -07:00
ilya
0560b46080
MS IZ added friend redirect, and moved the webfinger responces to fixture directory
2010-09-14 11:58:40 -07:00
Daniel Vincent Grippi
3a468a9f1b
Merge branch 'master' of github.com:diaspora/diaspora into production
2010-09-14 11:45:33 -07:00
Daniel Vincent Grippi
426d038aaf
Remove email based filter
2010-09-14 11:22:32 -07:00
Daniel Vincent Grippi
7643fb4125
remember that aspects are seeded
2010-09-14 11:15:10 -07:00
ilya
2311c33626
MS IZ mocked all the webrequest tests
2010-09-14 11:13:58 -07:00
Daniel Vincent Grippi
c1a9a89be7
Merge branch 'production' of github.com:diaspora/diaspora into production
...
Conflicts:
app/models/user.rb
config/deploy.rb
spec/factories.rb
spec/models/request_spec.rb
spec/spec_helper.rb
2010-09-14 11:08:18 -07:00
Daniel Vincent Grippi
b2b60af8aa
Albums_by_aspect now takes :all
2010-09-13 17:32:29 -07:00
Daniel Vincent Grippi
1b92bcd17c
Add albums_by_aspect method to user
2010-09-13 17:26:24 -07:00
Daniel Vincent Grippi
84b29770fe
Put raise back in webfinger fail
2010-09-13 16:05:43 -07:00
Daniel Vincent Grippi
40ecf176e8
Merge branch 'master' of github.com:diaspora/diaspora
2010-09-13 14:26:15 -07:00
Daniel Vincent Grippi
4c15b1a01c
added license to every single goddamn file. also, put one in the root dir.
2010-09-13 14:23:50 -07:00
Raphael
b05d106aed
Remove user_refs from Person, put pendings in the broken photo specs
2010-09-13 12:16:43 -07:00
Raphael
9837340eb2
Rename files from group to aspect
2010-09-13 10:43:15 -07:00
Raphael
44a1f82da9
Rename group to aspect
2010-09-13 10:38:38 -07:00
Raphael
4922ebd84c
Finish removing encryption from retractions
2010-09-10 16:14:37 -07:00
Raphael
a44d40168a
Encryption removed from everything other than comments, most irrelevant specs removed
2010-09-10 16:04:09 -07:00
Raphael
aa1f3c6438
Comments now use salmon, the whole salmon is encrypted, user querying moved to lib file
2010-09-10 10:31:23 -07:00
Raphael
68dc74e0b7
Tests pass again, use id => in retraction.perform
2010-09-09 18:15:30 -07:00
Raphael
86d9a41d25
send_friend_request_to now takes a person and group, rather than a receive url and a group id
2010-09-09 16:06:42 -07:00
Raphael
fd61535e11
Hcards working
2010-09-09 15:43:16 -07:00
Raphael
67f9d9dab5
Add hcard, add id for pod_location
2010-09-09 15:34:20 -07:00
Raphael
59006e657f
Hcard done manually
2010-09-09 15:15:37 -07:00
Raphael
c6aff4a562
making the hcard work
2010-09-09 13:02:59 -07:00
Raphael
240dda4eab
Salmon for posts is in, old cruft has not been taken out and requests and comments are unfinished
2010-09-09 12:21:36 -07:00
Raphael
4fd0853e71
Moving to salmon
2010-09-08 18:29:39 -07:00
Raphael
960d40278c
Add username, login with username or email
2010-09-08 10:59:08 -07:00
Daniel Grippi & Raphael Sofaer
7984756aa7
controller cleanup: using respond_to and respond_with.
2010-08-29 22:49:13 -07:00
Raphael
5ef442d93f
RS, IZ; Socket spec now more realistic, visible_person_by_id fixed
2010-08-27 10:48:14 -07:00
Raphael
831609ad15
Make a stranger that you receive a comment from visible
2010-08-27 10:19:10 -07:00
Raphael
c629c23232
Tests now pass, export_key changed to exported_key, profile.person changed to _parent_document
2010-08-27 10:05:14 -07:00
Raphael
2dd2f38442
Attempting to make comments from unknown users save
2010-08-26 19:15:22 -07:00
Raphael
3ed191e972
MS IZ testing on remote
2010-08-26 16:27:01 -07:00
Raphael
94bb754c34
Changed parseing person from xml a little, using it for comments.
2010-08-26 15:06:39 -07:00
Raphael
a29a1bec3e
Add some logging to comments
2010-08-26 11:07:26 -07:00
maxwell
a26229223c
Merge branch 'master' of github.com:diaspora/diaspora
2010-08-25 18:07:49 -07:00
Raphael
00f8a3e628
removed ensure_bson in user. added to_id method to String and ObjectID classes
2010-08-25 17:11:57 -07:00
maxwell
22f63a4c44
MS IZ added the move friend method
2010-08-25 16:58:07 -07:00
Raphael
55c94c385c
fixed photos going through the websocket. added a spec to SocketsController
2010-08-25 16:08:44 -07:00
Raphael
41aa8ed10e
Specs pass again, need to make albums have a group
2010-08-24 17:12:27 -07:00
Raphael
c102e81b03
put the visible back in
2010-08-24 16:56:04 -07:00
maxwell
68bd5bf5f5
MS merging in master again
2010-08-24 16:21:20 -07:00
Raphael
abafa03e92
Spec for posting to no group
2010-08-24 15:48:51 -07:00
Raphael
72c41a5ff8
User post now requires a :to field
2010-08-24 15:42:24 -07:00
maxwell
f5316fb3c1
Merge branch 'master' of github.com:diaspora/diaspora into production
2010-08-24 14:45:04 -07:00
maxwell
4f63f60b03
MS merging, and added a dumb check for the email validating twice
2010-08-24 14:03:57 -07:00
maxwell
2c9a1e3a43
added wall spec
2010-08-24 13:47:58 -07:00
Raphael
d1c540439e
Moved friending out to a lib file, specs all pass
2010-08-24 12:13:10 -07:00
maxwell
f172c9e1d2
Merge branch 'master' of github.com:diaspora/diaspora
2010-08-23 18:45:31 -07:00
maxwell
a37b5ae09b
IZ MS; added a basic salmon library to help with directed messages, and made an keyhash method
2010-08-23 18:45:20 -07:00
Raphael
511f571ae5
Specs mostly pass again
2010-08-23 15:01:39 -07:00
Raphael
76f2aa98ac
Push to multiple groups
2010-08-23 14:45:13 -07:00
Raphael
364cdfed22
Allowed email checking no longer so ridiculous
2010-08-23 10:20:19 -07:00
Raphael
a23df47dbc
Trying to merge in the pivots changes that we want in master
2010-08-18 21:10:42 -07:00
Raphael
701bec670f
Merge branch 'master' of github.com:diaspora/diaspora into pivots
...
Conflicts:
app/views/groups/index.html.haml
config/deploy_config.yml
2010-08-18 20:50:28 -07:00
ilya
5cae2b21b1
RS, IZ fixed the url for the image
2010-08-18 18:06:13 -07:00
ilya
76b4b55e98
Added spec for remote photo url setting to photos
2010-08-18 17:39:38 -07:00
Raphael
5a2b42e4e5
Merge branch 'master' of github.com:diaspora/diaspora
2010-08-18 16:37:12 -07:00
Raphael
7ed31ab96a
Moving to file store
2010-08-18 16:37:05 -07:00
ilya
21f70c643d
DG IZ; moved update_profile from Person into User. removed notify_people methods. temporarily broke album pushing
2010-08-18 16:15:10 -07:00
Raphael
39c96bfd04
Changing to a smaller pic in the tests
2010-08-18 16:00:06 -07:00
ilya
1ab21fe8b1
Merge branch 'master' of github.com:diaspora/diaspora
2010-08-18 15:25:23 -07:00
ilya
08739ad23d
DG IZ; retractions remove post references in group objects
2010-08-18 15:23:46 -07:00
Raphael
61c906a9d3
Merge branch 'master' of github.com:diaspora/diaspora_rails into pivots
...
Conflicts:
app/models/user.rb
app/views/groups/index.html.haml
config/deploy_config.yml
2010-08-18 14:45:41 -07:00
Raphael
f570199d17
Add a couple specs to groups, moved socketing into each block, unclear where or why groups are being created wrongly
2010-08-18 14:30:16 -07:00
ilya
034755368b
Merge branch 'master' of github.com:diaspora/diaspora_rails
2010-08-18 12:17:23 -07:00
Raphael
10aef7a0a3
Begin rescue on publics controller to make the post for nonexistent user error more readable
2010-08-18 11:46:28 -07:00
ilya
4d86933f4a
DG IZ; user's visible posts method queries group objects for their posts
2010-08-18 11:40:02 -07:00
ilya
055c222fc2
DG IZ; using group_id instead of group in post method. passing in :group_id into publisher partial
2010-08-18 10:53:43 -07:00
ilya
b0088c73d8
DG IZ; user's own post gets referenced in group model
2010-08-18 10:37:33 -07:00
Raphael
b99a86e6bd
Merge branch 'master' of github.com:diaspora/diaspora_rails into pivots
...
Conflicts:
app/models/user.rb
2010-08-18 10:10:20 -07:00
Raphael
539316a235
Removing posts relation from person
2010-08-17 23:50:07 -07:00
ilya
501bcdd197
Merge branch 'master' of github.com:diaspora/diaspora_rails into pivots
2010-08-17 23:25:33 -07:00
Raphael
4a4686ce6e
refactored signature validation got specs passing
2010-08-17 23:21:00 -07:00
ilya
55b4d4758f
Merge branch 'master' of github.com:diaspora/diaspora_rails into pivots
...
Conflicts:
app/models/user.rb
spec/models/user_spec.rb
2010-08-17 22:58:46 -07:00
Raphael
7c75a54d90
Merge branch 'master' of github.com:diaspora/diaspora_rails
2010-08-17 22:34:21 -07:00
Raphael
cb152ea3c3
Shortened user receive, moderated groups.first in the socketing
2010-08-17 22:34:01 -07:00
ilya
9ee10450c4
removing traces of bookmarks and blogs from specs
2010-08-17 22:32:13 -07:00
Raphael
55d84b3288
Broke up user spec, put user update back in routes
2010-08-17 22:03:45 -07:00
Raphael
9f9395bc9c
visible_person_by_id should check against self.person.id
2010-08-17 19:51:29 -07:00
Raphael
1d6e132a9f
Merge branch 'master' of github.com:diaspora/diaspora_rails into pivots
2010-08-17 13:07:26 -07:00
Raphael
842b321dfa
User email checking, routes working again
2010-08-17 13:02:42 -07:00
ilya
2a90e59f1e
DG IZ the group should view the posts for the group (and yourself) w
2010-08-17 12:22:14 -07:00
ilya
2af41a0ea9
DG IZ; posts_for :group method in User
2010-08-17 12:14:02 -07:00
ilya
0af6f7b0e5
Merge branch 'master' of github.com:diaspora/diaspora_rails
2010-08-17 10:48:47 -07:00
ilya
a9c9619a54
DG IZ; posting from a user includes adding to the many posts association in said user
2010-08-17 10:43:18 -07:00
Raphael
cba0f5477c
spec for by_webfinger... after the fact
2010-08-17 10:41:01 -07:00
ilya
5761d5db36
Merge branch 'master' of github.com:diaspora/diaspora_rails
2010-08-17 10:35:37 -07:00
ilya
dea6551374
DG IZ; moved post() into User from Person.
2010-08-17 10:35:25 -07:00
Raphael
e32315b6c6
Merge branch 'master' of github.com:diaspora/diaspora_rails
2010-08-17 10:25:11 -07:00
Raphael
2c1c5df281
Moved search specs, renamed method
2010-08-17 10:24:59 -07:00
danielvincent
7e5ace7cbc
minor cleanup in models
2010-08-16 22:44:22 -07:00
ilya
1d92d11841
DG IZ; user refs are incremented as well as decremented for Posts
2010-08-16 20:39:24 -07:00
ilya
74c70d9410
Merge branch 'master' of github.com:diaspora/diaspora_rails
...
Conflicts:
app/models/user.rb
spec/lib/diaspora_parser_spec.rb
2010-08-16 18:18:30 -07:00
ilya
b5594ad6bc
DG IZ; post user refs started (permissions)
2010-08-16 18:11:23 -07:00
Raphael
eae4053902
Encryption removed from callbacks, except retractions sort of. verification is in user.receive
2010-08-16 17:23:54 -07:00
Raphael
3ff4387cd8
Merge branch 'master' of github.com:diaspora/diaspora_rails
2010-08-16 16:22:55 -07:00
Raphael
ad07521e07
Made a few more tests pass
2010-08-16 16:22:46 -07:00
ilya
b3d8f59c77
removed many posts association within group model
2010-08-16 15:51:31 -07:00
Raphael
3a591b0713
Merging in friend-refactor...
2010-08-16 15:35:14 -07:00
Raphael
3efa36587a
Took out a bunch of user.owner references
2010-08-16 11:01:58 -07:00
danielvincent
f1f827120b
intentional failing test in user for tomorrow.
2010-08-15 21:03:19 -07:00
ilya
99c8869b8f
Removing a friend now deletes them from the group(s) they are in
2010-08-13 18:56:33 -07:00
ilya
ac40f7974e
RS, IZ; A variety of fixes and some refactoring on unfriending and activate friend
2010-08-13 18:37:09 -07:00
ilya
7bd1193c5e
RS, IZ; wrote and tested user retractions actually removing people from the friend lists on retractions
2010-08-13 11:19:20 -07:00
ilya
1fcb033b68
RS, IZ; receiving a request no longer overwrites the group it is destined for, specs pass
2010-08-13 10:55:18 -07:00
ilya
3d57fb7f78
Merge branch 'friend-refactor' of github.com:diaspora/diaspora_rails into friend-refactor
2010-08-13 09:47:29 -07:00
ilya
5e33de7e56
unfriended method in the user
2010-08-13 09:47:08 -07:00
danielvincent
3d12e9ab51
DG RS; friending through groups
2010-08-12 21:30:16 -07:00
ilya
283b4a40b5
IZ MS tests now pass
2010-08-11 17:51:46 -07:00
ilya
dd3fb1677b
MS IZ continuiung to squash failing tests
2010-08-11 17:44:43 -07:00
Raphael
0907d7a9fd
RS, DG; Cleaned up the switch in user.receive
2010-08-11 16:01:16 -07:00
Raphael
bee71c5a23
RS, DG; All saving moved to user
2010-08-11 15:22:06 -07:00
Raphael
c6a620c7dd
RS, DG; store_from_xml is gone, use user.receive
2010-08-11 15:05:05 -07:00
Raphael
5228e51262
RS, DG; store_from_xml now takes one objects. All talk of arrays and collections has been eliminated.
2010-08-11 14:40:48 -07:00
Raphael
11758beaf3
RS, DG; Removed <posts> from xml
2010-08-11 14:26:39 -07:00
Raphael
5abd604dad
RS, DG; build_xml_for has been eliminated.
2010-08-11 14:21:53 -07:00
Raphael
e94faf89bb
Finishing moving to dynamic build_xml_for
2010-08-11 14:05:57 -07:00
Raphael
d7828a8bf3
Merge branch 'friend-refactor' of github.com:diaspora/diaspora_rails into friend-refactor
...
Conflicts:
spec/controllers/publics_controller_spec.rb
2010-08-11 13:59:21 -07:00
Raphael
9c9ebbf4c7
build_xml_for is no longer static, we should probably change the name
2010-08-11 13:58:18 -07:00
ilya
29b1217fcd
Merge branch 'friend-refactor' of github.com:diaspora/diaspora_rails into friend-refactor
2010-08-11 12:29:35 -07:00
ilya
11a8b8f3d4
MS IZ testing many the friend request user methods
2010-08-11 12:28:48 -07:00
Raphael
144e9ed439
Bookmarks now clean link in instantiate, posting them should work right again
2010-08-11 11:18:40 -07:00
maxwell
8d986a207e
IZ MS; Socket test now passes
2010-08-10 17:50:17 -07:00
maxwell
a45d852f30
MS IZ request specs now PASS
2010-08-10 17:36:25 -07:00
Raphael
8b9cd3453d
RS, DG; User.instatntiate simplified
2010-08-10 15:44:14 -07:00
Raphael
a8b77cf868
DG RS; made an instantiate method for user which makes a person and profile
2010-08-10 15:35:27 -07:00
maxwell
0ffe893f8a
MS IZ merging diffs
2010-08-10 12:37:04 -07:00
maxwell
71612ba33d
changing some webfinger resources
2010-08-10 12:36:00 -07:00
Raphael
ac2f82c3d7
Renamed dashboards spec to groups
2010-08-10 12:28:36 -07:00
maxwell
95c4de5d6c
MS IZ fixed all of the request specs zomg
2010-08-10 11:26:32 -07:00
Raphael
aa4d428ab7
RS, DG; Groups can now include other users, the user's first group is displayed by default, never use many without :in =>
2010-08-10 11:02:04 -07:00
maxwell
38abd51666
MS IZ fixed a couple of failing specs in the parser
2010-08-09 21:09:51 -07:00
maxwell
68c4de6c16
Merge branch 'friend-refactor' of github.com:diaspora/diaspora_rails into friend-refactor
2010-08-09 19:05:12 -07:00
Raphael
91b42ac0e2
Specs now mostly pass again, one is failing
2010-08-09 18:06:09 -07:00
maxwell
d443be35f9
Merge branch 'friend-refactor' of github.com:diaspora/diaspora_rails into friend-refactor
...
Conflicts:
app/controllers/publics_controller.rb
app/models/user.rb
2010-08-09 17:31:46 -07:00
maxwell
56d7c67bbb
Going toward pending requests
2010-08-09 17:21:41 -07:00
Raphael
aebe7b97c0
DG RS; added groups. can't delete, but can make new ones
2010-08-09 15:58:53 -07:00
Raphael
33a827c33a
RS, DG; Websocket is now working again, users have a channel
2010-08-09 13:02:08 -07:00
Raphael
73a6cd911b
DG, RS; User person delegation fixed
2010-08-09 10:46:02 -07:00
Raphael
7076097ee4
RS, IZ; The tests are green.
2010-08-06 16:56:13 -07:00
maxwell
58de12df5e
DG MS; PeopleController#index now accepts query string for search (only looks at first_name and last_name)
2010-08-06 16:35:02 -07:00
Raphael
4350e17656
RS, IZ; removed lots of putses, fixed up request, parser, retractions
2010-08-06 16:01:39 -07:00
Raphael
f2e327d908
User factory now works
2010-08-06 13:27:42 -07:00
Raphael
0f596af5c4
Refactored message_queue getting, fixed retraction spec
2010-08-06 13:13:00 -07:00
Raphael
5b14c4822c
RS, IZ; webhooks spec should use user.post
2010-08-06 12:19:40 -07:00
Raphael
62e6ea0756
Error rescue in parser now is specific to not a real type error
2010-08-06 12:14:51 -07:00
Raphael
d130b82e42
RS, IZ; ApplicationHelper specs now passed, specs for mine? moved into person spec as specs for owns?
2010-08-06 11:52:33 -07:00
Raphael
6449d20687
Working on devise mocking in helper specs
2010-08-06 11:19:40 -07:00
Raphael
b5cbfab36e
RS, IZ; Comment spec now passes
2010-08-05 19:01:45 -07:00
maxwell
5d924dadf4
MS DG; 19 failing specs left
2010-08-05 17:16:51 -07:00
maxwell
7a1011c46c
DG MS; webhook specs fixed
2010-08-05 15:41:32 -07:00
maxwell
5e6d0c1153
Merge branch 'master' of github.com:diaspora/diaspora_rails into
...
friend-refactor, also fixed more specs
Conflicts:
app/models/person.rb
app/models/user.rb
spec/factories.rb
2010-08-05 15:13:05 -07:00
maxwell
cc04d4e08d
MS DG; more tests pass after making person have many people
2010-08-05 13:25:31 -07:00
danielvincent
67d4aea1db
DG MS; fixed album specs
2010-08-05 12:00:23 -07:00
danielvincent
dae8f26692
DG MS; fixed most photo specs
2010-08-05 11:56:37 -07:00
Raphael
bb66e87905
RS, IZ; Encryption specs now pass with openssl
2010-08-05 11:56:31 -07:00
danielvincent
4827953bec
DG MS; person specs are now passing. retraction on unfriend is now uncommented
2010-08-05 10:29:30 -07:00
danielvincent
42c0b82068
one failing test in Person. i have no idea.
2010-08-04 23:54:15 -07:00
ilya
5dfc097c88
replaced the functionality with openssl, didn't do the encryption spec
2010-08-04 20:32:15 -07:00
danielvincent
f2d7f35b84
unfriend still not removing association from bad_friend
2010-08-04 20:29:54 -07:00
danielvincent
c92a225556
DG MS; user-person relationship done. bunch of failing stuff.
2010-08-04 19:22:14 -07:00
Raphael
b8a2e8ecdf
RS, IZ; Fix Photo.instantiate, make photo url include spec a little more specific
2010-08-04 16:13:32 -07:00
Raphael
e2c0ae2cee
Merge branch 'master' of github.com:diaspora/diaspora_rails
2010-08-04 16:01:37 -07:00
danielvincent
75663b2447
DG MS; user can edit photo caption. also, photos have captions.
2010-08-04 16:00:59 -07:00
Raphael
58addca8dd
RS, IZ; extracted and murdered ostatus.
2010-08-04 16:00:01 -07:00
danielvincent
b7fb844fdf
more cleanup on Diaspora::OStatusParser
2010-08-04 00:57:46 -07:00
danielvincent
2938341b54
removed parse_ from every method name in Diaspora::OStatusParser
2010-08-04 00:47:29 -07:00
danielvincent
c5ace3069d
diaspora module correctly loads everything (lazy)
2010-08-04 00:41:23 -07:00
Raphael
74691228d3
RS, IZ; All relevant controllers now create with user.post
2010-08-02 16:32:52 -07:00
Raphael
9fe37b1d8c
RS, IZ; Cleaned up user spec, started to add current_user.post
2010-08-02 16:16:23 -07:00
Raphael
8432db34b3
RS; Fixed profile marshalling spec, now CI should pass!
2010-08-02 12:52:13 -07:00
Raphael
ac45960bbf
Fixed album spec, condensed traversing tests to halve the time of the spec (It was reading the photos from disk on every spec)
2010-08-02 12:33:36 -07:00
Raphael
b8ae6b44a2
RS; Image filename is now the Photo model id
2010-08-02 10:05:34 -07:00
maxwell
6aa1fa1826
DG MS profiles send? who knows...
2010-07-29 15:53:38 -07:00
Raphael
3376057c33
Merge branch 'master' of github.com:diaspora/diaspora_rails
2010-07-29 13:58:49 -07:00
Raphael
f4bace85b3
No more key deletion in specs, parser included correctly
2010-07-29 12:45:43 -07:00
danielvincent
11a099914c
on photo delete, photo checks to see if it is set in user profile. if it is, profile is edited.
2010-07-29 11:07:44 -07:00
Raphael
9750684e61
Maybe because diasporaparser was moved out to a different file?
2010-07-29 10:10:17 -07:00
maxwell
049361ea15
MS profiles should send, need to just make the parser now
2010-07-28 18:32:00 -07:00
maxwell
80db1132d1
Fixed the tests;
2010-07-28 16:50:38 -07:00
maxwell
bda87bbeab
MS switched request new links to just the request link
2010-07-26 18:13:20 -07:00
Maxwell Salzberg
66f66b85a6
MS added test, things still seem broken though
2010-07-24 23:21:02 -07:00
maxwell
b797704a14
MS small pointless webhooks refactor
2010-07-24 16:11:32 -07:00
maxwell
416f128ba8
MS pushing code around into seperate files for clairty, many specs moved around to much more sane names. i still need to break out diaspora generator out of webhooks module
2010-07-24 15:48:42 -07:00
maxwell
311a60f7b7
MS should be able to unsubscribe from an ostatus feed now, now it needs to be put in the controller
2010-07-23 21:16:36 -07:00
ilya
4eccf63fef
Can't upload to other people's album
2010-07-23 16:26:05 -07:00
maxwell
0fdce91756
DG MS added views for ostatus following
2010-07-22 21:27:43 -07:00
maxwell
16bbce3054
DG MS ostatus post and author now exsist
2010-07-22 20:16:24 -07:00
maxwell
1118b56bb1
DG MS we now fully parse an ostatus response
2010-07-22 16:55:28 -07:00
maxwell
daf0de2eb0
Merge branch 'master' of github.com:diaspora/diaspora_rails into ostatus
2010-07-22 11:54:07 -07:00
maxwell
a615853b07
DG MS; added more specs for pubsub
2010-07-22 11:53:57 -07:00
ilya
41c358d53c
Storing in phototest
2010-07-22 11:43:59 -07:00
ilya
24f8b33f2f
Tests all pass!
2010-07-22 11:36:36 -07:00
maxwell
69477b17f5
DG MS; added specs for publishing to a hub
2010-07-22 11:14:37 -07:00
Raphael
07767e62fe
Photo factory
2010-07-22 10:49:27 -07:00
Raphael
dce861ff17
Merge branch 'master' of github.com:diaspora/diaspora_rails
2010-07-22 10:43:41 -07:00
Raphael
0cb6e39ff4
comment signing spec was broken
2010-07-22 10:43:35 -07:00
ilya
773dbd91aa
RS IZ one more test passing going to bisect
2010-07-22 10:21:10 -07:00
