Maxwell Salzberg
1ef9d43262
added pagination for people on tag pages
2011-06-01 18:59:15 -07:00
MrZYX
3db4772652
ignore searchable if one searches by handle in people#index
2011-05-29 22:58:33 +02:00
danielgrippi
c8e31825c5
Bookmark -> ActivitiyStreams::Photo
2011-05-19 11:57:06 -07:00
danielgrippi
41e1d0dd86
show photos from cubbies in the streams
2011-05-19 11:57:06 -07:00
danielgrippi
60a60733df
Merge branch 'master' into follow
...
Conflicts:
app/controllers/aspects_controller.rb
app/controllers/contacts_controller.rb
app/controllers/people_controller.rb
app/controllers/photos_controller.rb
app/controllers/tags_controller.rb
app/helpers/notifications_helper.rb
app/models/notifications/new_request.rb
app/models/user_preference.rb
public/javascripts/view.js
spec/controllers/aspects_controller_spec.rb
spec/controllers/contacts_controller_spec.rb
spec/controllers/home_controller_spec.rb
spec/controllers/post_visibilities_controller_spec.rb
spec/controllers/requests_controller_spec.rb
spec/mailers/notifier_spec.rb
spec/models/user_spec.rb
2011-05-12 15:49:51 -07:00
Raphael Sofaer
71e77d59b3
Revert to including all helpers everywhere, because the rest of the team prefers it that way
2011-05-12 13:54:55 -07:00
danielgrippi
4280417e41
broke out dropdown into its own partial. aspect dropdown on person show. user menu fixed
2011-05-11 18:33:17 -07:00
danielgrippi
dfeb4f3a13
use .js response convention for remote likeke behavior
2011-05-11 11:08:30 -07:00
danielgrippi
648a10e6d3
Merge branch 'master' into follow
...
Conflicts:
app/controllers/requests_controller.rb
app/controllers/tags_controller.rb
app/helpers/aspects_helper.rb
app/views/notifications/index.html.haml
config/routes.rb
public/javascripts/aspect-edit.js
public/javascripts/contact-list.js
spec/integration/receiving_spec.rb
spec/models/user/connecting_spec.rb
spec/models/user/posting_spec.rb
2011-05-04 11:35:35 -07:00
Raphael Sofaer
38e44b13aa
Test and fix pagination on profile, tag and aspect streams
2011-04-30 10:26:16 -07:00
MrZYX
ff58d63191
minor cleanup to routes.rb
2011-04-30 16:28:39 +02:00
Raphael Sofaer
a5f297d7f7
Don't include every helper everywhere, re-organize helpers
2011-04-28 10:38:33 -07:00
Raphael Sofaer
85993a694e
Fix people#show sort order
2011-04-13 10:30:32 -07:00
Raphael Sofaer
d5ecce7ca6
Merge branch 'limit_similar_contacts'
...
Conflicts:
app/controllers/people_controller.rb
2011-04-12 11:48:41 -07:00
danielgrippi
106ae983d5
Merge branch 'master' into follow. all specs green.
...
Conflicts:
app/controllers/application_controller.rb
app/controllers/people_controller.rb
app/models/person.rb
config/assets.yml
db/schema.rb
public/javascripts/aspect-edit.js
spec/controllers/aspects_controller_spec.rb
spec/models/user/querying_spec.rb
spec/spec_helper.rb
2011-04-11 17:48:37 -07:00
Raphael Sofaer
f8359bd77d
Fix PeopleController#show mobile
2011-04-08 10:37:08 -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
2e5b5e1efe
request notification emails -> started sharing notification emails
2011-04-06 13:21:15 -07:00
danielgrippi
68375fdb02
added mutual flag, removed pending from contact, specs are green. wip
2011-04-05 16:12:53 -07:00
danielgrippi
590e1fd93f
All green except invite connecting +2 misc.
2011-04-04 15:16:19 -07:00
MrZYX
a1c3a6dc1e
lets see if that fixes the build
2011-04-02 15:53:58 +02:00
maxwell
bf45026040
another small fix for the mobile site
2011-03-31 18:35:21 -07:00
maxwell
69befc059d
ms iz fixed a bit of the mobile site
2011-03-31 18:32:19 -07:00
Raphael Sofaer
2d31d364f2
Don't will_paginate json requests on people search
2011-03-30 13:40:16 -07:00
Raphael Sofaer
555a774668
Initial contacts_of_contact page
2011-03-23 16:42:53 -07:00
Raphael Sofaer
ec8aed12bb
Limit similar contacts, need a see all page
2011-03-23 15:02:26 -07:00
maxwell
dc60181033
404 googlebotz left and right on public remote person pages
2011-03-22 11:26:39 -07:00
MrZYX
dce54f3d40
fixed #947
2011-03-19 15:05:45 +01: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
zhitomirskiyi
abbf949fe1
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-16 16:35:30 -07:00
Raphael Sofaer
9f368bf82f
Change person show page to created_at ordering, since you're looking at that person's content
2011-03-11 10:15:17 -08:00
Raphael Sofaer
fbfd46a506
change peoplecontroller order, fix grammar in public default
2011-03-11 10:12:37 -08:00
MrZYX
879672576f
fixed #919
2011-03-11 19:11:03 +01:00
Raphael Sofaer
ddbd5febb3
Make people pages publicly accessible
2011-03-10 12:55:05 -08:00
zhitomirskiyi
61dd5a835a
default scope on contact
2011-02-18 17:38:02 -08:00
zhitomirskiyi
16b7ec3990
pulled out share_with to be contact new and contact show
2011-02-17 18:05:21 -08:00
zhitomirskiyi
25671f07c7
refactor of a line
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
d1b91e1eac
wip, profiles controller and specs, with cucumber failures
2011-02-15 14:17:25 -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
Raphael
bbe47fbb55
Correct limit on search autocomplete
2011-02-01 14:35:14 -08:00
Raphael
9080649180
Starting work on an autocomplete feature
2011-02-01 11:56:56 -08:00
zhitomirskiyi
a8ac403e30
share with action for people who are already on diaspora
2011-01-28 16:37:11 -08:00
Raphael
31e4683183
Finished contacts of contacts for local users
2011-01-27 13:41:22 -08:00
maxwell
75f08f8cb9
limit results in people#show to 15 posts
2011-01-25 14:21:15 -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
maxwell
b21b0adca7
remove single user redirect
2011-01-20 15:02:46 -08:00
Raphael
4deec0cb38
Fix call to search in controller
2011-01-20 10:28:27 -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
zhitomirskiyi
63590e2e7e
restore hashes for person for person#index. since request relations are one way, the building the hash is perhaps simpler than alternitives"
2011-01-18 16:57:34 -08:00
