nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
9981 commits 4 branches 0 tags 121 MiB
Commit graph

866 commits

Author SHA1 Message Date
Sarah Mei
0b1fa4d014 You can now add contacts from tags#show. Also, a CSS change to help us start refactoring: there's now a class to the body that you can set with content_for :body_class. This lets you scope CSS to a particular page. Started breaking out smaller CSS files. 2011-03-19 20:53:55 -07:00
MrZYX
dce54f3d40 fixed #947 2011-03-19 15:05:45 +01:00
Raphael Sofaer
42a361dcce Don't redirect ajax requests to getting_started. Fix a possible source of errors and backfill a couple tests 2011-03-18 21:07:31 -07:00
danielgrippi
3db11cf38d PostsController#index -> TagsController#show 2011-03-18 20:57:39 -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
562c0d40ac profile tags now federate 2011-03-17 16:28:17 -07:00
maxwell
bca184eaf3 photos are now successfully delayed 2011-03-17 13:59:53 -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
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
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
Raphael Sofaer
1666843aa9 Fix 500 in publicsController 2011-03-14 16:48:07 -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
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
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
Raphael Sofaer
8f1a6f502e Change equals to sort-of-equals 2011-03-11 14:23:03 -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
Dan Hansen
10345b14a8 generate jasmine fixture with posts 2011-03-10 19:12:16 -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
Raphael Sofaer
ddbd5febb3 Make people pages publicly accessible 2011-03-10 12:55:05 -08:00
maxwell
1baafac84b added content to rss feed 2011-03-09 19:11:09 -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
danielgrippi
d0569fb881 simplified functionality on aspect edit faceboxes 2011-03-09 12:00:49 -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
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
Raphael Sofaer
e00a033e9e Update rspec-instafail, test git headers 2011-03-06 10:18:37 -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
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
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
maxwell
782dc55d63 remove puts, fix admins controller test 2011-02-26 14:22:13 +01: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
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
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
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
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
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
zhitomirskiyi
16b7ec3990 pulled out share_with to be contact new and contact show 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
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
maxwell
d1b91e1eac wip, profiles controller and specs, with cucumber failures 2011-02-15 14:17:25 -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
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
5eb487ed20 204, not 201 2011-02-09 18:04:44 -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
51e129b5c6 Don't call hashes_for_people if it is a json request in search 2011-02-09 16:05:02 -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
4a925d192f refactored the api 2011-02-05 15:01:05 -08:00
zhitomirskiyi
da6e16b3a4 WIP 2011-02-05 15:01: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 181bd823c4, reversing
changes made to 2c3ed2ab73.
 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
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
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
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
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
31e4683183 Finished contacts of contacts for local users 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
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
89a8817ce6 made service#invite redirect to the right place 2011-01-26 12:16:48 -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
8bc52cdb55 facebook friend finder gathers fb friends. 2011-01-26 12:16:46 -08:00
zhitomirskiyi
2314c08265 current password requirement to change password 2011-01-24 22:39:57 -08:00
maxwell
ed1dc584d1 make aspects#index slow for ci 2011-01-24 18:03:14 -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
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
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
69d6de2fe7 added views and graph generation for statistics 2011-01-21 10:29:07 -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
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
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
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
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
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
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
maxwell
7fc9d239b9 you can no longer send a request to yourself at the Request model level 2010-12-01 11:37:54 -08:00
Paweł Wilk
1295417224 Added some specs for grammatical_gender (User model and Users controller). 2010-12-01 18:19:48 +01: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
Raphael
366734ca5e Take queries out of aspect contacts pane on home page 2010-11-30 15:35:32 -08:00
Raphael
e86a5563ed Override request started log line 2010-11-29 14:03:29 -08:00
maxwell
bf79d62317 Merge branch 'master' of github.com:diaspora/diaspora 2010-11-29 13:41:38 -08:00
maxwell
4ef7c4d6d1 make the build pass (we no longer socket photos at all) and also more test fixing around request. we were saving requests to early in the cycle, most likely cruft before it was refactored. 2010-11-29 13:39:48 -08:00
Raphael
eccc25e20a Add pending specs for log_overrider... hit a wall when I wanted more information than is being passed to ActiveSupport::Notifier 2010-11-29 13:14:27 -08:00
danielvincent
d7c5e12d64 move photo-show js to assets. remove EM::next_tick from controller#create actions. make photo show pages render again. 2010-11-28 02:30:25 -05:00
Raphael
845e1fe7a3 Fix comments ajax response 2010-11-28 01:31:05 -05:00
Raphael
cbe98a1479 Add spec to commentscontroller 2010-11-28 00:39:23 -05:00
Raphael
703e8e0426 Add spec for js requests on stmc create 2010-11-28 00:36:05 -05:00
Raphael
6d6b07fb92 Use form_tag, not form_for, in _new_comment 2010-11-27 23:24:29 -05:00
danielvincent
f59c6e2427 refactored comments to work like status_messages in the controller. weird stuff was happening when using EM::next_tick; holding off on that for now. 2010-11-27 23:06:34 -05:00
Raphael
d2bfffca92 Fix PeopleController, add specs 2010-11-27 21:46:07 -05:00
Raphael
7ca124c002 Refactor views to not be so dumb. 2010-11-27 21:27:27 -05:00
danielvincent
64f7a20ff4 fixed specs, took out that nasty raise. 2010-11-27 16:20:46 -05:00
maxwell
c65c62906c pushing so dan can look at how to stub EM:next_tick correctly 2010-11-27 16:20:46 -05:00
Raphael
7030ed0fed Putting youtube titles back into status messages 2010-11-27 11:43:24 -05:00
Raphael
d5d4a08f03 Start moving youtube title getting into the post/comment flow 2010-11-27 01:00:47 -05:00
Raphael
d81db97054 take out request routed 2010-11-26 21:15:03 -05:00
Raphael
0fa93706a6 Make request completed log line complete 2010-11-26 21:15:02 -05:00
Raphael
e09b544f26 Add specs to log overrider 2010-11-26 21:15:02 -05:00
danielvincent
ce63e13eca aspect ids normalized to posts to minimize queries on views. 2010-11-26 18:55:06 -05:00
Raphael
fb85ffe406 Adding specs for log_overrider 2010-11-26 18:38:08 -05:00
Sarah Mei
abae16472d pagination works on aspects#show 2010-11-26 13:09:05 -08:00
danielvincent
417301088f fixed build 2010-11-26 00:56:53 -05:00
Raphael
690951dcd1 Take a query out of the views 2010-11-25 23:53:45 -05:00
Raphael
33ba00377e Add performance spec 2010-11-25 23:53:45 -05:00
Raphael
08ba387311 More sane redirect on failing to accept an invitation 2010-11-25 00:39:13 -05:00
zhitomirskiyi
9ca54a2282 accepting an invitation correctly adds the request to the user 2010-11-23 18:58:26 -08:00
zhitomirskiyi
a9b503b65e made the dev. util things pending 2010-11-23 15:49:50 -08:00
zhitomirskiyi
3f737116d6 since there is only one person with that name in the db, it returns a redirect 2010-11-23 11:02:17 -08:00
maxwell
da16e3ee1e PALINDROME invite form can now take comma seperated multiple emails, so you only have to click the box once 2010-11-23 00:08:30 -08:00
maxwell
7c09117230 fixing build 2010-11-22 19:05:35 -08:00
zhitomirskiyi
1519fd46bf Sending a request to someone who requested you autoaccepts the request 2010-11-22 12:21:26 -08:00
danielvincent
b3ec4d10c2 user can now remove contact from aspects on contact's profile page. a contact's posts are retained in a given aspect reflecting the duration of said contact's inclusion. 2010-11-21 16:30:45 -08:00
maxwell
9b7d2ed0f6 DG MS; status messages can now have photos. 2010-11-21 16:13:01 -08:00
danielvincent
242d0ab9c5 a search yielding exactly one person will redirect to that person's page. hotkey ctrl+f triggers focus on search box. 2010-11-21 16:11:55 -08:00
Raphael
4ce2de55e2 Fix photo show, js on people search page 2010-11-21 13:29:50 -05:00
zhitomirskiyi
c2dcf9a074 fixed the invite spec 2010-11-18 16:55:44 -08:00
zhitomirskiyi
d0d261fdae zero default invites, the rake task starts people with 5 invites 2010-11-18 16:23:35 -08:00
Sarah Mei
c19ebcece3 Request delete now returns head :ok instead of redirecting. On client side, request div is removed. 2010-11-17 22:28:24 -08:00
danielvincent
056dc7d3ba DG MS; added homecontroller to take care of landing page and aspects index redirecting in regards to user's logged in state. 2010-11-17 19:37:08 -08:00
Raphael
f3a301d314 Don't expect raises in request specs, redirect to :back on all requesting 2010-11-16 16:18:16 -08:00
Raphael
0f1517af15 Redirect directly to the login page no registrations closed 2010-11-15 12:24:58 -08:00
Raphael
d3098cf6bc Add option to close registration in app_config 2010-11-15 12:15:40 -08:00
Sarah Mei
830a43ec2f Add destroy specs for RequestsController. 
Cucumber feature for contact requests.
 2010-11-14 09:43:28 -08:00
