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

249 commits

Author SHA1 Message Date
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
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
MrZYX
4c696603c6 some better http status codes 2011-04-06 17:16:39 +02:00
MrZYX
e925fe622c oh yeah, render nothing on update if we don't want to redirect 2011-04-06 16:02:52 +02:00
MrZYX
95de299e6e fixed #953 2011-04-06 14:18:33 +02:00
Raphael Sofaer
9454c3a1b9 Working on fixing infinite scroll, in particular for aspects with the number 2 in their id. 2011-04-05 19:28:40 -07:00
Raphael Sofaer
746a0c38b3 Take another shot at fixing pagination 2011-04-05 13:59:15 -07:00
danielgrippi
590e1fd93f All green except invite connecting +2 misc. 2011-04-04 15:16:19 -07:00
Raphael Sofaer
b48b483eab Still working on stream query 2011-04-04 13:06:15 -07:00
Raphael Sofaer
1df287b2bb Don't redirect ajax requests to getting_started 2011-03-30 17:02:19 -07:00
Raphael Sofaer
716a7f64b8 Make contacts_visible accessible 2011-03-30 15:43:44 -07:00
Raphael Sofaer
c9d58d9308 Revert "Don't instantiate all contacts on aspects index, temporary querying in views for aspect listings" 
This reverts commit 3b7063d44a.
 2011-03-30 14:47:40 -07:00
Raphael Sofaer
3b7063d44a Don't instantiate all contacts on aspects index, temporary querying in views for aspect listings 2011-03-30 14:28:58 -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
b3cb8e0a2b temp fix for pagination. photos index fix 2011-03-29 18:55:00 -07:00
danielgrippi
aa4c20e404 pass post to comments partial. use sql in raw_visible_posts 2011-03-29 17:31:57 -07:00
danielgrippi
371aa71ca8 add ordering to raw_visible_posts 2011-03-29 17:31:56 -07:00
danielgrippi
97d8b34599 Fix all specs, add foreign key constraints on post_visibility 2011-03-29 17:31:56 -07:00
danielgrippi
9a0d6219b5 Moving PostVisibility to aspects, WIP, model specs pass 2011-03-29 17:31:56 -07:00
Sarah Mei
ffe48fe189 Refactor aspects#index to be easier to read; move some expensive operations after the guard clause 2011-03-27 19:19:25 -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
MrZYX
e2f6427724 just realized that the change to AspectsController#index in the previous commit isn't needed 2011-03-27 17:26:17 +02:00
MrZYX
3af5e24ac6 reduce db quries on aspects#index 2011-03-27 17:22:35 +02:00
MrZYX
55417cf9e3 AspectsController#move_contact -> AspectMembershipsController#update 2011-03-27 13:29:36 +02:00
MrZYX
b689d4695b refactor of routes.rb done so far; further refactor needs design decisions 2011-03-27 00:05:35 +01: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
MrZYX
1b1a23aa8f likes/dislikes WIP TODO: better icons, better styling, integration on photo show page 2011-03-20 18:10:58 +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
Raphael Sofaer
ddbd5febb3 Make people pages publicly accessible 2011-03-10 12:55:05 -08:00
danielgrippi
d0569fb881 simplified functionality on aspect edit faceboxes 2011-03-09 12:00:49 -08:00
Raphael Sofaer
e00a033e9e Update rspec-instafail, test git headers 2011-03-06 10:18:37 -08:00
Raphael Sofaer
685130cbd4 Take out n-query on home page 2011-03-02 13:34:06 -08:00
Raphael Sofaer
770091e82b Don't retrieve all the user's contacts again unnecessarily 2011-03-02 12:11:25 -08:00
Raphael Sofaer
d8956a7cd5 Add foreign key constraints 2011-02-28 15:18:35 -08:00
MrZYX
aa6ac41d68 remeber sort order 2011-02-19 17:06:26 +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
16b7ec3990 pulled out share_with to be contact new and contact show 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
danielvincent
41f077e039 posts are ordered by recent comment activity instead of time created 2011-02-16 02:04:46 -05:00
Raphael Sofaer
056bebd4f4 Autocompletion contacts now change with changing aspect selection 2011-02-09 16:07:25 -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
df4ebb286d accept invitation feature passing 
wip, added a form to add aspect to the contact list

added files

typo

render the partial

remote friend

specifying the provider for the route

refactored local person person friend finder functionality to use the partial

typo

trying to use the stream
 2011-02-08 16:40:28 -08:00
