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
|
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 |
|