danielvincent
ed50fe7f1f Aspect.people -> Aspect.contacts. Fixed diaspora.en to reflect friend -> contact changes. 2010-11-12 20:22:56 -08:00
danielvincent
aa9966ea26 removed the word friend everywhere minus translation files 2010-11-12 20:22:55 -08:00
danielvincent
a21af7cac6 friend_users -> connect_users in helper_methods 2010-11-12 20:22:54 -08:00
Raphael
8232a92ca0 Update _person and person show, add specs for those pages 2010-11-10 12:41:18 -08:00
Sarah Mei
a39bd2badb AspectsController#manage now works if you have pending friend requests. 2010-11-10 12:05:28 -07:00
maxwell
4037ae9f33 fixing controller test 2010-11-09 16:55:54 -08:00
Raphael
390fffdee6 Fix new request view 2010-11-09 15:03:56 -08:00
Raphael
bfa0917ce4 add a couple specs 2010-11-09 14:07:26 -08:00
zhitomirskiyi
77fe7a1462 Revert "IZ local comment destroy" 
This reverts commit cb9fb0ad94.
 2010-11-08 19:32:43 -08:00
zhitomirskiyi
34179d60db Merge branch 'master' of github.com:diaspora/diaspora 2010-11-08 18:21:02 -08:00
zhitomirskiyi
cb9fb0ad94 IZ local comment destroy 2010-11-08 18:19:55 -08:00
maxwell
a84f9437b0 trying another thing to get the redirect working 2010-11-08 17:43:59 -08:00
maxwell
4164ceaf90 trying another thing to get the redirect working 2010-11-08 16:30:46 -08:00
maxwell
52908cec1a services controller should now go back to the referer. this might not actually work 2010-11-08 16:18:15 -08:00
maxwell
3fd5852d44 Merge branch 'master' of github.com:diaspora/diaspora 2010-11-08 15:56:18 -08:00
maxwell
2162a2e3f9 collapse person's photos and status message into their profile; also, made these nested on a person 2010-11-08 15:55:58 -08:00
zhitomirskiyi
cbabc547a2 Merge branch 'master' of github.com:diaspora/diaspora 2010-11-08 15:10:32 -08:00
zhitomirskiyi
e50f29b032 the profile cannot massassign diaspora handle 2010-11-08 15:10:23 -08:00
maxwell
4d2820e31c MS RS fixed photo show bug 2010-11-08 14:05:01 -08:00
Raphael
9970ee0e22 Write comments controller spec 2010-11-05 14:15:40 -07:00
Raphael
0ce37bbfa8 Remove some extra receives in tests 2010-11-05 14:15:40 -07:00
Raphael
693847480b Take out notifier stubbing, it's in test mode. 2010-11-05 11:31:52 -07:00
Sarah Mei
c816a1f78e RegistrationsController#create re-renders the form instead of redirecting, so user doesn't lose what they've entered. 
Took out RegistrationsController#update, since all it was doing was calling super.
Took out stubbing of user save, because I actually want to check that save is doing the right thing.
 2010-11-04 22:51:30 -07:00
