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

1228 commits

Author SHA1 Message Date
danielgrippi
a02b9c01c8 eager loading aspect memberships 2011-05-13 18:22:42 -07:00
danielgrippi
ee49fb3547 no more n-query in the view problem 2011-05-13 16:49:37 -07:00
danielgrippi
c200c386fb pulled new aspect into modal window 2011-05-13 11:58:18 -07:00
danielgrippi
a9a1280e17 one cuke failing. wip 2011-05-12 20:41:56 -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
danielgrippi
3c82af49bf fixed cucumber with an exception of one step. added dropdowns to tag pages 2011-05-12 14:11:52 -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
Arzumy MD
efd5c4f500 slimming down application_helper, moved markdown and aspect related methods to individual helpers 2011-05-13 00:51:45 +08:00
MrZYX
8abe28d992 fix 500 on tags#show 2011-05-12 12:32:31 +02: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
eadede966f unliking works right now minus on-page feedback 2011-05-11 11:08:30 -07:00
danielgrippi
8b081a48b4 likes controller now has destroy method. commented out dislikes from views. unlike links not functional. 2011-05-11 11:08:29 -07:00
Raphael Sofaer
ab1f29c339 Working on styling the ContactsController#sharing 2011-05-10 14:17:43 -07:00
Raphael Sofaer
37be13d4e0 Fix facebook finder and tests 2011-05-10 11:22:52 -07:00
zhitomirskiyi
469d5b99a2 WIP added a share view, tests are red 2011-05-09 16:55:22 -07:00
MrZYX
3b7dd1906f fixed 500 on /people/:person_id/photos 2011-05-08 21:36:27 +02:00
Maxwell Salzberg
7a2f6dae10 fixed js error on new comments on statusmessage show page 2011-05-06 15:29:39 -07:00
danielgrippi
7e838fc778 only display contacts you are sharing with in aspect edit panes 2011-05-04 18:05:49 -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
87864bf4ff people.diaspora_handle, not profiles.diaspora_handle 2011-05-03 11:39:34 -07:00
Raphael Sofaer
c7358c8664 Fix rendering into json for names with quotes 2011-05-03 10:50:13 -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
b4e36878fe Fix pages after 1 on tag page 2011-04-28 09:28:59 -07:00
Raphael Sofaer
f13304073b The specs are green on my dev machine, let's see if CI is still red 2011-04-13 15:19:17 -07:00
Raphael Sofaer
efe79eb351 Fix stream on pages other than 1, rename raw_visible_posts to visible_posts 2011-04-13 14:35:20 -07:00
Raphael Sofaer
85993a694e Fix people#show sort order 2011-04-13 10:30:32 -07:00
Raphael Sofaer
8c0dcdde08 Notifications should be sorted by updated_at 2011-04-12 14:06:58 -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
MrZYX
e91c153257 fixed #1013 thanks jbivins 2011-04-11 17:08:36 +02:00
danielgrippi
1c9ca738ae green everywhere. 2011-04-08 17:10:43 -07:00
danielgrippi
c128cae4ec specs green after moving ContactController#new to AspectsMembership#new 2011-04-08 11:44:09 -07:00
Raphael Sofaer
f8359bd77d Fix PeopleController#show 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
maxwell
d7c4e15835 let admin give a user 10 ma user 10 more invites 2011-04-07 17:54:22 -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
4f972a23f6 drop requests table wip 2011-04-06 19:01:41 -07:00
danielgrippi
2e5b5e1efe request notification emails -> started sharing notification emails 2011-04-06 13:21:15 -07:00
Raphael Sofaer
bbf1bf00cb Render less stuff, set fewer things, make AspectsController#index more horrifying. Maybe Vanna could help with this? Mustache definitely would. 2011-04-06 12:11:49 -07:00
Raphael Sofaer
fd0fa61d53 Fix query in TagsController#show 2011-04-06 10:52:10 -07:00
MrZYX
4c696603c6 some better http status codes 2011-04-06 17:16:39 +02:00
MrZYX
e925fe622c oh yeah, render nothing on update if we don't want to redirect 2011-04-06 16:02:52 +02:00
MrZYX
95de299e6e fixed #953 2011-04-06 14:18:33 +02:00
Raphael Sofaer
9454c3a1b9 Working on fixing infinite scroll, in particular for aspects with the number 2 in their id. 2011-04-05 19:28:40 -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