Commit graph

1708 commits

Author SHA1 Message Date
danielgrippi
b94b5240a8 added block user functionality to the stream 2012-01-07 14:23:23 -08:00
danielgrippi
6760e3868d remove js resposne for likes, do it in backbone with json responses instead 2012-01-07 14:23:23 -08:00
danielgrippi
d9d878f11f added api response for likes; cleaned up view logic; specify like collection url from parent model (Post) 2012-01-07 14:23:23 -08:00
danielgrippi
ae6fa5bebb don't use Diaspora widget system or stream.js when backbone is active;
migrating like actions over to backbone; some cleanup; bump jquery to
1.7.1
2012-01-07 14:23:22 -08:00
danielgrippi
f5172fa977 comment and post deletion now works on the backbone stream 2012-01-07 14:23:22 -08:00
danielgrippi
9e4e58e002 fix facebook specs; comment controller specs 2012-01-07 14:23:22 -08:00
danielgrippi
1ecfa92c9e DH DG; create comments via backbone 2012-01-07 14:23:21 -08:00
Daniel Grippi
19db5519c0 DG DH; made acts_as_api play nice with backbonejs. comments are semi-functional; stream elements use the StreamElement js widget (for now). 2012-01-07 14:23:20 -08:00
danielgrippi
aa7343d759 add profile streams to backbone. this breaks hovercards, atm. 2012-01-07 14:23:20 -08:00
danielgrippi
42ce3b277b backbone all the streams, besides user. don't use the acts_as_api way for now. 2012-01-07 14:23:20 -08:00
danielgrippi
91ba6447d0 add acts_as_api to the models directly for now. the 'root node' problem (posts : {}) breaks backbone. wip 2012-01-07 14:23:20 -08:00
danielgrippi
2a13381773 DG DH; pagination on backbone stream 2012-01-07 14:23:20 -08:00
danielgrippi
c360e82f11 DG DH; backbone stream now sort-of renders on multis_controller; wip 2012-01-07 14:23:20 -08:00
Jonne Haß
00a800ab07 this should fix a weired test polution case on travis where the x-git-revision header is suddenly nil 2012-01-06 03:26:00 +01:00
Maxwell Salzberg
41ecf2b27d make a method in EnviromentConfiguration to test if newrelic is setup 2012-01-05 18:14:06 -08:00
Jonne Haß
52c75a7ad4 Revert "Revert "auto follow back feature""
This reverts commit 6408105917.

Conflicts:

	db/schema.rb