Raphael
f6d899f1d9 Move prep_image_url into profile image_url setter 2010-11-04 18:46:15 -07:00
danielvincent
82c82b8ccc killed albums 2010-11-04 10:17:19 -07:00
zhitomirskiyi
a55878f2a3 invitations controller test, tnx coyote 2010-11-03 22:58:42 -07:00
zhitomirskiyi
2da1f860cd validate user ownership on status message destroy 2010-11-03 18:04:10 -07:00
zhitomirskiyi
6a6cedbc62 oops did not save the pending 2010-11-03 16:43:10 -07:00
zhitomirskiyi
8246882067 MS IZ fixed some permissions in photo controller 2010-11-03 16:42:33 -07:00
zhitomirskiyi
3578daa14e IZ MS more photo controller specs 2010-11-03 12:21:32 -07:00
maxwell
62c25057e6 adding photocontroller spec for IZ 2010-11-03 10:43:27 -07:00
Raphael
5cdeed6c54 Add a spec to people_controller, make those specs a little clearer 2010-11-02 17:10:19 -07:00
Raphael
ccd92fb850 make requests controller spec a little clearer 2010-11-02 16:55:23 -07:00
Raphael
bbd8cadc14 Retaining specs and line from robustdj's patch 2010-11-02 11:27:51 -07:00
Raphael
9d273c6d24 Now expecting a 500 on someone passing an id to create, should really be a 422 2010-11-01 12:31:00 -07:00
Raphael
488df6eaa0 RS IZ a good test to overwrite ids 2010-11-01 11:35:37 -07:00
Raphael
7f7697c11d Merge remote branch 'traction/441-failed-aspect-creation-redirect' 2010-10-31 23:22:10 -07:00
Sarah Mei
ce213513eb PeopleController#update handles getting an empty string for :image 2010-10-31 17:49:47 -07:00
danielvincent
b08c4fb84e removed user#aspect method. all aspect creation should be scoped through the user -> aspect association proper: user.aspects.create(opts) 2010-10-31 12:34:26 -07:00
Raphael
ccf3b7d87b stub out some stuff in publics_controller 2010-10-29 19:10:29 -07:00
Raphael
f7708fb9bf Get rid of deprecation warning 2010-10-29 18:55:30 -07:00
Raphael
49e1bde150 Stub user creation in registrations_controller 2010-10-29 18:46:57 -07:00
Raphael
555c15dfef Simplify validations on user 2010-10-29 16:56:04 -07:00
maxwell
15bd24a64f Merge branch 'master' of github.com:diaspora/diaspora 
Conflicts:
	spec/lib/message_handler_spec.rb
	spec/spec_helper.rb
 2010-10-29 16:23:33 -07:00
