danielgrippi
16351227f7
use aspect dropdowns everywhere; updated rake to 0.9.0
2011-05-20 11:50:41 -07:00
Maxwell Salzberg
69e83bb065
remove whitespace on your own profile
2011-05-19 15:08:17 -07:00
MrZYX
c47c9ef069
fix untranslated string; fix two translations; don't mess routes.rb again
2011-05-18 00:53:48 +02:00
danielgrippi
26ac8b8285
fix 500 on people index
2011-05-17 12:24:07 -07:00
danielgrippi
57a2a8fa71
remove button to add yourself to an asepct on your profile page:
2011-05-17 12:14:05 -07:00
danielgrippi
3c82af49bf
fixed cucumber with an exception of one step. added dropdowns to tag pages
2011-05-12 14:11:52 -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
0db8541f6e
added a pane for people sharing with you on all aspect page
2011-05-04 17:57:42 -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
f89b6ae5be
Fix all contacts link
2011-05-03 11:02:08 -07:00
Raphael Sofaer
567b440f3d
Use correct pagination in mobile person show
2011-04-30 10:26:16 -07:00
Raphael Sofaer
38e44b13aa
Test and fix pagination on profile, tag and aspect streams
2011-04-30 10:26:16 -07:00
MrZYX
b23f9b39eb
fixed adding contact feedback on people search result page
2011-04-30 17:00:52 +02:00
Raphael Sofaer
a5f297d7f7
Don't include every helper everywhere, re-organize helpers
2011-04-28 10:38:33 -07:00
MrZYX
c06b885aa7
fixed #1027
2011-04-19 00:27:31 +02:00
Raphael Sofaer
363ef2c276
Fix some translations (thanks MrZYX)
2011-04-12 12:24:29 -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
danielgrippi
352d1c6abf
fixed disconnecting logic. specs&cucumber green
2011-04-11 15:10:51 -07:00
MrZYX
93be252b59
Merge branch 'css-rtl'
...
Conflicts:
public/javascripts/application.js
public/javascripts/inbox.js
2011-04-11 21:52:01 +02:00
Raphael Sofaer
927ba96fcc
Take out broken 'start sharing' link from mobile site
2011-04-08 11:09:56 -07:00
Raphael Sofaer
f8359bd77d
Fix PeopleController#show mobile
2011-04-08 10:37:08 -07:00
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
2e5b5e1efe
request notification emails -> started sharing notification emails
2011-04-06 13:21:15 -07:00
danielgrippi
847f4fd260
edited subscribers to include all contacts on public posts. added the ability to drop an aspect regardless of contacts contained. wip.
2011-04-05 18:53:10 -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
92bf8444a7
added spec; rtl? -> direction_for
2011-04-03 04:20:08 +02:00
MrZYX
a7a8da2f75
added detection of rtl languages on every user based input
2011-04-03 02:14:35 +02:00
MrZYX
98820c0866
do not display tags on the public profile
2011-03-29 22:25:03 +02:00
Raphael Sofaer
555a774668
Initial contacts_of_contact page
2011-03-23 16:42:53 -07:00
zhitomirskiyi
7a31531258
added location to the profile
2011-03-23 15:56:46 -07:00
Raphael Sofaer
ec8aed12bb
Limit similar contacts, need a see all page
2011-03-23 15:02:26 -07:00
MrZYX
643a066691
moar translatable
2011-03-22 22:45:36 +01:00
Sarah Mei
631163ec02
"Add contact" buttons on tag page are smaller and don't appear on top of names.
...
Moved some logic from view into user model.
2011-03-22 13:16:58 -07:00
Sarah Mei
c1bf68068f
Pull relationship action button from search results out into a partial.
...
Copyedit messages.
2011-03-19 15:59:56 -07:00
zhitomirskiyi
43fc2c4d63
fixed the style on the share with list element
2011-03-17 15:19:12 -07:00
MrZYX
78eebc8920
fixed #935
2011-03-17 16:59:02 +01:00
danielgrippi
55ac4c8054
show tags under names in people partials
2011-03-16 17:46:09 -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
MrZYX
e7b4d4e494
the build was failing for a reason
2011-03-16 15:40:56 +01:00
danielgrippi
20b5ca7570
added tag helper text on profile, edit on hover
2011-03-15 22:10:20 -07:00
danielgrippi
c608c70ca7
tagging profiles complete
2011-03-15 13:21:36 -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
MrZYX
21d0fcf47a
fixed some 500 on mobile site
2011-03-15 17:02:04 +01:00
Ritchie Wilson
81661d61fc
changes the 'You are not sharing with...' button to static text instead of inserting the persons name
2011-03-15 10:00:15 -04:00
Raphael Sofaer
ddbd5febb3
Make people pages publicly accessible
2011-03-10 12:55:05 -08:00
MrZYX
0d1133cd51
fixed some translations
...
do not escape html in private_message text only email
2011-03-09 15:33:46 +01:00