zhitomirskiyi
c2d26e21c3 added a mobile invitation acceptance view, skipping getting started for now 2011-02-05 20:19:47 -08:00
maxwell
ee02a073cd toggle mobile site, when mobile device 2011-02-03 18:43:56 -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
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
3ebda174fb make aspect list visible option on new_aspect pane 2011-01-27 13:41:23 -08:00
zhitomirskiyi
dcf6469ded visible contacts option on aspect edit pane 2011-01-27 13:41:22 -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
danielvincent
7ac0e9eb49 wip 2011-01-24 12:22:18 -08:00
Dan Hansen
67100aa7bb fix the build 2011-01-22 00:39:53 -06:00
Dan Hansen
c23811e1ab flash the user whether or not that person was moved to a different aspect 2011-01-21 20:02:42 -06:00
Raphael
2c68bb0305 Remove n-query problem from contact_list 2011-01-19 18:06:35 -08:00
Raphael
ad48f4796c Remove warning in aspectscontroller 2011-01-19 16:08:14 -08:00
Raphael
3935d978ac Take some queries out of views 2011-01-18 19:11:01 -08:00
Raphael
38dd58315d typo 2011-01-18 17:04:22 -08:00
Raphael
3b394c1c89 One more defualt scope out 2011-01-18 16:48:02 -08:00
Raphael
e6e2ba9cfb Take out default scopes 2011-01-18 16:46:52 -08:00
zhitomirskiyi
004094d66f fixed the querying in the controllers got rid of hashes 2011-01-18 16:21:14 -08:00
Raphael
8bd784e5ab Fix aspect edit 2011-01-17 17:36:36 -08:00
Raphael
4ba58d8132 Simplify hashes_for_contacts 2011-01-17 14:23:50 -08:00
Raphael
6410355d71 Fix aspect edit page 2011-01-17 14:23:50 -08:00
Raphael
738e8c65c8 Merge almost complete, 4 failures 2011-01-14 16:00:10 -08:00
danielvincent
f2f3059d72 fixed aspects/manage css/js bug. aspect listings on aspects/index show at max 2 lines of ppl 2011-01-08 17:17:37 -08:00
danielvincent
6cc5d6e3ab fixed all rspec/cucumber 2011-01-08 16:53:16 -08:00
danielvincent
c74dc120df fixed all cucumber tests 2011-01-08 13:11:54 -08:00
danielvincent
c9307305b3 collapsed aspect_listing and contact_listing on aspects/index 2011-01-08 13:11:53 -08:00
danielvincent
f44b3cbe3d contacts now ajax in on aspect filtering on aspect/index. fixed missing partial error on aspect_badge. 2011-01-08 13:11:53 -08:00
danielvincent
8c82a5974a aspect badge links work across all pages, ajax stream on index. aspect info lightbox placeholder 2011-01-08 13:11:53 -08:00
danielvincent
b029475421 aspects now have edit pages accessible through the top nav 2011-01-08 13:11:52 -08:00
danielvincent
44d3c4bacd fixed inf scroll on filters issue. one spec failing in AspectsController. 2011-01-08 13:11:52 -08:00
danielvincent
a773450650 aspect show fix 2011-01-08 13:11:52 -08:00
danielvincent
c64865d32e header touchup 2011-01-08 13:11:51 -08:00
danielvincent
a9195d7730 aspect filters now functional on aspects/index 2011-01-08 13:11:51 -08:00
danielvincent
79b7f62520 filter logic in aspects_controller#index 2011-01-08 13:11:51 -08:00
Raphael
d64fd2d222 Don't redirect to root_url on aspect destroy 2011-01-04 18:00:49 -08:00
Raphael
b642cd6840 Merging master into mysql 2010-12-26 16:30:17 -08:00
Raphael
319452537e Below 70 failures, GUIDs are next 2010-12-21 15:46:15 -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
danielvincent
6d63a5d3c5 fixed user#move_contact. from/to aspects were incorrectly ordered in method call in aspect_controller. 2010-12-19 17:50:07 -08:00
maxwell
84c041ba6a aspects streams now ajax 2010-12-17 19:41:42 -08:00
danielvincent
2758ea1625 fixed issue with diaspora handles not displaying in streams 2010-12-16 17:24:25 -08:00
Raphael
eb56521a66 Don't query inside of loops... 2010-12-16 12:25:31 -08:00
danielvincent
43810907f5 show all contacts in edit aspect pane 2010-12-16 10:00:18 -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
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
zhitomirskiyi
d34964651c if aspect is not dropped it redirects back for consistency 2010-12-15 14:44:10 -08:00
danielvincent
aef5abf631 Correct some queries, look at incoming requests in search, explicit pending false in activate_contact 2010-12-14 17:33:07 -08:00
Raphael
06b7b1c99a WIP pending contacts 2010-12-14 17:11:42 -08:00
Raphael
d3850292d5 Don't query current_user.contacts on every action 2010-12-14 12:38:48 -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
Raphael
baa04ceac7 Add aspect list to contact page 2010-12-13 15:58:08 -08:00