nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
8588 commits 4 branches 0 tags 121 MiB
Commit graph

296 commits

Author SHA1 Message Date
Andrej Kacian
cad14bcdfc Show tags on user profile pages for everyone if we're logged in. 2011-08-22 01:59:03 +02: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 2777f16f4f, reversing
changes made to 8b278adff6.
 2011-08-18 16:16:14 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
064ae972b3 the cucumber is now passing & renamed the partial to conform with convention 2011-08-18 15:38:27 -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
e2b16ab16f Correct my own spelling mistake 2011-08-11 17:10:49 -07:00
Raphael Sofaer
091cdd6f94 Basic contacts index page on the mobile site 2011-08-10 16:23:33 -07:00
Manuel Schölling
8b99ae9cb6 Changed translation and fixed misspelled function call 2011-08-07 22:00:23 +02: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
Raphael Sofaer
08ae8d23cc aspect_membership_dropdown, not aspectmembership 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
a35356cfc3 DG Fix 500 in person page when incoming_request is undefined 2011-08-05 17:33:10 -07:00
danielgrippi
0cceb4fdd3 fixed people/contacts layout; pulled person sub-header into its own partial 2011-08-05 15:51:18 -07:00
danielgrippi
b11c1a899f add invitations partial back, removed set_invites (yay) 2011-08-03 18:47:06 -07:00
danielgrippi
25e4f5d0ae dg ms; made no posts text on person show more explicit 2011-08-02 12:53:36 -07:00
danielgrippi
e345f2dcbc fix contacts index page 2011-07-29 14:15:28 -07:00
Raphael Sofaer
8eea37cbdb Fix people socketing 2011-07-21 13:41:46 -07:00
Raphael Sofaer
0fae31dacf Prevent people pagination links on tag pages from breaking lines 2011-07-12 17:21:02 -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
danielgrippi
fd015129c4 final touchups to hovercard 2011-07-06 13:51:19 -07:00
mb-log
64898c522e Don't need edit button on public profiles 2011-07-02 16:56:09 +02:00
danielgrippi
8bf6ad45a5 various bugfixes, added missing translations, made all tests pass (rspec, cucumber, jasmine) 2011-07-01 22:04:36 -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
danielgrippi
60077bd70a minor visual changes, more or less. facebox headers are now white. 2011-07-01 10:51:45 -07:00
danielgrippi
238e859dbe add contact images to aspect index, removed comment background color, add vertical rule to people pages 2011-07-01 10:49:20 -07:00
danielgrippi
4e48db23f0 aspect dropdown shows name of aspect if contact is only in one; green 2011-06-30 12:18:41 -07:00
danielgrippi
b8ea8e9e75 start a conversation with an aspect from contact index page 2011-06-28 23:09:11 -07:00
Raphael Sofaer
0790c3397e Delete some useless JS 2011-06-09 16:23:15 -07:00
Maxwell Salzberg
5cbbdf2949 initial post to tumblr support 2011-06-01 22:30:22 -07:00
MrZYX
42f5f7fc32 fixed find person by handle 2011-05-29 21:27:20 +02:00
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