Raphael
99eb25762d Moving to make_user, a few specs broken 2010-10-29 15:53:21 -07:00
maxwell
a272b22208 Merge branch 'master' of github.com:diaspora/diaspora 2010-10-29 15:16:17 -07:00
danielvincent
7acc138a21 resolved issue regarding profile images referenced at https:// locations. 2010-10-29 14:56:41 -07:00
maxwell
7e7c4c3431 refactored message handler spec 2010-10-29 14:26:11 -07:00
Raphael
86ddc2561a fix spec in users_controller 2010-10-29 13:22:25 -07:00
Raphael
d753e31205 Merge remote branch 'ed0h/309-user-choose-language' 
Add explicit language set to spec in users_controller_spec.rb

Conflicts:
	app/models/user.rb
 2010-10-29 12:06:14 -07:00
maxwell
1b48572674 MS tests are now green 2010-10-29 11:16:50 -07:00
zhitomirskiyi
534cc112bf IZ MS rebase master 2010-10-29 11:15:13 -07:00
maxwell
acd977a115 adding pending spec to check for error within webfinger process 2010-10-29 11:14:55 -07:00
maxwell
eddcb71fcb EM websocket cleanly merged with master. webfingering is now async 2010-10-29 11:11:05 -07:00
maxwell
58f836ab46 adding pending spec to check for error within webfinger process 2010-10-29 11:06:31 -07:00
maxwell
8fe339b03b EM websocket cleanly merged with master. webfingering is now async 2010-10-29 11:05: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
Gabriel Gilder
bdb77ff282 redirecting to :back instead of manage page on failed aspect creation +spec 2010-10-28 21:01:53 -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
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
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
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
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
danielvincent
b2e8ebd0bc OmniauthService -> Service. Cleaned up views. 2010-10-25 17:41:59 -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
ilya
c27f05ed42 Initial refactor done, need to stop mapping user.friends to people so much 2010-10-22 18:11:04 -07:00
Sarah Mei
7e4529f2bd im in ur test stubbin ur mailers 2010-10-22 06:22:47 -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
62700387ad MS IZ added an add to aspect form on the request partial 2010-10-20 15:30:30 -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
9c8e514642 Adding a spec for a mass-assignment attack through profile update 2010-10-20 12:15:13 -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
fd8028db33 Revert "Revert "Merge remote branch 'upstream/master'"" 
This reverts commit 1481056af2.
 2010-10-20 09:51:55 -07:00
Alec Leamas
1481056af2 Revert "Merge remote branch 'upstream/master'" 
This reverts commit fb70dc8c99, reversing
changes made to 53fef63a9a.

Conflicts:

	pkg/fedora/diaspora-setup
	pkg/ubuntu/diaspora-setup
	public/stylesheets/sass/application.sass
	spec/models/user/attack_vectors_spec.rb
 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
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
Raphael
f90d38bb9c Merge branch 'master' of http://github.com/tristil/diaspora into tristil-merge 2010-10-18 12:00:20 -07: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
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
Sarah Mei
fcdcf88a79 Person.by_webfinger preserves case of identifier. Backfill specs for PublicsController#webfinger. 2010-10-17 12:18:53 -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
maxwell
f83bddadc5 forgot to add the test; and cleaned up the explain partial 2010-10-15 16:19:07 -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
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
ilya
324f14c719 setting the token to nil on accept of invite 2010-10-12 18:23:59 -07:00
Raphael
8cf72441b4 Make intended behavior on hcard action clearer, return 404 on nonexistent person 2010-10-11 10:13:52 -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
Sarah Mei
4da2f9cf58 Fix pending spec in SocketsControllerSpec 2010-10-09 21:58:46 -06: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
4dba2d7c35 Fix failing spec. Backfill spec for DevUtilitiesController#set_backer_number. 2010-10-07 15:27:04 -06:00
Raphael
d7bbb66d27 Run whitespace:cleanup 2010-10-07 10:47:37 -07:00
maxwell
d638bdb018 MS IZ password change field is now in edit profile 2010-10-05 17:49:06 -07:00