Commit graph

4120 commits

Author SHA1 Message Date
Raphael Sofaer
a1bf22fe7e More work on retracting posts with reshares, one failing spec on User#retract 2011-07-21 18:23:34 -07:00
Raphael Sofaer
7382dfb7be Multi-server spec now successfully passes along a reshare 2011-07-21 18:23:33 -07:00
Raphael Sofaer
e19fb6d0f8 Use authority instead of host in order to get the port as well. 2011-07-21 18:23:33 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
537766d0d7 Started working on repost integration test 2011-07-21 18:23:33 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy
bd1c8efe54 wip integration servers 2011-07-21 18:23:33 -07:00
danielgrippi
2d6f51f68c repost wip 2011-07-21 18:22:18 -07:00
danielgrippi
987d44c41c fixed reshare specs; all specs green 2011-07-21 18:22:18 -07:00
danielgrippi
a8400ad460 2 more specs failing. wip 2011-07-21 18:22:18 -07:00
danielgrippi
a32ef3c1d8 added xml response to the post 2011-07-21 18:22:18 -07:00
danielgrippi
bdc4b9f746 marsharing reshares now grabs the post from the original poster, also fetcheer that person if they don't exist locally still need to ping for xml and give the right xml back 2011-07-21 18:22:18 -07:00
danielgrippi
509a435cc9 moving to not including the post in the reshare xml 2011-07-21 18:22:17 -07:00
danielgrippi
7b3180e5da user can retract a reshared post 2011-07-21 18:22:17 -07:00
danielgrippi
f3a515eef1 DG IZ reshare retractions is WIP 2011-07-21 18:22:17 -07:00
danielgrippi
d1bbbdbc4c fixed all specs; rebased. 2011-07-21 18:22:17 -07:00
Ilya Zhitomirskiy
ce94779766 not showing the reshare button to the users on things they can't reshare 2011-07-21 18:22:17 -07:00
Maxwell Salzberg
fa9269541f wip removed some generated specs 2011-07-21 18:22:17 -07:00
Maxwell Salzberg
06f886ad77 WIP reshare 2011-07-21 18:22:17 -07:00
Raphael Sofaer
e2bdd54dd8 Undo part of the refactor so that StatusMessage validations work. 2011-07-21 17:56:53 -07:00
Raphael Sofaer
caf26a5c64 Upgrade rails.js, add CSRF token manually in the photo uploader. 2011-07-21 17:49:33 -07:00
Raphael Sofaer
20de3a5622 Refactor StatusMessagesController#create, move the photo dispatching into an after_dispatch hook 2011-07-21 16:30:00 -07:00
Maxwell Salzberg
09a43418ef dont try to fix vanna max\! 2011-07-21 14:32:10 -07:00
Maxwell Salzberg
757c9169fc updated gemfile 2011-07-21 14:32:10 -07:00
Maxwell Salzberg
eee2225f04 rspec is green 2011-07-21 14:32:10 -07:00
Maxwell Salzberg
df62f58156 fixed the safe_buffer issues 2011-07-21 14:32:09 -07:00
Raphael Sofaer
8eea37cbdb Fix people socketing 2011-07-21 13:41:46 -07:00
Raphael Sofaer
a5fd01cc09 Fix comment socketing 2011-07-21 13:21:48 -07:00
Raphael Sofaer
4de2ca9958 Get websocket pushing posts 2011-07-21 13:21:48 -07:00
Raphael Sofaer
b01ffb4489 We don't use perform_delegate anymore 2011-07-19 10:55:23 -07:00
Raphael Sofaer
9797e04957 Merge remote branch 'yolk/348-change-email-with-confirmation' into merge_email_change
Conflicts:
	app/controllers/users_controller.rb
	config/locales/diaspora/en.yml
	db/schema.rb
	spec/controllers/users_controller_spec.rb
	spec/mailers/notifier_spec.rb
2011-07-19 10:44:00 -07:00
Raphael Sofaer
9789d1d6cb Fix issue #1579, like.target, not like.post 2011-07-17 21:18:21 -04:00
Raphael Sofaer
d30228abb8 Merge remote branch 'untitaker/1589-remove-unicode-smileys' 2011-07-17 21:12:20 -04:00
Dan Hansen
6a11784a2e Rewrote ContactsController#index, thoughts? 2011-07-17 15:44:07 -07:00
Andrej Kacian
713f4dcc9d Fix for issue #1600: Missing string for translation ("Recent notifications") 2011-07-17 17:04:51 +02:00
Markus Unterwaditzer
d4257f4a68 Removed unicode smileys, #1589 2011-07-17 10:45:06 +02:00
danielgrippi
22fdf7f895 fix 500 on posts show on mobile 2011-07-15 22:37:21 -07:00
danielgrippi
39da9302a1 Revert "deleted unused file". sorry!! :(
This reverts commit a6f2f82c5e.
2011-07-15 22:33:55 -07:00
danielgrippi
a6f2f82c5e deleted unused file 2011-07-15 21:44:12 -07:00
danielgrippi
c4b715f3ff fixed emails to show avatars, have subject lines that allow threading in email clients, and relevant content previews 2011-07-15 21:22:29 -07:00
Raphael Sofaer
5d64611f2b Include profile in contactsController index for the publisher 2011-07-15 14:49:35 -07:00
Raphael Sofaer
f60a748c21 Ajax in the contacts for mentioning after page load 2011-07-15 14:23:44 -04:00
Raphael Sofaer
37e939d476 Use activerecord-import in ReceiveLocalBatch. The default behavior of it is to do an On Duplicate Key Update updated_at = Time.now, but we have a test for that case anyway. 2011-07-14 21:27:16 -07:00
Sarah Mei
bcb4fac465 Vanna doesn't include helpers so we have to include them in views separately to use them. The absence of this line was producing a deprecation warning for error_messages_for, because our helper redefines that method (it was removed from rails). 2011-07-14 18:24:33 -07:00
Raphael Sofaer
55009a8381 Use activerecord-import to re-save ServiceUser objects. We should do the same in ReceiveLocalBatch. 2011-07-13 10:59:41 -07:00
Arzumy MD
03e79da171 fixed missing i18n key for no_services 2011-07-13 12:17:47 +08:00
Raphael Sofaer
0fae31dacf Prevent people pagination links on tag pages from breaking lines 2011-07-12 17:21:02 -07:00
Raphael Sofaer
df5177a50d Fix mobile AS photo page 2011-07-12 17:05:37 -07:00
Raphael Sofaer
874654b461 Reenable sessionscontroller after_filter 2011-07-12 17:01:40 -07:00
Raphael Sofaer
c3ecc59bee Bring back the js people pagination on tag show, we need a js file for that page 2011-07-12 16:45:29 -07:00
Raphael Sofaer
14759b2c80 Use person_link in notifications_helper, move hovercard css out to a file 2011-07-12 16:21:03 -07:00
danielgrippi
6f807f263a fix the specs; pull back guid in post_visibilities_controller 2011-07-12 15:18:28 -07:00