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
|
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
|
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
|
6474ca9540
|
display photos correctly
|
2011-01-17 19:34:33 -08:00 |
|
Raphael
|
8bd784e5ab
|
Fix aspect edit
|
2011-01-17 17:36:36 -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 |
|
Sarah Mei
|
2c91bfca96
|
Fix spec that fails under ruby 1.9.
|
2011-01-15 15:00:45 -08:00 |
|
Raphael
|
738e8c65c8
|
Merge almost complete, 4 failures
|
2011-01-14 16:00:10 -08:00 |
|
Sarah Mei
|
9c87fff295
|
Log specs don't check for specific number of renders.
|
2011-01-12 22:43:45 -08: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 |
|
maxwell
|
25f388d903
|
MS DG made receive encapsulated in an object
|
2011-01-11 14:23:19 -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 |
|
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 |
|
zhitomirskiyi
|
3e569c0c30
|
using set comparison instead of strict array comp.
|
2011-01-06 17:26:30 -08:00 |
|
maxwell
|
cff387d651
|
make sure receive unescapes the payload before sending it to the job
|
2011-01-06 16:30:22 -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
|
8819d288c4
|
i am greeen
|
2011-01-05 17:43:25 -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
|
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 |
|
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 |
|
Sarah Mei
|
f18439fa14
|
ZOMG specs pass on mysql!
Make '_type' column on services into 'type'.
|
2010-12-28 21:08:54 -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
|
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 |
|
Sarah Mei
|
de502bf67c
|
Convert aspect-edit-spec.js to use actual DOM fixtures generated by AspectsControllerSpec.
|
2010-12-24 18:39:20 -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 |
|
Michael Sofaer and Raphael Sofaer
|
30d60021f4
|
11 Controller specs remain in mysql. ALMOST DONE
|
2010-12-24 14:12:55 -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 |
|
Raphael
|
55492535c6
|
Fix some more specs, aspects controller is green in mysql
|
2010-12-22 14:15:45 -08:00 |
|
Raphael
|
319452537e
|
Below 70 failures, GUIDs are next
|
2010-12-21 15:46:15 -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
|
232de40457
|
Only service hasn't been migrated, there are a good 100 passing examples in mysql
|
2010-12-19 12:27:32 -08:00 |
|
Raphael
|
36b622c998
|
Fix build
|
2010-12-18 15:22:56 -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 |
|
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 |
|
danielvincent
|
f1ee32145d
|
Remove pending_requests from user, just use Request.from and Request.to.
|
2010-12-14 19:00:03 -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
|
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
|
502db347cc
|
removed homepage detail into a partial, which you should redefine
|
2010-12-13 12:52:23 -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 |
|
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
|
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 |
|
danielvincent
|
46793179db
|
people#show displays shows public posts for non-contacts as well
|
2010-12-08 16:53:24 -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 |
|
Sarah Mei
|
ecc537c737
|
Stub Jobs::ReceiveSalmon.perform in controller test
|
2010-12-05 01:31:19 -08:00 |
|
maxwell
|
a415ff5c5f
|
fixed the build. made photos dependent destroy with parent status message
|
2010-12-05 00:45:13 -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 |
|
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 |
|
maxwell
|
7dce94814c
|
fixing the invite user job
|
2010-12-03 22:41:16 -08:00 |
|
maxwell
|
0a831cfbf4
|
invites are now on the queue
|
2010-12-03 19:33:54 -08: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 |
|
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
|
db0106f13c
|
Rename EMWebfinger to Webfinger, clean up some related things
|
2010-12-02 12:35:25 -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 |
|
Raphael
|
8d853a88a3
|
Remove some old views, clean up routes, clean up.
|
2010-12-01 15:38:56 -08:00 |
|