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

671 commits

Author SHA1 Message Date
Raphael Sofaer
761411e153 Mostly fix PeopleController#show for mobile 2011-04-08 10:37:08 -07:00
danielgrippi
aeda5a4e39 dispatching / receiving logic complete. following wip. 2011-04-07 18:29:24 -07:00
Raphael Sofaer
a05b141366 Add tagged posts to db seed, make people#show and tags#show infinite scroll 2011-04-07 16:36:14 -07:00
danielgrippi
4f972a23f6 drop requests table wip 2011-04-06 19:01:41 -07:00
danielgrippi
2e5b5e1efe request notification emails -> started sharing notification emails 2011-04-06 13:21:15 -07:00
Raphael Sofaer
bbf1bf00cb Render less stuff, set fewer things, make AspectsController#index more horrifying. Maybe Vanna could help with this? Mustache definitely would. 2011-04-06 12:11:49 -07:00
Raphael Sofaer
fd0fa61d53 Fix query in TagsController#show 2011-04-06 10:52:10 -07:00
MrZYX
4c696603c6 some better http status codes 2011-04-06 17:16:39 +02:00
danielgrippi
68375fdb02 added mutual flag, removed pending from contact, specs are green. wip 2011-04-05 16:12:53 -07:00
Raphael Sofaer
fdb6675f28 Make things more postgres compatible 2011-04-05 09:49:39 -07:00
danielgrippi
cbdbe1b29b follow wip. 2 failures. 2011-04-04 19:22:19 -07:00
danielgrippi
590e1fd93f All green except invite connecting +2 misc. 2011-04-04 15:16:19 -07:00
zhitomirskiyi
f99b724e0b ms iz, can now undo hiding a post, fixed a bunch of jamine specs 2011-03-31 17:23:54 -07:00
Raphael Sofaer
435b16b30a Don't index on just hidden 2011-03-30 19:17:52 -07:00
Raphael Sofaer
3387c20b5f Fix redirect away from conversation 2011-03-30 17:17:16 -07:00
zhitomirskiyi
5a9ec82597 can now hide posts 2011-03-30 16:43:28 -07:00
zhitomirskiyi
fb8b8ab7fc wip holding off until the follow model is done 2011-03-30 16:43:28 -07:00
maxwell
72d8b4a7e6 honk if you dont like the 1.9 build being slow 2011-03-30 15:47:59 -07:00
Raphael Sofaer
5c7bd6298a Fix 500 on tags index 2011-03-30 12:43:44 -07:00
maxwell
73256d598a fix public test to include .atom format 2011-03-30 11:34:54 -07:00
maxwell
cb87ba68b8 fix public test to include .atom format 2011-03-30 11:34:54 -07:00
zhitomirskiyi
70d1c31733 fixed the issue of nothing showing up for empty aspects 2011-03-30 11:29:12 -07:00
zhitomirskiyi
4a7326e035 WIP 2011-03-30 11:29:12 -07:00
danielgrippi
c4295a7693 fix aspect_memberships_controller specs 2011-03-30 11:15:40 -07:00
zhitomirskiyi
0aaaefeba2 fix tag plugin 2011-03-29 16:53:48 -07:00
zhitomirskiyi
62a815f6d3 controller specs are passing 2011-03-29 15:03:10 -07:00
zhitomirskiyi
a5bb26a3c4 almost done 2011-03-29 15:03:09 -07:00
maxwell
8b7dc0a2cc translated bookmarklet, added post to main page 2011-03-28 19:57:06 -07:00
Raphael Sofaer
a0d3921d72 Fix 500 on tag show with comments 2011-03-28 10:01:19 -07:00
Sarah Mei
ae106e71ae Move sort order to a before filter, because this index method is waaaaay too big. 2011-03-27 18:52:43 -07:00
Sarah Mei
c4bc24d485 Add spec for remembering sort order 2011-03-27 10:56:08 -07:00
Sarah Mei
56b0d7821d Move a few specs out of an expensive context they don't need 2011-03-27 10:47:04 -07:00
MrZYX
55417cf9e3 AspectsController#move_contact -> AspectMembershipsController#update 2011-03-27 13:29:36 +02:00
MrZYX
3a5f8d814d fixed spec 2011-03-27 00:23:14 +01:00
MrZYX
b689d4695b refactor of routes.rb done so far; further refactor needs design decisions 2011-03-27 00:05:35 +01:00
MrZYX
985d79acb5 some more refactoring to routes.rb 2011-03-26 17:38:49 +01:00
Raphael Sofaer
aed190dc6d cucumber for comment retractions, modified views 2011-03-25 16:26:03 -07:00
Raphael Sofaer
fef226156c Update controllers to use User#retract, change Relayable#relayable to Relayable#relayable? 2011-03-25 16:09:37 -07:00
danielgrippi
f5a03fd6ed Make public timeline of a user publicly accessible 2011-03-25 15:06:22 -07:00
danielgrippi
c0ce0d71b8 Make pending specs green, I think there are still some to_jsons where there should be as_json 2011-03-25 15:06:22 -07:00
danielgrippi
5dbbc79f65 added users_profile_image, home_timeline, fixed public_timeline 2011-03-25 15:06:22 -07:00
danielgrippi
517f3fd802 statuses/ and users/ GET routes 2011-03-25 15:06:22 -07:00
maxwell
2dca7b4807 fix test 2011-03-25 15:06:22 -07:00
maxwell
ea3d839e1c initial public api' 2011-03-25 15:06:22 -07:00
MrZYX
56a6f0e43b cleaned up craziness in users and likes routing, fixed #961 2011-03-24 03:02:14 +01:00
Raphael Sofaer
555a774668 Initial contacts_of_contact page 2011-03-23 16:42:53 -07:00
danielgrippi
43315e14f9 sort contacts by name, not by a potentially nil field 2011-03-23 10:16:55 -07:00
zhitomirskiyi
e45a3503d0 on aspect edit the contacts are now sorted by first name 2011-03-22 18:01:17 -07:00
maxwell
dc60181033 404 googlebotz left and right on public remote person pages 2011-03-22 11:26:39 -07:00
zhitomirskiyi
32f08ef345 fixed the nil photo_url and the all being called twice in the specs 2011-03-21 14:56:50 -07:00
zhitomirskiyi
93d69c4ec7 fixed the views for the friend finder 2011-03-21 14:56:50 -07:00
zhitomirskiyi
aa5bef0c3f calls the job on login does a sync call if the cache friends was not called before, fixed the views 2011-03-21 14:56:50 -07:00
zhitomirskiyi
dcc80d5b43 almost done, need to figure out how whats the deal with the controller not being called 2011-03-21 14:56:50 -07:00
MrZYX
1b1a23aa8f likes/dislikes WIP TODO: better icons, better styling, integration on photo show page 2011-03-20 18:10:58 +01:00
Sarah Mei
c3b9da8d37 Add specs to conversations#new. Unpending spec for create. 2011-03-19 22:30:58 -07:00
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