2012-01-04 13:49:56 +01:00
Maxwell Salzberg
63cdd93afc the websocket has been completely removed, and replaced for a stub until
we find a better way to reimpliment it in a  more sane way
2012-01-03 18:39:54 -08:00
Maxwell Salzberg
22d5e913cc remove splunk logging 2011-12-21 14:24:03 -08:00
Jonne Hass
d6f98d12e1 even more spec fixing, postgres throws statement invalids for duplicate keys, luckily record not unique is a subsubclass of it so we can just catch the higher error 2011-12-11 04:45:11 +01:00
Jonne Hass
12d0eee7d9 use new translation keys for will_paginate instead of the setting 2011-12-11 02:49:43 +01:00
Jonne Hass
57661fe9dd fixed a couple of specs 2011-12-11 02:08:38 +01:00
Jonne Hass
5726b37fb9 diaspora connect: fix edge case where pod lost the client information 2011-12-11 01:37:15 +01:00
Jonne Hass
8b141ed5d5 oauth feature green, except for the pod forgot client edge case 2011-12-10 12:54:39 +01:00
Jonne Hass
4dd55ebdad fix diaspora connect for the new oauth stuff WIP. There's one bug where the oauth_identifier changes but the client doesn't get informed or doesn't save it. I hope it's the last bug. Btw. this is all ugly 2011-12-10 12:54:39 +01:00
Maxwell Salzberg
90458381f5 basic page for deleting account with temporary text and cute cat picture 2011-12-08 16:32:20 -08:00
Maxwell Salzberg
f800d50a2b i think this works 2011-12-08 16:32:19 -08:00
Ilya Zhitomirskiy
0bd101dca9 change close account to clear profile, still need to dispatch account deletion xml 2011-12-08 16:32:19 -08:00
Ilya Zhitomirskiy
03ca34767a ms iz rendering nothing for hcard and webfinger if account is closed, not showing aspect dropdown if the user account is closed 2011-12-08 16:32:18 -08:00
Gonzalo Rodriguez
c7c46d2b7b Update edit form after aspect rename. Closes #2363. 2011-12-07 01:57:04 -02:00
danielgrippi
beeb02dcd6 omniauth 1.0 replaced 'user_info' with 'info' 2011-12-06 17:53:41 -08:00
danielgrippi
d0f58e1bd4 Revert "upgrade devise; devise_invitable"
This reverts commit 0f56ee7b77.
2011-12-06 11:01:50 -08:00
danielgrippi
0f56ee7b77 upgrade devise; devise_invitable 2011-12-06 10:50:29 -08:00
Gonzalo Rodriguez
c62a9a2e63 Little refactor on PeopleController#index 2011-12-03 21:19:58 -02:00
Johannes Hackel
4b25545e82 fix sql error 2011-12-02 15:03:15 +01:00
Pistos
aa0aaa2f92 Revert "Merge pull request #2428 from geckoxx/comment_stream"
This reverts commit 8a27568273, reversing
changes made to 31ef2d60f7.

Conflicts:

	app/helpers/stream_helper.rb
	app/views/aspects/index.html.haml
	config/locales/diaspora/en.yml
	config/routes.rb
	spec/lib/stream/comments_spec.rb
2011-11-30 22:22:32 -05:00
Daniel Grippi
cec1f09202 specs green 2011-11-30 09:56:47 -08:00
Daniel Grippi
682d45d9bd Merge pull request #2426 from geckoxx/like_stream
Like stream
2011-11-30 09:11:17 -08:00
Daniel Grippi
5a1b73dc61 Merge pull request #2433 from geckoxx/2274-empty-tag
Fix Bug 2274, empty tag
2011-11-30 09:07:30 -08:00
aboire
d03695e128 update url invitation facebook 2011-11-30 17:44:45 +04:00
Johannes Hackel
23fa7a0a3e like stream new 2011-11-29 17:27:09 +01:00
Johannes Hackel
ef28e89809 people_controller_spec 2011-11-23 23:45:09 +01:00
Johannes Hackel
66acd7db14 specs, stay on page 2011-11-22 12:54:19 +01:00
Johannes Hackel
eb65074360 Fix Bug 2274, empty tag 2011-11-22 12:16:00 +01:00
Johannes Hackel
7368bb9e62 comment_stream 2011-11-20 18:37:10 +01:00
Sarah Mei
ad27eaac3d Fix photo#show for non-logged-in user 2011-11-19 21:17:39 -08:00
danielgrippi
6be778b9b2 change root_path and root_url to multi_path 2011-11-14 18:01:09 -08:00
danielgrippi
6408105917 Revert "auto follow back feature"
This reverts commit 226554becf.

Conflicts:

	config/locales/diaspora/en.yml
2011-11-14 17:18:43 -08:00
Sarah Mei & Tim Frazer
e38cb41f85 Better error messages for folks coming in with a bad invitation token, whether by clicking the "view this invitation in your browser" link or by clicking the accept invitation button.
Get rid of 500 error on the "view this invitation in your browser" link
2011-11-14 17:02:13 -08:00
Jonne Hass
226554becf auto follow back feature 2011-11-14 20:25:11 +01:00
Jonne Hass
6526e2f305 fix #2392 2011-11-13 22:37:18 +01:00