Commit graph

40 commits

Author SHA1 Message Date
Steffen van Bergerem
6461135bfd Redesign contacts page 2014-08-26 19:18:32 +02:00
danielgrippi
ed3d5c429a fix a bunch of small css related media box issues [ci skip] 2012-02-10 15:18:27 -08:00
danielgrippi
e6e49bbf1f stubbornella media and img dom structure FTW! major css deletion <3 2012-02-09 14:29:01 -08:00
danielgrippi
91e649977c MS DG update copyright 2011-09-14 11:23:12 -07:00
Raphael Sofaer
d0ce257107 Revert "Revert "Merge branch 'hashtags-in-comments'""
This reverts commit d2e26f6937.
2011-07-07 15:10:04 -07:00
danielgrippi
d2e26f6937 Revert "Merge branch 'hashtags-in-comments'"
This reverts commit f85d5ad6d4, reversing
changes made to b8d70393f4.
2011-07-07 13:39:15 -07:00
danielgrippi
310b9969f3 hashtags module now in comments. not sure how to pull back relevant posts on tags/show from here... 2011-07-07 12:21:57 -07:00
MrZYX
42f5f7fc32 fixed find person by handle 2011-05-29 21:27:20 +02:00
MrZYX
c06b885aa7 fixed #1027 2011-04-19 00:27:31 +02: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
danielgrippi
55ac4c8054 show tags under names in people partials 2011-03-16 17:46:09 -07:00
danielgrippi
c608c70ca7 tagging profiles complete 2011-03-15 13:21:36 -07:00
zhitomirskiyi
16b7ec3990 pulled out share_with to be contact new and contact show 2011-02-17 18:05:21 -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
MrZYX
852be182f5 made 'start sharing' translatable 2011-01-22 16:29:39 +01:00
danielvincent
98ceb1ca6b fixups on people/show. make photos scroll over header on show pages. 2011-01-08 13:11:54 -08:00
danielvincent
422f17a648 switched out fancybox for facebox (THANK GOD). added aspect edit panes to aspects/index. removed some partials. 2011-01-08 13:11:53 -08:00
danielvincent
055fbe3e00 stream is now a div. generalized some partial extentions for mobile site. 2011-01-01 23:09:18 -05:00
Raphael
3b727dc887 Add share_with fancybox on search page, fix a couple of queries 2010-12-15 17:45:12 -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
f44b02e22c Clean up people/person 2010-11-30 13:07:02 -08:00
maxwell
466120cd58 fixing extra = 2010-11-18 20:07:57 -08:00
zhitomirskiyi
0e171e8504 added a fixed the pending request query 2010-11-18 15:22:14 -08:00
Raphael
c0414b8184 Make requesting ajaxy, refactor _person request partials, add route for ajaxy webfingering, people now socket to search and _manage_aspect_contacts 2010-11-16 16:18:16 -08:00
Raphael
248e768846 search now sockets a person 2010-11-15 19:13:45 -08:00
danielvincent
aa9966ea26 removed the word friend everywhere minus translation files 2010-11-12 20:22:55 -08:00
Raphael
d62a7c4ce2 Fix request views, refactor identical forms into partial. 2010-11-10 20:12:09 -08:00
Raphael
8232a92ca0 Update _person and person show, add specs for those pages 2010-11-10 12:41:18 -08:00
Raphael
71ab919ad3 Remove urls from requests, invitations are broken 2010-11-09 14:07:26 -08:00
danielvincent
a4df6a8a53 bugfix in peeople#_person partial displaying relationship status 2010-11-07 10:51:33 -08:00
MrZYX
63a5fdb000 made a bunch of strings translatable 2010-11-04 20:49:50 +01:00
danielvincent
ea00d35f1f padding on stream fix. added add aspect button in aspect nav. 2010-10-19 12:10:22 -07:00
Raphael
1fd3aeabd9 Add or later to license notice 2010-10-07 16:25:34 -07:00
Raphael
d748d456b5 Revert "fix in person partial"
This reverts commit 8c0bc4b9e6.
2010-09-23 16:21:08 -07:00
danielvincent
8c0bc4b9e6 fix in person partial 2010-09-23 10:49:35 -07:00
Raphael
2489f8503f Merge branch 'master' into HEAD
Conflicts:
	app/controllers/albums_controller.rb
	app/controllers/aspects_controller.rb
	app/controllers/photos_controller.rb
	app/controllers/registrations_controller.rb
	app/controllers/requests_controller.rb
	app/helpers/dashboards_helper.rb
	app/views/albums/show.html.haml
	app/views/aspects/manage.html.haml
	app/views/shared/_aspect_nav.haml
	app/views/shared/_sub_header.haml
	app/views/status_messages/_status_message.html.haml
	app/views/status_messages/show.html.haml
	config/locales/de.yml
	config/locales/en.yml
	config/locales/es.yml
	config/locales/fr.yml
2010-09-22 21:32:03 -07:00
maxwell
e2fc48c9ff MS being slightly more proper with application helper, and fixing the person search page 2010-09-20 16:44:35 -07:00
Arnaud Delcasse
eeb132d825 Writing "Already friends" instead of proposing to add people that we already added successfully or accepted in the search results. 2010-09-21 03:20:06 +08:00
Ariel Zavala
e9f74675e9 Merged with diaspora; fixed conflicts; only 2 red 2010-09-19 11:16:00 -04:00
danielvincent
b5a2971302 search results for people now look like the stream 2010-09-18 17:49:52 -07:00