Gonzalo Rodriguez
3d7297ba5e
Closes #1753 . Render thats_you message instead of dropdown for your hovercard
2011-08-19 00:47:26 -03:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
c3bcb9c962
Revert "Revert "Merge branch 'issue1586-aspectdropdown-when-posting'""
...
This reverts commit a407f12463
2011-08-18 16:48:20 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
a407f12463
Revert "Merge branch 'issue1586-aspectdropdown-when-posting'"
...
This reverts commit 2777f16f4f8b278adff6
2011-08-18 16:16:14 -07:00
Raphael Sofaer
cc3eeac98e
Merge the aspect dropdown in the publisher with master, some things are still broken
2011-08-16 14:59:53 -07:00
Raphael Sofaer
3a18044821
Fix infinite scroll on search... some kind of weird thing with rails responding with json even when request.format is html, with a mime type of html
2011-08-13 09:59:17 -07:00
Maxwell Salzberg
e9d993b8f6
throw 404s when the person is no found
2011-08-09 13:03:45 -07:00
Manuel Schölling
79d0dfc7bb
added missing hang=>left and people's AspectMembershipDropdown is not a partial anymore
2011-08-07 12:53:22 +02:00
Manuel Schölling
fead6032f7
Issue 1586: added a aspect drop down next to the submit button in the publisher
2011-08-07 12:51:32 +02:00
Raphael Sofaer
5967f01dab
Take out PostsFake, now that we ajax in comments it's not worth the extra complications
2011-08-03 11:09:21 -07:00
Maxwell Salzberg
d407be036e
i am not a number! include username in the main url of a local user!
2011-07-29 18:53:46 -07:00
Maxwell Salzberg
06f886ad77
WIP reshare
2011-07-21 18:22:17 -07:00
Raphael Sofaer
8eea37cbdb
Fix people socketing
2011-07-21 13:41:46 -07:00
MrZYX
9304db68f1
fix peoples#aspect_membership_dropdown
2011-07-12 20:04:55 +02:00
Raphael Sofaer
8cf0fa8446
Don't get tags in the publisher
2011-07-07 10:48:07 -07:00
Raphael Sofaer
9765bdc391
Don't get posts for a hovercard request
2011-07-06 14:11:07 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
1c79c2c6f0
made aspect_dropdown ajax in (created route), in the process of removing aspect_membership js responses
2011-07-06 12:45:16 -07:00
danielgrippi
675d9d7485
wip. Person#as_json is breaking right now
2011-07-06 12:45:16 -07:00
danielgrippi
1a2ba034ab
added edit links in aspect_nav; removed ununsed icons; fixed facebox duplication on aspect/index
2011-07-01 17:23:58 -07:00
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
