3688 commits

Author	SHA1	Message	Date
Dennis Collinson	9769dfb303	cukes passing	2012-02-23 17:24:19 -08:00
danielgrippi	806487a5ff	namespace view folder with folders	2012-02-23 11:12:20 -08:00
danielgrippi	8f3cc6769c	update reshare count when resharing; return PostPresenter for reshare root in the success response	2012-02-22 18:02:08 -08:00
danielgrippi	8f4fed8c0e	add participants to info pane on post viewer	2012-02-22 13:15:54 -08:00
Florian Staudacher	412853bfcc	make lightbox work for photos page (+tests)	2012-02-22 14:45:43 +01:00
Maxwell Salzberg	7755c254fb	some basic tests for post presenter; added user.reshare!	2012-02-21 21:56:11 -08:00
danielgrippi	899136d0e5	display proper counts after feedback actions; modified destroy responses to return PostPresenter objects	2012-02-21 21:44:44 -08:00
danielgrippi	37981b71fe	MS; DG; adding cucumbers for post templates	2012-02-21 17:31:26 -08:00
danielgrippi	b1cbd0f4a9	fix all but 2 jasmine specs	2012-02-21 15:23:30 -08:00
danielgrippi	3db133a3a7	be less agressive when re-rendering on feedback actions	2012-02-21 15:23:30 -08:00
Maxwell Salzberg	0ab8ef1d08	basic support for activity streams photos	2012-02-21 15:23:28 -08:00
Maxwell Salzberg	25cf776059	the previous and next posts are now supplied in json of the presenter; give the template creator a default value	2012-02-21 15:23:28 -08:00
danielgrippi	ff875a5b3c	DG MS; determine what template to use on the client from the server	2012-02-21 15:23:27 -08:00
Maxwell Salzberg	0a49cfd866	Merge pull request #2876 from jbivins/2354-empty-post-page-redirect-3 ... Go to root page if deleting post from the show page	2012-02-18 17:14:42 -08:00
Maxwell Salzberg	7aba1ce1f7	Merge branch 'Raven24-user-photos' ... Conflicts: public/javascripts/app/router.js public/stylesheets/sass/application.sass	2012-02-18 17:12:14 -08:00
Joe Bivins	76c11b8d37	Add test case for when a user removes their own post from the show page. ... Adjust redirection logic.	2012-02-18 19:47:25 -05:00
Maxwell Salzberg	1e2b912bd6	remove multi server spec files	2012-02-18 16:26:18 -08:00
danielgrippi	a0e8f161f5	fix notifications controller. yay.	2012-02-18 16:26:18 -08:00
danielgrippi	ceb8497e49	Revert "attempt to make travis happy" [ci skip] ... This reverts commit 8507dc864f.	2012-02-18 16:26:17 -08:00
danielgrippi	5fd0ab7951	attempt to make travis happy	2012-02-18 16:26:17 -08:00
Dennis Collinson	32d58e8a9b	toggle all nsfw posts	2012-02-18 16:26:17 -08:00
danielgrippi	debdd6cb6b	change routes to properly reflect page names (activity/stream).	2012-02-18 16:26:16 -08:00
Florian Staudacher	8249847e9c	bookmarklet now is a complete html document (+test) ... it auto-expands to the size of the text that was selected it self-closes after posting again	2012-02-18 16:26:15 -08:00
danielgrippi	2f7465450e	you can now follow / unfollow a post from the stream; fixed cukes.	2012-02-18 16:26:15 -08:00
danielgrippi	431a04b0a8	made nsfw shield nicer and more condensed [ci skip]	2012-02-18 16:26:14 -08:00
Dennis Collinson	d6fd5cdb20	federated generators take a user	2012-02-18 16:26:12 -08:00
Dennis Collinson	a0ca983c57	Participate stream query uses participations	2012-02-18 16:26:12 -08:00
Dennis Collinson	c9487ee12f	move user modules into user namespace.	2012-02-18 16:26:12 -08:00
Dennis Collinson	b0e81af1fa	Refactor Relayable Creation	2012-02-18 16:26:12 -08:00
Dennis Collinson	8ae6303a91	Participations are a federated, relayable model :)	2012-02-18 16:26:12 -08:00
danielgrippi	a1df9fe8db	fix jasmine	2012-02-18 16:26:11 -08:00
Maxwell Salzberg	10bdf52ef7	mock out slow things that our tests dont need for speed	2012-02-18 16:26:10 -08:00
Maxwell Salzberg	ebeff6c8e6	fix for some crazy lack-of-stubbing on some http requests...	2012-02-18 16:26:10 -08:00
danielgrippi	173894d926	stubbornella media and img dom structure FTW! major css deletion <3	2012-02-18 16:26:10 -08:00
Diaspora Europe	92b29d31db	added user_is_following method, added 2 model specs	2012-02-18 16:26:10 -08:00
Diaspora Europe	55cb328fe2	tags should be case insensitive	2012-02-18 16:26:10 -08:00
Florian Staudacher	0222e4b2ee	added intentionally failing specs, because dirty input breaks bookmarklet ... see also #2741 #2751 #2800	2012-02-18 16:26:09 -08:00
Maxwell Salzberg	4f2783487d	Merge pull request #2881 from beardedninja/master ... Added a post conversion hook to PageDown + amended test for autolinking, fixes #2792	2012-02-18 16:12:39 -08:00
Florian Staudacher	dc01515aac	a little too much copy&paste...	2012-02-18 18:59:52 +01:00
Maxwell Salzberg	326103adb6	remove multi server spec files	2012-02-14 16:40:11 -08:00
danielgrippi	a5debd795d	fix notifications controller. yay.	2012-02-14 15:59:51 -08:00
danielgrippi	52c8540091	Revert "attempt to make travis happy" [ci skip] ... This reverts commit 8507dc864f.	2012-02-14 15:05:28 -08:00
danielgrippi	8507dc864f	attempt to make travis happy	2012-02-14 15:00:59 -08:00
Dennis Collinson	e16a20e18c	toggle all nsfw posts	2012-02-14 14:15:24 -08:00
danielgrippi	f3f2b8ca44	change routes to properly reflect page names (activity/stream).	2012-02-14 11:16:41 -08:00
Florian Staudacher	4263797099	bookmarklet now is a complete html document (+test) ... it auto-expands to the size of the text that was selected it self-closes after posting again	2012-02-14 18:57:30 +01:00
Daniel Grippi	1638f32042	Merge pull request #2841 from Raven24/bookmarklet-specs ... intentionally failing specs - dirty input breaks bookmarklet (+fix)	2012-02-13 21:14:56 -08:00
danielgrippi	32f93a0391	you can now follow / unfollow a post from the stream; fixed cukes.	2012-02-13 19:13:43 -08:00
danielgrippi	f1c119452a	made nsfw shield nicer and more condensed [ci skip]	2012-02-13 14:12:14 -08:00
Alex Harrison	763f8465eb	Added test for adding target=_blank to autolinks	2012-02-12 22:43:52 +01:00
Dennis Collinson	04bd507025	federated generators take a user	2012-02-09 19:01:01 -08:00
Dennis Collinson	5e26a7e6bb	Participate stream query uses participations	2012-02-09 19:01:01 -08:00
Dennis Collinson	14b9f5dc5b	move user modules into user namespace.	2012-02-09 19:01:01 -08:00
Dennis Collinson	f3c1eff3e9	Refactor Relayable Creation	2012-02-09 19:01:00 -08:00
Dennis Collinson	9e1816dc12	Participations are a federated, relayable model :)	2012-02-09 19:01:00 -08:00
danielgrippi	535c39ae7b	fix jasmine	2012-02-09 18:21:51 -08:00
Maxwell Salzberg	7109cf6c67	mock out slow things that our tests dont need for speed	2012-02-09 17:44:32 -08:00
Maxwell Salzberg	3d569cc4bc	fix for some crazy lack-of-stubbing on some http requests...	2012-02-09 16:20:22 -08:00
danielgrippi	e6e49bbf1f	stubbornella media and img dom structure FTW! major css deletion <3	2012-02-09 14:29:01 -08:00
Florian Staudacher	cab953848f	added tests for photos page	2012-02-09 23:12:39 +01:00
Diaspora Europe	8eda9aaf52	added user_is_following method, added 2 model specs	2012-02-09 14:17:43 +01:00
Diaspora Europe	47f7e10860	tags should be case insensitive	2012-02-09 14:17:43 +01:00
Maxwell Salzberg	062204e963	Merge pull request #2848 from beardedninja/master ... #2847 Users can now toggle nsfw on and off	2012-02-08 17:21:29 -08:00
Maxwell Salzberg	a9b6426323	Merge pull request #2839 from diasp/2036-fix-private-messages-navigation ... #2036 Fix private messages are sometimes displayed without navigation	2012-02-08 16:59:50 -08:00
danielgrippi	84eb313e20	updated routes to reflect page titles (explore/participate)	2012-02-08 14:40:28 -08:00
Alex Harrison	0cbdf51e6a	#2847 Users can now toggle nsfw on and off	2012-02-08 23:01:02 +01:00
danielgrippi	8fb3ad710f	fix jasmine	2012-02-08 10:34:21 -08:00
Diaspora Europe	e4e1362ff5	added spec for redirect to conversations_controller_spec	2012-02-08 16:53:48 +01:00
danielgrippi	a819f38b99	touch interacted_at on Post#after_create	2012-02-07 21:32:10 -08:00
Dennis Collinson	a72a09a24c	posts made by nsfw people are marked nsfw by default	2012-02-07 19:37:38 -08:00
Dennis Collinson	558ceec92a	a user can mark themselves as nsfw	2012-02-07 19:03:20 -08:00
Maxwell Salzberg	cb23b2d5b7	make jasmine happy, by just refrencing the template package we already create	2012-02-07 15:35:42 -08:00
Maxwell Salzberg	f141537d0d	jasmine ci does not need to re-load jammit, so we can rescue out of any failures in the auto-reload patch	2012-02-07 14:07:50 -08:00
Florian Staudacher	d965016cf6	added intentionally failing specs, because dirty input breaks bookmarklet ... see also #2741 #2751 #2800	2012-02-07 21:47:53 +01:00
danielgrippi	fafa74a222	fix spec, mustache scoping issue in partial.	2012-02-05 21:23:45 -08:00
danielgrippi	7d60d96132	set handlebars compiler in jammit config.yml (handlebars worries about maintaining a compilation cache, we don't have to do this manually.) [ci skip]	2012-02-05 21:18:34 -08:00
danielgrippi	39ff47150b	allow jammit to serve up our handlebars templates, making them cacheable! added bonus: changing a handlebars template now doesn't involve re-running rspec to regenerate them. zing.	2012-02-04 15:50:36 -08:00
Dennis Collinson	3991903b56	MS DG DC Participate stream that has things bubble to the top	2012-02-03 17:23:57 -08:00
danielgrippi	a3e13e3c0e	User#like! method.	2012-02-03 14:42:03 -08:00
Steven Fuchs	ef7dc1c017	update aspect name in page listing after editing.	2012-02-03 08:37:35 -05:00
Dennis Collective	6dbd644b01	Merge pull request #2719 from stwf/return-contact-popup-to-notify ... aspects popup menu missing from 'started sharing' notifications	2012-02-03 00:42:10 -08:00
danielgrippi	4f7dda6012	bang! kill redis cache.	2012-02-02 12:45:43 -08:00
Steven Fuchs	882853415b	commit test for new code that keeps count from going negative.	2012-02-02 11:26:58 -05:00
Steven Fuchs	532a49a56d	no need to generate notification fixtures at this point.	2012-02-02 10:45:42 -05:00
Sarah Mei	5c393e9e4f	Refactor relayable specs and add one for retracting the object. Is pending - not complete yet.	2012-02-01 19:46:31 -08:00
Sarah Mei	085d6552b3	Drop comments, likes, and PMs from people who the (post/conversation) owner is ignoring.	2012-02-01 17:52:11 -08:00
danielgrippi	310a0679f1	particpate stream, yo!	2012-02-01 16:05:16 -08:00
danielgrippi	02021584a7	EvilQuery for Participation, refactor comment creation ... you can now create a comment with User#comment!(post, text)	2012-02-01 15:09:31 -08:00
Sarah Mei	7389b895d6	Fix #2799 - bullet points in a post that has 'read more'	2012-02-01 14:31:07 -08:00
Steven Fuchs	77fc4b6cab	moved tests from jasmine to controller specs	2012-01-31 13:58:41 -05:00
Jonne Haß	7a8bd7595b	do not auto follow back if already sharing	2012-01-31 14:34:09 +01:00
Steven Fuchs	487c404d0d	incorporated suggested improvements to spec.	2012-01-29 19:51:18 -05:00
Steven Fuchs	62dd2fc642	moved notifications view tests out of backbone area.	2012-01-29 19:29:51 -05:00
Steven Fuchs	5ea4bc0a1b	Merge remote branch 'upstream/master' into return-contact-popup-to-notify	2012-01-29 18:13:30 -05:00
Steven Fuchs	5d15fa43b5	take url shortening into effect before truncating twitter posts	2012-01-29 17:42:17 -05:00
Sarah Mei	e4fa8d8466	Fix tags_helper, add specs	2012-01-29 11:46:51 -08:00
Jonne Haß	f674494d2a	todo better id/guid switching hack needed	2012-01-29 15:15:24 +01:00
Jonne Haß	0e7b084713	fix 500 in PostsController#show for non existing post	2012-01-29 14:47:51 +01:00
Sarah Mei	38908396f5	Fix stream view spec to look for different things on FF and on webkit. Sigh.	2012-01-29 00:09:56 -08:00
Maxwell Salzberg	13d1e68540	refactor people#index	2012-01-28 23:48:37 -08:00
Sarah Mei	0e242c3e0a	Fix one spec on FF; pendingify the other until I can figure out what's going on. Seems to be different behavior of the expander plugin across chrome and FF.	2012-01-28 23:35:26 -08:00
Sarah Mei	1f710232d8	Clicking 'read more' now removes the link and collapses the adjacent paragraphs. Also: hella semicolons. Fixes #2766	2012-01-28 22:29:43 -08:00
Sarah Mei	0e0d40d00e	Remove pagination from json format of contacts#index; add explanatory comments. I KNOW. But it's super confusing and I can't find a way to rewrite the code to be more clear. Soloing FTL.	2012-01-28 15:31:11 -08:00
Jonne Haß	2d98c57cf1	[ci skip] The real issue with GnuTLS is actually a flaw in OpenSSL ... which accepts several server misconfigurations OpenSSL is very liberal about the order and content of the supplied cert chain. GnuTLS however is very crucial about it. So to support GnuTLS we need to tell our community to fix their servers (joindiaspora.com is broken too). You can check it with gnutls-cli -V --x506cafile=/etc/ssl/ca-certificates.crt $domain It will print the certs in the order received and say at the end if it could be verifed. Note that not only the order is important but also the content. Many example configurations, especially for Nginx, include the root cert of the CA in the chain which is wrong. Note from a GnuTLS maintainer: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=%23573736#29 Revert "Fix federation with GnuTLS by passing the ca_file to Typhoeus" This reverts commit 640a0181ab.	2012-01-29 00:08:28 +01:00
Sarah Mei	3ec09930fe	Refactor contacts#index specs. json requests now paginate correctly, but infinite scroll is still broken.	2012-01-28 14:43:47 -08:00
Sarah Mei	d40746bff7	Fixes #2713 - searching for punctuation now doesn't throw a 500. Refactored people#index specs.	2012-01-28 13:45:39 -08:00
danielgrippi	f250b79105	post owners can now delete any comments on their own posts. fixes #2652	2012-01-27 18:24:46 -08:00
Jonne Haß	640a0181ab	Fix federation with GnuTLS by passing the ca_file to Typhoeus ... How did this ever work? Anyway Diaspora now works with libcurl4-gnutls-dev which already supports SNI in most distributions and is also the default for many distros. Everybody should switch to it. Do so by installing it and then do a gem uninstall typhoeus followed by a bundle to compile it with GnuTLS	2012-01-28 01:41:53 +01:00
danielgrippi	410f2d436f	fix jasmine	2012-01-27 16:09:45 -08:00
danielgrippi	31bfef9dd2	pass in service_type strings instead of objects to deferred_dispatcher.	2012-01-27 16:05:38 -08:00
Maxwell Salzberg	c69df0fb29	fix photos controller test	2012-01-27 13:06:27 -08:00
Maxwell Salzberg	c100f8bfdd	clean up Person scopes, and re-use one in contact controller to deprecate a controller method	2012-01-27 02:23:38 -08:00
danielgrippi	a3d596a853	DG MS; only fetch contacts when focused in on Publisher.input(); limit autocomplete; added uma back; fixed jasmine tests.	2012-01-26 18:51:02 -08:00
danielgrippi	005b165e87	defer dispatching to help app processes not bloat in memory	2012-01-26 13:24:53 -08:00
Jonne Haß	e1658f8d8b	switch PhotosController#index over to guid, fix #2729	2012-01-25 12:45:02 +01:00
Jonne Haß	9c67cd7eb9	collapse Post#last_three_comments and Commentable#last_three_comments, do not double query comments in CommentsController#index for a JSON response, remove spec that tests ordering as it's not deterministic on psql without specified order	2012-01-25 12:44:50 +01:00
Steven Fuchs	5f705775cd	spec to generate some notification fixtures and jasmine specs to test them. Notably making sure that start sharing items have an aspects popup menu.	2012-01-24 23:04:35 -05:00
danielgrippi	eaed3505e4	Don't create share_visibilities for public posts, sans migration of deleting old data.	2012-01-24 16:49:07 -08:00
Jonne Haß	100625d18c	fix people and person specs for the guid stuff on psql	2012-01-24 23:02:07 +01:00
Daniel Grippi	89472992cc	Merge pull request #2720 from MrZYX/people_slash_guid ... use guid instead of id for /people/ urls	2012-01-24 13:14:08 -08:00
Jonne Haß	6f283632c5	fix resharing a reshare, javascript isn't ruby :P	2012-01-24 19:44:45 +01:00
Jonne Haß	19785d909b	ensure services is an array in StatusMessagesController#create ... This fixes posting to a single service for Ruby 1.9 For some reason Rails doesn't convert a single foo[]=bar not to the expected :foo => ["bar"] but to :foo => "bar" On Ruby 1.8 String#map exists and just yields self, on Ruby 1.9 String#map got removed	2012-01-24 18:54:36 +01:00
Jonne Haß	51d1bbbd70	app.user returns false instead of undefined if logged out, fix #2723	2012-01-24 11:56:48 +01:00
Dennis Collinson	870ad3d9f7	DC DG; some fixes, mentioning works.	2012-01-23 19:32:15 -08:00
Jonne Haß	7aaaf4f43b	use guid instead of id for /people/ urls	2012-01-23 23:35:31 +01:00
danielgrippi	3a76490640	window.app.user() doesn't return attributes nested in a key; added a comment_view spec	2012-01-22 23:37:13 -08:00
Daniel Grippi	2c50de0726	Merge pull request #2714 from stwf/im-sorry-bye-vanna ... Remove Vanna Controller from app and fix up notifications controller, views, scripts, specs	2012-01-22 22:15:14 -08:00
danielgrippi	5d15c53f6b	Revert "Revert "now using handlebars for client side templates" for now" ... This reverts commit 5f9c469b12.	2012-01-22 22:01:57 -08:00
Dennis Collinson	5f9c469b12	Revert "now using handlebars for client side templates" for now ... This reverts commit 4692055d8a.	2012-01-22 17:16:22 -08:00
Dennis Collinson	4692055d8a	now using handlebars for client side templates	2012-01-22 16:59:44 -08:00
Steven Fuchs	e882dedd33	remove vanna controller from app, adjust scripts, specs, views and controllers to work.	2012-01-22 17:39:35 -05:00
Sarah Mei	872a96dc71	Refactor services controller spec	2012-01-22 08:28:23 -08:00
Maxwell Salzberg	49f18d435a	upgrade factory girl there are 3 failing cukes.	2012-01-21 21:58:50 -08:00
danielgrippi	cc1ac843cc	re-added widget; fixed tests; use _.throttle instead of depricated custom debounce	2012-01-21 20:23:00 -08:00
danielgrippi	c3b9bb9a9a	expanding likes works again	2012-01-21 18:55:07 -08:00
danielgrippi	9e3521396d	clear new comment on submit; include the newer autoexpander in jasmine	2012-01-20 21:58:07 -08:00
danielgrippi	25d0f0d87f	updated jquery autoResize; comment boxes now expand	2012-01-20 21:45:55 -08:00
Steven Fuchs	9836860ca3	Merge remote branch 'upstream/master' into im-sorry-bye-vanna	2012-01-20 12:23:45 -05:00
danielgrippi	356494b78b	DG DC; $("window") doesn't actually work in the binding scenario	2012-01-19 17:16:58 -08:00
danielgrippi	750e26e8fb	Merge branch 'stream-js-cleanup' ... Conflicts: public/javascripts/app/models/stream.js	2012-01-19 17:07:17 -08:00
danielgrippi	b583a7a444	Put dennis's changes back in ... Revert "Revert "refactoring backbone urls"" This reverts commit 838da1fd52. Revert "revert 9b1d64bb76 as it is causing inf. scroll to break (stream model now has a post collection)" This reverts commit 2a69c0ebd4.	2012-01-19 17:05:30 -08:00
danielgrippi	c219cee97d	fix inf scroll issues in stream view	2012-01-19 17:01:45 -08:00
Maxwell Salzberg	0ce0e47ff8	fix #2698; allow a user to delete a reshare of a deleted post	2012-01-19 15:24:07 -08:00
Maxwell Salzberg	838da1fd52	Revert "refactoring backbone urls" ... This reverts commit 4ad58bdf2f.	2012-01-19 14:20:31 -08:00
Maxwell Salzberg	2a69c0ebd4	revert 9b1d64bb76 as it is causing inf. scroll to break (stream model now has a post collection)	2012-01-19 11:18:13 -08:00
Dennis Collinson	9b1d64bb76	stream model has a posts collection	2012-01-18 19:08:36 -08:00
Dennis Collinson	4ad58bdf2f	refactoring backbone urls	2012-01-18 19:08:36 -08:00
danielgrippi	5721c9e512	remove depricated methods	2012-01-18 13:29:43 -08:00
Maxwell Salzberg	38ad76d9c7	rewrite webfinger client and specs; now this is much easier to maintain.	2012-01-18 01:21:28 -08:00
Maxwell Salzberg	392e317962	fix person spec	2012-01-17 22:10:03 -08:00
Maxwell Salzberg	bfde0514bf	fix webfinger specs	2012-01-17 21:43:46 -08:00
Maxwell Salzberg	22bd70664f	fix post spec	2012-01-17 21:12:47 -08:00
Maxwell Salzberg	254860bddc	SM MS; Read email sent to diaspora-dev for more information about this ... commit. Add migration and rake task to copy hidden information from share_visibilities to users. see: http://devblog.joindiaspora.com/?p=44	2012-01-17 19:29:01 -08:00
Maxwell Salzberg	b09e76a0ce	introduce base_pod_uri, so we can support domains that use www and [bare] with webfinger	2012-01-17 17:34:42 -08:00
Dennis Collinson	9cde06a628	You can now like "reshares", stream is polymorphic	2012-01-17 17:22:56 -08:00
Steven Fuchs	36fd43db4c	incorporated improvements from @maxwell from last pull request.	2012-01-17 19:27:48 -05:00
Steven Fuchs	a11c8d8a96	javascripts for marking notifications items as unread on both the notifications page and popup menu.	2012-01-17 19:20:42 -05:00
danielgrippi	fdc0b681eb	remove unused api serializers (cruft)	2012-01-17 16:03:24 -08:00
danielgrippi	339c47d782	moved stream logic into its own controller (StreamsController)	2012-01-17 15:53:06 -08:00
danielgrippi	bfe0b7129c	move all stream actions into PostController	2012-01-17 15:53:06 -08:00
Maxwell Salzberg	6e02f61395	MS remove custom resque job logging as it is making heroku very sad	2012-01-16 20:25:56 -08:00
Dennis Collinson	66d71a217e	you should be able to reshare reshares again, first pass	2012-01-16 19:56:52 -08:00
Maxwell Salzberg	d5563d8802	TT MS; fix a bug when the mention string is not actually in the mentions	2012-01-16 15:59:40 -08:00
danielgrippi	8150d32b86	using pageDown Markdown library, fixing autolinking. created app.helpers.textFormatter, which takes care of text formatting; functions can be called individually throughout the app	2012-01-15 18:28:58 -08:00
danielgrippi	177f608276	fix oembed issues in backbone land	2012-01-15 15:56:34 -08:00
danielgrippi	9d2b1e9415	actually clear photos from the publisher. also, i hate the photo uploader we're using.	2012-01-14 15:40:44 -08:00
danielgrippi	91e3f5f6ff	remove cache counter for photos, as it was causing too many edge-case errors & added complexity across models	2012-01-14 15:40:43 -08:00
Jonne Haß	5d0223601b	fallback to english pluralization rule if none is found	2012-01-14 21:26:01 +01:00
Maxwell Salzberg	35676cddac	fix #2627 (webfinger produces 500 error, and refactor a little to encapsulate into Webfinger object a bit more	2012-01-14 00:40:42 -08:00
danielgrippi	240d595714	removing photos_count method from StatusMessage in hopes of fixing the counter (still a bit confused, though...)	2012-01-13 23:33:59 -08:00
Maxwell Salzberg	a955f06762	try loading app config in spec_helper to prevent bad fixtures from being generated	2012-01-13 23:15:32 -08:00
Maxwell Salzberg	9dbe644b25	fix app_config spec	2012-01-13 15:03:44 -08:00
danielgrippi	efe55f395d	remove ajax_stream? logic from streams now that we're using backbone & never ajaxing on mobile; remove unreferenced community_spotlight stream & controller	2012-01-13 13:50:52 -08:00
Jonne Haß	9a9cc8d826	remove spec for aspect_memberships#update too (move_contact)	2012-01-13 22:46:32 +01:00
danielgrippi	aed413b463	remove unused method and controller action (move_contact)	2012-01-13 12:15:32 -08:00
Dennis Collinson	9b8afba9cf	metaprogram template addition	2012-01-12 19:41:39 -08:00
Dennis Collinson	dec3006b50	DH DC don't render feedback view on public posts	2012-01-12 17:47:03 -08:00
Dennis Collinson	33772a27d9	cleanup alert spec	2012-01-12 17:47:03 -08:00
Dennis Collinson	7b1d7b8ac9	small refactor	2012-01-12 17:47:02 -08:00
Maxwell Salzberg	258d55df51	fully reset app_config spec to prevent test polution	2012-01-12 16:11:41 -08:00
Maxwell Salzberg	408bafca09	add/refactor normalize_pod_services so configured services is always defined regardless if SERVICES are set up	2012-01-12 15:04:14 -08:00
danielgrippi	1efce2cede	Revert "Merge pull request #2547 from stwf/unread_notifications" ... This reverts commit c61e84bc50, reversing changes made to b88899ff2a.	2012-01-11 12:11:00 -08:00
danielgrippi	bee8aa8bcd	remove unused files/methods	2012-01-11 02:26:12 -08:00
danielgrippi	0e5bb81d66	remove all references to the websocket. bang bang.	2012-01-10 12:28:19 -08:00
Daniel Grippi	c61e84bc50	Merge pull request #2547 from stwf/unread_notifications ... Allow users to click on read notifications to mark them as unread	2012-01-10 10:46:26 -08:00
Steven Fuchs	176797628e	javascript tests for the notification click callback routine.	2012-01-10 00:07:42 -05:00
danielgrippi	c11fdb0459	put 'Admin' back in #user_menu for admins. this fixes #2595 [ci skip]	2012-01-08 23:43:17 -08:00
danielgrippi	a1cf279226	support twitter hashbangs in urls for url parsing [ci skip]	2012-01-08 17:35:56 -08:00
danielgrippi	5e65c88bd8	better regex for capturing urls (sensitive to urls in tags) [ci skip]	2012-01-08 17:06:25 -08:00
Maxwell Salzberg	232c4b7931	fix for mobile multi stream [ci skip]	2012-01-07 23:31:17 -08:00
danielgrippi	b5dea63774	larger buffer for autoscroll	2012-01-07 21:25:02 -08:00
danielgrippi	a899e71ce5	switch order of auto-linking	2012-01-07 21:19:13 -08:00
danielgrippi	ad2e6a414f	autolink urls in content view	2012-01-07 20:47:30 -08:00
danielgrippi	c9c7cff479	don't fetch more posts from the stream if only one post has been returned	2012-01-07 19:59:33 -08:00
danielgrippi	e928cc805a	fixed markdown issues with reshares; removed puts from specs	2012-01-07 17:33:16 -08:00
Dennis Collinson	8fa6c46de2	DG DC more hashtag fixes, throw in mention clearing cowboy style	2012-01-07 14:24:28 -08:00
Dennis Collinson	daba42c857	mentions now render client side, wow	2012-01-07 14:24:28 -08:00
Dennis Collinson	b13e72bc00	spec fix for markdown	2012-01-07 14:24:28 -08:00
danielgrippi	0fb1bf5d4b	hash tags are linked on the front end, adding markdown.js file	2012-01-07 14:24:27 -08:00
danielgrippi	fd6e3bae62	move timeago and tooltip logic to the base View	2012-01-07 14:24:27 -08:00
danielgrippi	d2807b5202	markdown for posts on front end, tags broken	2012-01-07 14:24:27 -08:00
danielgrippi	2024716c2c	remove unusued javascript files; GC clearing from application/vanna controller	2012-01-07 14:24:27 -08:00
danielgrippi	24950bd364	restored ability to 'unlike'	2012-01-07 14:23:28 -08:00
danielgrippi	f72edbc039	added notification and unread mesasge count back to the header	2012-01-07 14:23:28 -08:00
danielgrippi	933299e31c	added translations to templates; mock out the locale file in jasmine	2012-01-07 14:23:28 -08:00
danielgrippi	a92401f157	prevent further pagination if user has fetched all posts for a given stream	2012-01-07 14:23:28 -08:00
Dennis Collinson	d5e9c5eebc	DG DC add stream faces to page party	2012-01-07 14:23:28 -08:00
Dennis Collinson	b582f45452	green jasmine, yo	2012-01-07 14:23:28 -08:00
Dennis Collinson	9d24b518f5	DC DG; correctly populate the stream jasmine fixture	2012-01-07 14:23:28 -08:00
danielgrippi	dbfb18e249	display reshare counts; test inf scroll & reshare counter in jasmine instead of cucumber	2012-01-07 14:23:27 -08:00
danielgrippi	31fac53969	added blocks js model; load app.models.Post before any other model when loading assets	2012-01-07 14:23:27 -08:00
danielgrippi	5e88ca846a	remove jquery-debounce in lieu of _.debounce; remove web_socket vendor libs	2012-01-07 14:23:27 -08:00
danielgrippi	5bbe8bfccd	remove Mustache.js, use _.template as a replacement (we only want to use one js templating library)	2012-01-07 14:23:27 -08:00
danielgrippi	1e20ca0cf5	remove old js files, specs; remove stream references in page js initializers	2012-01-07 14:23:27 -08:00
danielgrippi	85b5974fa9	removed top-level element delcarations from app templates	2012-01-07 14:23:27 -08:00
danielgrippi	64a90a30ef	only load photos for a post if photos_count > 0; display 'limited' or 'public' in stream elements; fix small like bug in stream	2012-01-07 14:23:27 -08:00
danielgrippi	71bae10317	fixed notification specs; removed a cuke around reshares already tested in jasmine	2012-01-07 14:23:27 -08:00
danielgrippi	565a0b21f7	fix .avatar declaration in the header template; make socketing always return nil straight away (we are not using the websocket in this branch, and it makes everything faster when it's off)	2012-01-07 14:23:26 -08:00
danielgrippi	3268726a9a	added LikesInfo view; simplified Feedback view (not sure how to mock the jasmine specs correctly... ugh)	2012-01-07 14:23:26 -08:00
danielgrippi	4fabbe93a5	fix ResharesController / StatusMessage controller spec; remove another js response	2012-01-07 14:23:26 -08:00
danielgrippi	719e265b68	modified app to return a hash if current_user is not present; removed view specs in postsController specs & moved logic to js/jasmine	2012-01-07 14:23:26 -08:00
danielgrippi	0a4b4fb344	remove duplication in jasmine tests (Post view / Feedback view); one correclty failing jasmine spec for Feedback view; created a StatusMessage model for the publisher	2012-01-07 14:23:26 -08:00
danielgrippi	02ca7a32f0	added reshare logic back (doesn't append it to the stream...)	2012-01-07 14:23:25 -08:00
danielgrippi	027bb3dee7	removed content-updater widget; better tests around likes on feedback widget; extend the defaultPresenter return value instead of passing the function in Feedback view	2012-01-07 14:23:25 -08:00
danielgrippi	4029b26c03	created publisher view; wip	2012-01-07 14:23:25 -08:00
danielgrippi	1a5e493b22	downcase namespacing of app	2012-01-07 14:23:25 -08:00
danielgrippi	21eba82e76	moved all jasmine fixture building into spec/controllers/jasmine_fixtures/	2012-01-07 14:23:25 -08:00
Dennis Collinson	f5609f2182	App views base renders subviews like magic	2012-01-07 14:23:24 -08:00
danielgrippi	31d24c60c7	added spec for .like_action link being rendered; added comments div back to stream_element for now	2012-01-07 14:23:24 -08:00
danielgrippi	1b8f78e006	remove sort order logic from controllers; backbone stream does not support it; was to be depricated anyway	2012-01-07 14:23:24 -08:00
danielgrippi	734f01402a	remove double fixture rendering	2012-01-07 14:23:24 -08:00
danielgrippi	1ffdfa8465	DC DG; created feedback view; moved jasmine fixtures; modified jasmine spec helper; jasmine is green	2012-01-07 14:23:24 -08:00
danielgrippi	67e56dce2c	backbone view for header; moved user dropdown logic in there; moved jasmine specs over; removed old widget	2012-01-07 14:23:23 -08:00
danielgrippi	c6e4172926	fixed likes_controller; half of the failing jasmine tests	2012-01-07 14:23:23 -08:00
Dennis Collinson	a7627fabea	pulling more view logic into superclass	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	525fd3c4e4	make views associated in stream inherit from App.Views.StreamObject (location of shared deletion function)	2012-01-07 14:23:22 -08:00
danielgrippi	ffae0f8e85	added more jasmine spec; NSFW wip	2012-01-07 14:23:22 -08:00
danielgrippi	cec2d27204	ported likes logic for the stream over from old branch	2012-01-07 14:23:22 -08:00
danielgrippi	bc1ffd317e	reference 'el' explicitly (render methods now return this instead of this.el); comment area focusing working again	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	34e3403e2e	jasmine green again; template switching in place, defaulting to displaying post text	2012-01-07 14:23:21 -08:00
Dennis Collinson	8e3db3aebe	make jasmine view tests work, load templates, party	2012-01-07 14:23:21 -08:00
danielgrippi	52e3f1b240	DC DG; test stream view WIP	2012-01-07 14:23:21 -08:00
danielgrippi	1d178116e9	DC DG; jasmine green	2012-01-07 14:23:21 -08:00
Dan Hansen	80f797a581	introduce comments	2012-01-07 14:23:21 -08:00
Dan Hansen	ba9ece0014	Use routers, remove some hacks	2012-01-07 14:23:21 -08:00
Maxwell Salzberg	68f25c8d4e	fix app_config spec as we broke out setup into its own method	2012-01-05 19:05:13 -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	71b58fa6fc	only queue process_photo jobs if the owner is local. this should cut down on some resque errors	2012-01-04 00:08:29 -08: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	43090d38eb	AppConfig in heroku can now read array variables	2012-01-03 16:18:51 -08:00
robhogg	6571ec2fa9	Added test for nsfw?	2012-01-02 21:24:44 +00:00
danielgrippi	176a33880f	fix all specs minus one from o_embed_data_spec	2011-12-31 14:19:54 -05:00
Daniel Grippi	27f580f241	Merge pull request #2560 from memarko/patch-3 ... Update spec/controllers/tag_followings_controller_spec.rb	2011-12-30 18:21:51 -08:00
Sarah Mei	6236fd22a0	Found 3 spec files that were never getting run because they didn't have the _spec at the end of the filename. This commit renames them, so that they are now included in rake spec. Unsurprisingly, they all fail. Since they represent actual changing code that isn't tested, I'm checking them in anyway. Thx Pistos for pointer to the first file, which prompted me to look for others.	2011-12-27 14:48:39 -08:00
memarko	399bdb885e	Update spec/controllers/tag_followings_controller_spec.rb	2011-12-26 21:51:02 +01:00
memarko	360e041bf6	Update spec/controllers/tag_followings_controller_spec.rb	2011-12-26 19:01:27 +01:00
Steven Fuchs	f72a4b4476	notifications controller should return the guid and unread state of the updated notification	2011-12-23 22:58:01 -05:00
Jonne Haß	d063db42aa	fix app config spec	2011-12-24 00:04:04 +01:00
Steven Fuchs	a1d474111b	controller now only accepts string values for unread.	2011-12-23 15:35:07 -05:00
Steven Fuchs	f3486e831f	changes is_unread parameter to unread	2011-12-22 22:57:05 -05:00
Steven Fuchs	f2be6e8bcf	controller can accept a parameter as to whether the notification should be marked as read or unread	2011-12-22 15:20:48 -05:00
Maxwell Salzberg	22d5e913cc	remove splunk logging	2011-12-21 14:24:03 -08:00
danielgrippi	0f42c98a7b	merge Pistos's reshare branch into master	2011-12-20 14:42:18 -08:00
danielgrippi	e9b6da605f	fix specs; move presence_of_content validation check into a before_destory to play nicely with federation	2011-12-20 10:42:30 -08:00
Pistos	f83e56e5f3	Added a counter cache for the number of reshares of a post.	2011-12-19 17:12:17 -05:00
Pistos	a604dd2aa6	Refactor implementation of #reshare_count. ... The old implementation which uses Post.where causes undefined method `abstract_class?' for Object:Class in spec/controllers/posts_controller_spec.rb. Not sure whether that's a problem with Rails, or rspec, or what.	2011-12-19 17:12:17 -05:00
Pistos	51566ebe0b	Improve wording of error message in Reshare#root_must_be_public validation.	2011-12-19 17:12:17 -05:00
Pistos	a9c6905e29	Made spec text correspond to actual text tested.	2011-12-19 17:12:17 -05:00
Pistos	99f2d4f018	Original (root) posts should simply have "Reshare" as the English link text (not "Reshare original").	2011-12-19 17:12:17 -05:00
Pistos	90d960bac7	Some reshare_link specs.	2011-12-19 17:12:17 -05:00
Vittorio Cuculo	0e77fcb084	Fix #2488 soundcloud embedding	2011-12-19 09:50:39 +01: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	afb5e5e7f0	fix json in aspects controller spec	2011-12-11 03:35:19 +01:00
Jonne Hass	77d850f492	fix jasmine:ci	2011-12-11 02:43:04 +01:00
Jonne Hass	57661fe9dd	fixed a couple of specs	2011-12-11 02:08:38 +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
danielgrippi	fb39a1e16d	fix account deletion specs	2011-12-09 17:51:45 -08:00
Maxwell Salzberg	7bf1970dd8	adding account deletion factory, fixed a user spec	2011-12-08 16:32:20 -08:00
Maxwell Salzberg	70dcc5becc	rebased this branch onto master	2011-12-08 16:32:20 -08:00
Ilya Zhitomirskiy	1552b5bcc2	keep the pivate key, required for retries	2011-12-08 16:32:19 -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	7667029e71	wip, stated the serialized model	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
danielgrippi	e6ed2d397a	added close account to user	2011-12-08 16:32:18 -08:00
danielgrippi	cd6f97fa0e	DG IZ; remove authorizations from user; double check that aspect_visibilities are deleted	2011-12-08 16:32:18 -08:00
danielgrippi	644e382cfd	DG IZ; remove more stuff associated with user; removed dependant destroys	2011-12-08 16:32:18 -08:00
Ilya Zhitomirskiy	3035f173bd	ms iz wip, clearing profile, started deleting post visibilities	2011-12-08 16:32:18 -08:00
Ilya Zhitomirskiy	05612ef733	ms iz wip	2011-12-08 16:32:18 -08:00
Maxwell Salzberg	2282fd35d1	kill no longer used youtube titles code with fire	2011-12-08 16:16:57 -08:00
Pistos	a5d1657fbd	Repair posts_controller_spec.rb by refactoring them a bit. Rspec was being finnicky or something?	2011-12-08 15:35:16 -05: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
Jonne Hass	a892ea41eb	refactor out profile url generation into local_or_remote_person_path and use it everywhere. closes #2471	2011-12-06 13:08:21 +01:00
Daniel Grippi	0d41c9c5f3	update gems -- mainly omniauth (we explicitly include omniauth libs now... much cleaner)	2011-12-05 19:53:03 -08:00
Gonzalo Rodriguez	3c74f3d848	Failing spec for empty search bug #2427	2011-12-03 21:19:58 -02:00
Johannes Hackel	4b25545e82	fix sql error	2011-12-02 15:03:15 +01:00
Sarah Mei	4db288bc65	Check order of generation and use of host-meta fixture on travis	2011-11-30 20:55:59 -08:00
Sarah Mei	2518987538	Try doing join differently for travis	2011-11-30 20:23:48 -08: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
Johannes Hackel	23fa7a0a3e	like stream new	2011-11-29 17:27:09 +01:00
danielgrippi	09d8726555	fix spelling error in spec	2011-11-28 10:02:06 -08:00
Johannes Hackel	ef28e89809	people_controller_spec	2011-11-23 23:45:09 +01:00
Johannes Hackel	0c1be5002d	end	2011-11-23 08:00:08 +01:00
Johannes Hackel	66acd7db14	specs, stay on page	2011-11-22 12:54:19 +01:00
Johannes Hackel	7368bb9e62	comment_stream	2011-11-20 18:37:10 +01:00
Manuel	1c9a96e2aa	Fixed relayable specs	2011-11-20 01:06:45 +01:00
danielgrippi	6be778b9b2	change root_path and root_url to multi_path	2011-11-14 18:01:09 -08:00
Sarah Mei & Tim Frazer	a6f11e86dc	Merge branch 'master' of https://github.com/diaspora/diaspora	2011-11-14 17:42:14 -08:00
Sarah Mei & Tim Frazer	409a6aebc7	Fix invitation controller spec on postgres	2011-11-14 17:41:54 -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
Kevin Fitzpatrick & Tim Frazer	84e4866e6b	Merge branch 'master' of github.com:diaspora/diaspora	2011-11-14 12:33:10 -08:00
Kevin Fitzpatrick & Tim Frazer	96f2aaa57a	Background sending password reset instructions.	2011-11-14 12:30:47 -08:00
Jonne Hass	226554becf	auto follow back feature	2011-11-14 20:25:11 +01:00
Pistos	05b1e2fc19	Fixed issue #2380 : No more 500 error when following an unnormalized version of an existing tag. ... e.g. if "test" exists and you try to follow "Test".	2011-11-13 23:26:53 -05:00
Jonne Hass	b3142ac208	redirect to sign in page from photo#show on a private photo when user isn't signed in	2011-11-10 22:44:12 +01:00
Jonne Hass	4f993b3d24	fix jasmine spec	2011-11-10 18:15:23 +01:00
Pistos	31b43f315e	Corrected the message length spec.	2011-11-09 21:35:16 -05:00
Pistos	e5d37c7949	Whitespace cleanup.	2011-11-09 21:35:08 -05:00
Daniel Grippi	319d72deb9	Merge pull request #2345 from 21echoes/higher_post_limit ... higher post limits	2011-11-09 16:11:39 -08:00
Maxwell Salzberg	57989cb98e	fix final tag stream spec	2011-11-08 13:56:34 -08:00
Jonne Hass	0a29408497	fixed order dependent spec	2011-11-08 12:03:17 +01:00
David Kettler	74bcc6f06e	now that we have the 'read more' link in the stream, let posts be as long as the mysql character limit	2011-11-07 21:21:36 -08:00
Maxwell Salzberg	fe3fe0f5cc	MS SM save sync cache if you have some sort of contacts	2011-11-07 19:52:48 -08:00
danielgrippi	6f7c9e9301	Remove resque_rescheduler as it was killing our app servers (receiving ... http requests). Revert "retry less" This reverts commit 7784156e3b. Revert "supress resque retries" This reverts commit 80cdcd4edd. Revert "Retry federation if remote pod is down" This reverts commit bcbc86e502. Conflicts: app/models/jobs/http_multi.rb	2011-11-07 12:50:02 -08:00
danielgrippi	b53df6dd4d	repopulating the redis cache should clear the entire set first	2011-11-07 11:28:29 -08:00
danielgrippi	fd76cfd4c5	fix construct_shareable_from_others_query to only include posts from contacts within your aspects	2011-11-07 10:52:31 -08:00
Pistos	39f876824a	Specify a fixture path relative to Rails.root to appease the Travis.	2011-11-07 00:32:18 -05:00
Pistos	02fa065571	Whitespace cleanup.	2011-11-07 00:32:17 -05:00
Sarah Mei	f1d669a024	Delete all pending specs except stuff we actually want to fix in the short term. Add more useful comments to those.	2011-11-06 21:29:22 -08:00
Sarah Mei	0fc43b580b	Remove some empty files. If you're gonna scaffold, plz remove empty files before committing kkthx.	2011-11-06 20:27:36 -08:00
Sarah Mei	dbc68e69b7	Merge branch 'master' of github.com:diaspora/diaspora	2011-11-06 20:20:36 -08:00
Sarah Mei	4fba9a6989	get rid of all pending specs except the one that is actually pending	2011-11-06 20:20:27 -08:00
Pistos	14842c1b43	Merge remote-tracking branch 'johnedmonds/issue1144'	2011-11-06 22:21:53 -05:00
Sarah Mei	53dbbfbb15	Fix order-dependent test that would sometimes fail on postgres	2011-11-06 19:10:26 -08:00
Sarah Mei	db223b2a3f	Rename and make pending the spec for populating the cache	2011-11-06 12:52:01 -08:00
Jonne Hass	af1558831b	Improved reshare receive ... - Do not error out on Reshare#fetch_post/after_parse if we get a 404 - Do error out if another error happens in Reshare#fetch_post/after_parse - Retry failling receive jobs a few times	2011-11-06 18:26:10 +01:00
Jonne Hass	9ffeef9d20	Merge branch 'new_user_language' of https://github.com/alda519/diaspora	2011-11-06 15:17:05 +01:00
Jonne Hass	7556dccb91	test that photosController#index succeeds without any photos	2011-11-06 14:47:28 +01:00
Sarah Mei	c30e3ee362	Merge branch 'master' of github.com:diaspora/diaspora	2011-11-05 19:58:25 -07:00
Sarah Mei	2143e0f9ba	Refactor regular expression used to find tags so that it supports unicode in both ruby 1.8 and ruby 1.9. NEVER SPEAK OF THIS AGAIN.	2011-11-05 19:57:51 -07:00
danielgrippi	c9f069d000	Revert "add participant_users to conversations" ... This reverts commit 655558cb95. Revert "MS DG; for real this time?" This reverts commit f85a047f6f. Revert "MS DG; actually fix the bug" This reverts commit cde12ec232. Revert "fix small commenting email bug #oops" This reverts commit a552fc80c0. Revert "dont ban diasporahq stuff" This reverts commit 2c12b94e67. Revert "Merge branch 'participants'" This reverts commit 7417801886, reversing changes made to abd211ba72.	2011-11-05 18:08:32 -07:00
Sarah Mei	3e70398c40	Run ostatus builder spec that sometimes causes nokogiri to segfault	2011-11-05 16:06:27 -07:00
Sarah Mei	92c28857b3	Refactor and backfill tags_following_controller_spec. Move normalize tag specs into model spec. Move rss fixture file into fixture directory.	2011-11-05 16:05:13 -07:00
Sarah Mei	1ecdba9bae	Fix facebook spec	2011-11-04 22:22:39 -07:00
Sarah Mei	0b329bf385	Fix notify local users spec	2011-11-04 22:16:55 -07:00
Sarah Mei	d17ecd6101	Fix user controller spec	2011-11-04 22:06:56 -07:00
Maxwell Salzberg	f85a047f6f	MS DG; for real this time?	2011-11-04 19:56:53 -07:00
Maxwell Salzberg	a552fc80c0	fix small commenting email bug #oops	2011-11-04 19:24:48 -07:00
Maxwell Salzberg	c3dc3d103b	include post author in participats	2011-11-04 18:46:43 -07:00
Maxwell Salzberg	95c206df24	MS DG add participants	2011-11-04 18:46:43 -07:00
Ilya Zhitomirskiy	41db42a7a4	displaying public tags in the multi stream	2011-11-04 18:14:34 -07:00
Dan Hansen & Maxwell Salzberg	3cfa0c4602	use the stream element partials for testing the StreamElement widget instead of Aspects#index	2011-11-04 18:40:24 -05:00
Ilya Zhitomirskiy	ecd2a52553	added a password field before account closure	2011-11-04 10:25:19 -07:00
Sarah Mei	f9a9654c86	Allow non-logged-in users to see public photos	2011-11-03 22:07:48 -07:00
danielgrippi	9ef0fbfe60	DG MS; fix last failing spec	2011-11-03 21:08:32 -07:00
danielgrippi	b56dc9205b	added ignore text on user pages if it applies	2011-11-03 12:31:25 -07:00
danielgrippi	07f713f46c	change 'mute' to 'ignore' for now; fix specs; repopulate cache upon ... contact removal	2011-11-03 12:31:24 -07:00
danielgrippi	5df6bc1adf	block user now removes a contact if user is blocking a contact	2011-11-03 12:31:24 -07:00
danielgrippi	ee5bc25faf	DH DG; don't display blocked people in stream; switch controls in stream; disallow blocking yourself	2011-11-03 12:31:24 -07:00
danielgrippi	ae7944418c	DH DG; made privacy page; can now unblock a user; users are actually being blockocked in ajaxed streams	2011-11-03 12:31:24 -07:00
Dan Hansen & Maxwell Salzberg	5b8365118d	Stream#posts no longer needs to call for_a_stream ... exclude blocked users from all streams	2011-11-03 12:31:24 -07:00
Dan Hansen & Maxwell Salzberg	0eb33b371b	blocked users works for multi stream, cuke passes ... fixed scoping stuff	2011-11-03 12:31:24 -07:00
Dan Hansen	16e76886d9	wip	2011-11-03 12:31:24 -07:00
Daniel Grippi	debf382fac	Merge pull request #2306 from Pistos/issue-2298-following-dot-tags ... Issue 2298 following dot tags	2011-11-02 21:29:48 -07:00
Pistos	78a96a18e4	This fixes issue #2298. ... Following a hashtag with a dot now no longer breaks the user's stream page. All unacceptable hashtag chars are stripped out, and the given tag is normalized before being followed.	2011-11-02 23:51:12 -04:00
Pistos	e885e8492f	Refactor / shuffle code in TagFollowingsController spec.	2011-11-02 20:46:04 -04:00
danielgrippi	995996add1	add spec & change syntax in http_multi	2011-11-02 15:00:30 -07:00
Daniel Grippi	ed029b2fbd	Merge pull request #2251 from manuels/retry_federations ... Retry federation if remote pod is down	2011-11-02 14:09:30 -07:00
Daniel Grippi	73d3bf46b3	Merge pull request #2300 from Pistos/issue-2213-hashtag-markdown-em-collision ... Issue 2213 hashtag markdown em collision	2011-11-02 13:23:55 -07:00
Pistos	0bb65e8718	Added extra spec to cover alleged bug case given in issue #2245 .	2011-11-02 09:23:05 -04:00
Pistos	3567423d98	Whitespace cleanup.	2011-11-02 09:22:49 -04:00
Pistos	db4bfb73a9	Fix issue #2213: multi-underscore hashtags no longer get Markdown <em>phasis applied.	2011-11-01 23:35:34 -04:00
Pistos	e912bf3eda	Whitespace cleanup.	2011-11-01 23:35:21 -04:00
danielgrippi	a61fd16a77	fix publisher spec	2011-11-01 17:07:57 -07:00
Daniel Grippi	bfb4ac4bb4	Merge pull request #2296 from Pistos/issue-2264-fix-tag-parsing ... Issue 2264 fix tag parsing	2011-10-31 22:43:28 -07:00
Pistos	b3853f48ed	Way more test coverage for Taggable.format_tags .	2011-11-01 01:27:36 -04:00
Pistos	24702b9f6a	Add many more hashtag regexp specs for Taggable#tag_strings . Make them pass.	2011-11-01 00:28:04 -04:00
Pistos	e123b72d35	Some empty lines to help bring the code structure out.	2011-10-31 23:38:47 -04:00
Dan Hansen	066f8d1235	Mention the person who invited a user on first message	2011-10-31 22:16:58 -05:00
Ilya Zhitomirskiy	c64588a68d	adding attachments to all recepients	2011-10-31 18:09:43 -07:00
danielgrippi	90f990e8dd	use the cache if cache size is less than limit	2011-10-31 17:07:30 -07:00
Ilya Zhitomirskiy	9cadb99f8a	sending csv as a file	2011-10-31 16:39:09 -07:00
Ilya Zhitomirskiy	d6824dcc49	Revert "remove custom logging, added hoptoad backend directly" ... This reverts commit ea72b1ae57.	2011-10-31 15:12:08 -07:00
Lennart Prelle	f2123d942d	make language for email-invitation available	2011-10-31 21:11:47 +01:00
Ilya Zhitomirskiy	ea72b1ae57	remove custom logging, added hoptoad backend directly	2011-10-31 12:38:00 -07:00
Sarah Mei	0c818cf359	Refactor tag followings spec	2011-10-29 08:56:30 -07:00
Sarah Mei	8f0aa72e75	Don't look for specific flash messages in specs.	2011-10-29 08:47:13 -07:00
Pistos	aea2203794	Change #newhere prefill to #NewHere .	2011-10-28 22:11:23 -04:00
danielgrippi	a46a1d91db	Revert "refactor aspects dropdown, (wip, still need to backfill specs)" ... This reverts commit 3d8f971ca9.	2011-10-27 23:53:55 -07:00
Pistos	0a1e649b2b	Convert some reshare-related Cucumber features into specs. Introduce SpecDoc.	2011-10-27 23:27:14 -04:00
Dan Hansen	3d8f971ca9	refactor aspects dropdown, (wip, still need to backfill specs)	2011-10-27 22:09:04 -05:00
danielgrippi	cc56569206	fix rspec to reflect flash message changes	2011-10-27 20:07:07 -07:00
danielgrippi	0def71d74f	add some feedback text & animation; added spec for collapsing tags	2011-10-27 19:57:00 -07:00
Maxwell Salzberg	9789e25c99	fix oembed spec; prevent people from commenting on posts that wont federate	2011-10-26 17:32:27 -07:00
Manuel Schölling	bcbc86e502	Retry federation if remote pod is down	2011-10-27 00:36:55 +02:00
Dan Hansen	db3e411978	fix bootstrap-popover spelling	2011-10-26 13:33:04 -05:00
Dan Hansen	ad978f4342	add bootstrap js to jasmine src files	2011-10-26 13:32:20 -05:00
Pistos	29573586c8	Merge branch 'master' into issue-2032-view-comments-on-public-post-without-login	2011-10-25 23:02:42 -04:00
Dan Hansen	091db3fd66	js i18n now accepts a count	2011-10-25 21:58:37 -05:00
Pistos	3ce0806cbc	Merge branch 'master' into issue-2032-view-comments-on-public-post-without-login ... Conflicts: app/controllers/comments_controller.rb app/helpers/comments_helper.rb	2011-10-25 22:21:08 -04:00
danielgrippi	9fba69cd5b	added person stream; temp hack for photos	2011-10-25 16:29:45 -07:00
Maxwell Salzberg	2cbb61be75	make federation errors much louder so we can better debug issues temporarialy	2011-10-25 11:41:52 -07:00
danielgrippi	0512ade65a	made name smaller and clickable on aspects/index [ci skip]	2011-10-24 21:43:32 -07:00
danielgrippi	19897df1ec	more first_name fixing	2011-10-24 21:34:56 -07:00
danielgrippi	e71fcea762	first_name now takes everything but the last word in the name field	2011-10-24 21:27:21 -07:00
danielgrippi	e63e8299b9	fixed up stream/publisher logic; fixed cukes	2011-10-24 14:41:15 -07:00
Ilya Zhitomirskiy	431fa3fd04	removing getting started on first post and having tooltips in the ... publisher	2011-10-24 14:11:35 -07:00
Ilya Zhitomirskiy	1ccf965194	publisher lib, prefill, open, still need to do public first message for new users	2011-10-24 14:11:35 -07:00
Ilya Zhitomirskiy	ee74948863	wip welcome post, publisher object	2011-10-24 14:11:35 -07:00
Ilya Zhitomirskiy	c7838debcf	creating multiple tag_followings	2011-10-24 14:11:34 -07:00
Maxwell Salzberg	e087284daa	fix the contacts link for the multi stream; make the contacts link default to the contacts page	2011-10-24 14:10:15 -07:00
Ilya Zhitomirskiy	51778cb22d	storing the entriety of the service profile name in first name	2011-10-24 12:41:50 -07:00
Ilya Zhitomirskiy	8b3c4f4cf2	checking on the attribute not the method	2011-10-24 11:00:00 -07:00
Ilya Zhitomirskiy	d51516fff3	bumped carrierwave, photos can now be downloaded from a url, fetching profile photo job	2011-10-24 11:00:00 -07:00
Ilya Zhitomirskiy	c60adda3a9	WIP, almost done for twitter, just need to figure out how to follow redirects	2011-10-24 11:00:00 -07:00
Maxwell Salzberg	7307960d82	wrote a failing test for what I think the lack of aspect notifier is; the cache is returning strings and not integers	2011-10-23 20:15:09 -07:00
Dan Hansen	b92cb921c1	Publisher.bindAspectToggles() is called in Publisher.initialize(). only bind the events once ... jQuery objects containing the same elements don't evaluate as true. test that the elements within the jQuery objects are the same	2011-10-23 21:30:54 -05:00
Dan Hansen	81fc5b28da	remove embedder	2011-10-23 21:30:54 -05:00
danielgrippi	cff3f6ea49	green specs	2011-10-23 19:20:13 -07:00
Sarah Mei	06ad78f026	Fix some publisher specs - spelling errors and stray console.log	2011-10-23 19:09:20 -07:00
John Edmonds	b482d16622	Merge branch 'master' into issue1144	2011-10-22 14:39:03 -04:00
danielgrippi	64f7450d6c	DG MS; fix case where pod does not have any communty spotlight	2011-10-21 17:39:39 -07:00
danielgrippi	794247d07b	MS DG; rename soup to stream; fix a bunch of translations	2011-10-21 14:44:02 -07:00
Maxwell Salzberg	484f46d70f	add validation which prevent user for signing up with dead username. fix cucumber features	2011-10-20 16:32:09 -07:00
danielgrippi	44b58d707f	featured users => community spotlight	2011-10-20 11:50:58 -07:00
danielgrippi	c49c76e2a6	DG MS; some refactoring	2011-10-19 15:47:22 -07:00
Maxwell Salzberg	59a2947ba0	fix services_controller_spec	2011-10-18 13:03:36 -07:00
Maxwell Salzberg	cb89772a6a	when connected, external services fill in profile info that you have not yet filled out	2011-10-18 10:02:24 -07:00
Gonzalo Rodriguez	aa1623a95f	Fixing person's name construction ... * When only has last_name, return last_name not diaspora_handle * Strip contstructed name to avoid trailing or preceding space when having only first or last name present	2011-10-18 02:24:29 -02:00
danielgrippi	8ffbf59f41	updated publisher spec; fixed dropdown opacity bug	2011-10-17 19:00:33 -07:00
danielgrippi	b61246c168	fixed all but two jasmine specs...	2011-10-17 16:54:18 -07:00
Sarah Mei	1d37c13932	Fix tag stream spec to reflect the different set of people count methods.	2011-10-16 16:35:41 -07:00
Sarah Mei	a3dce03f76	Fix expectation on redis cache spec	2011-10-16 16:11:17 -07:00
Sarah Mei	98ef5212f3	Merge branch 'tag_stream_api'	2011-10-16 15:47:20 -07:00
Sarah Mei	80821c9cc5	Basic tag metadata returned. Now what to do about posts?...	2011-10-16 15:25:11 -07:00
Manuel Schölling	8cfb854fab	Quickfixed federation of StatusMessages with photos only (no text)	2011-10-16 14:42:14 +02:00
Manuel Schölling	bdeae54c6c	Make Photos not inherit from Posts	2011-10-16 13:58:35 +02:00
Manuel Schölling	02a3c3f88b	Introduced Shareable	2011-10-16 13:58:35 +02:00
Maxwell Salzberg	f2c16bec85	add files	2011-10-15 22:38:21 -07:00
Maxwell Salzberg	58d496e146	MS SM WIP	2011-10-15 22:11:23 -07:00
Maxwell Salzberg	e1aa709c85	MS SM fix ajax_stream?	2011-10-15 21:49:17 -07:00
Maxwell Salzberg	ea0240d6f8	fix broken mobile tag view	2011-10-15 21:08:22 -07:00
Maxwell Salzberg	55efeb5a97	moved helper spec to correct file	2011-10-15 20:44:25 -07:00
Maxwell Salzberg	d6e9809be1	MS SM finished tag stream refactor	2011-10-15 20:40:20 -07:00
Pistos	153615e651	Fix more specs. Added an explicit spec for all_comments .	2011-10-15 16:21:26 -04:00
Gonzalo Rodriguez	a7c0888ad2	Fix pending tag_followings spec	2011-10-15 17:06:58 -02:00
Pistos	511d51318d	Refactor PostsController spec code a little. (DRY up a bit)	2011-10-15 14:56:36 -04:00
Jonne Hass	e9ce5456d6	round in statistics spec since Float#to_s has changed in 1.9.2	2011-10-15 14:30:33 +02:00
Jonne Hass	5a96c8ff49	fix require for 1.9 in statistics_spec.rb	2011-10-15 13:51:10 +02:00
Jonne Hass	88c6db5de4	pendingfy the other .ajax_stream? spec too for now	2011-10-15 13:17:40 +02:00
Jonne Hass	df8e5039a6	make failing spec pending for now. Btw. we have too many pending specs...	2011-10-15 12:45:35 +02:00
Jonne Hass	1e26f5d045	Merge pull request #2175 from Pistos/postgresql-fix-fb_connected_distribution_sql ... Postgresql: Fix fb_connected_distribution_sql	2011-10-15 03:27:57 -07:00
Maxwell Salzberg	5a8024a71a	MS DG; some stream refactoring; can comment now exists in base stream; default behavior is to allow you to comment on locals post, and then remote people if you are connected with them	2011-10-14 11:50:38 -07:00
Maxwell Salzberg	56dc565fc7	yeah I need to commit the files i guess	2011-10-13 22:27:07 -07:00
Maxwell Salzberg	f959ca0c12	refactor streams to be in a Stream module, hopefully they will auto-reload now	2011-10-13 22:26:15 -07:00
Maxwell Salzberg	44b0887e0a	who wants a goat that fetches SOAP?!!	2011-10-13 22:26:15 -07:00
Pistos	2cd004da24	Added an additional stub_request so aspects_controller_spec.rb passes under more conditions.	2011-10-13 21:56:59 -04:00
Pistos	455e59e442	Introduce #fb_connected_distribution to make statistics_spec.rb pass under PostgreSQL. ... Statistics can still be gathered the same way when MySQL is being used; no alteration there.	2011-10-12 22:36:42 -04:00
Gonzalo Rodriguez	00e93ba765	Fix people_controller specs	2011-10-13 00:01:05 -02:00
Daniel Grippi	b7f4f81d28	Merge pull request #2148 from Pistos/issue-2007-comment-order-on-postgresql ... Explicitly specify order of comments, since we cannot assume MySQL orderi	2011-10-12 16:09:18 -07:00
Maxwell Salzberg	9fd1d7db63	updating gemfile and schema.rb	2011-10-11 16:53:37 -07:00
Maxwell Salzberg	8acd9acb08	tests moved and passing	2011-10-11 16:12:32 -07:00
Maxwell Salzberg	139ddd726a	wip oembed refactor. still need to make a oembed_helper, and move some tests to their new home, but e but we are looking preeeetttttyyyy good.	2011-10-11 16:10:14 -07:00
Manuel Schölling	3561021a90	Added cucumber tests for oEmbed feature	2011-10-11 16:09:16 -07:00
Manuel Schölling	f3ea8f424f	Added oEmbed support	2011-10-11 16:08:47 -07:00
Ilya Zhitomirskiy	fa44ff6931	added query	2011-10-11 15:46:13 -07:00
Pistos	ed9328450a	Make statistics work under PostgreSQL.	2011-10-11 17:48:57 -04:00
Pistos	76ab5b2efb	Whitespace cleanup.	2011-10-11 17:48:33 -04:00
Pistos	15b3cce6ee	Refactored ordering of post comments; moved it down to model level for greater reach (DRYer code). ... Leaving the #order call in #last_three_comments caused the generated SQL to have two conflicting ORDER BY components, which caused the query to return invalid results. I removed the problem by removing #last_three_comments which I consider a premature optimization.	2011-10-11 16:06:24 -04:00
Pistos	4774b670de	Whitespace cleanup.	2011-10-11 15:50:40 -04:00
Ilya Zhitomirskiy	6a5f448853	added comment count correlation	2011-10-11 11:31:46 -07:00
Ilya Zhitomirskiy	5f324f73a0	remove correlation for tags_followed due to missing index	2011-10-11 11:18:42 -07:00
Ilya Zhitomirskiy	7fb26c4390	dg iz limiting to one month, added contacts sharing with count	2011-10-11 10:57:26 -07:00
Ilya Zhitomirskiy	288d20b6e8	correlations on the admins page	2011-10-11 10:57:26 -07:00
Ilya Zhitomirskiy	4c9b45b9c8	WIP	2011-10-11 10:57:26 -07:00
danielgrippi	818167c565	DG IZ; wip	2011-10-11 10:57:26 -07:00
The Lambda Calculus	e7828dcae8	Squashed commit of the following: ... commit 740296e86fdd080e6e787c5c024a6b609782d82f Author: The Lambda Calculus <code@thelambdacalculus.net> Date: Mon Oct 10 16:49:35 2011 -0400 Wrote rspec for atom feed validation. [Finishes issue #1408] commit e2999cbe588bcb32f35f05120743627cf3b31f56 Author: The Lambda Calculus <code@thelambdacalculus.net> Date: Thu Sep 29 18:28:14 2011 -0400 Adjusted placement of invalid 'link' elements outside of 'author' element. Feed now validates, though warnings/suggestions still exist. [Issue #1408]	2011-10-11 01:43:11 -04:00
danielgrippi	882c0c2170	DG MS; fixed tags autocomplete styling and js	2011-10-10 15:59:13 -07:00
Dan Hansen	32f1b61719	Mail doesn't seem to like the name-addr spec from RFC2822	2011-10-10 00:35:04 -05:00
Dan Hansen	f6845c360f	Revert "change namespace from Mail to Mailers" ... This reverts commit f859904c76.	2011-10-09 23:34:03 -05:00
Dan Hansen	f859904c76	change namespace from Mail to Mailers ... locally when Resque tried to constantize Jobs::Mail Object.const_get("Jobs") returned our Jobs module but when it tried to const_get("Mail") it returned the Mail gem. added copyright	2011-10-09 22:41:01 -05:00
Dan Hansen	814eb7b426	RFC2822 specifies that you use parentheses to denote a mailbox list. Use the addr-name spec to specify a display name and the from address. ... Check against the raw headers of the mail as @mail.from excludes the display name Extract shared logic between notifier methods	2011-10-09 22:19:50 -05:00
Maxwell Salzberg	c85209a22c	strip whitespace in name call	2011-10-07 12:59:07 -07:00
danielgrippi	2baa1e7c6e	remove hidden posts from the cache; add unhidden posts to the cache	2011-10-06 19:14:08 -07:00
Your Name	a457ab1ca2	fix dumb post spec	2011-10-06 17:30:21 -07:00
Ilya Zhitomirskiy	018a42b001	assert that prep_opts works; reference BaseStream types in lieu of subclassed AspectStream's	2011-10-06 17:26:29 -07:00
Ilya Zhitomirskiy	7572eaaf0d	changed the default order in prep_opts, passing in opts to cache population	2011-10-06 17:14:14 -07:00
Your Name	5b9fbd19ed	moar specs, a little perf upgrade for base_stream#person	2011-10-06 17:13:04 -07:00
Ilya Zhitomirskiy	91a0af078c	added checking for the sharing contact in postzord caching	2011-10-06 12:31:09 -07:00
Ilya Zhitomirskiy	d891e78652	refactored post receiving; only update cache on verfied received objects	2011-10-06 12:31:09 -07:00
Maxwell Salzberg	cdce54bbda	MS SM featured users stream. because we do what we want	2011-10-05 21:12:02 -07:00
Ilya Zhitomirskiy	f4bfa22768	added a clear cache rake task, removed fake redis for mockredis, slight ... refactor of the redis_cache class	2011-10-05 11:54:24 -07:00
Dan Hansen	8c15ca2a4b	PMs and comments contain author name in "From" header ... refactor notifier	2011-10-04 23:48:28 -05:00
Maxwell Salzberg	8a5d76de21	fix comment helper specs	2011-10-04 18:57:55 -07:00
Maxwell Salzberg	6252436b34	tests for commentshelper shim	2011-10-04 18:20:38 -07:00
Maxwell Salzberg	772d0241d9	moar tests	2011-10-04 18:20:38 -07:00
Ilya Zhitomirskiy	c2bb483b21	dg iz updating authors cache on creation of a post	2011-10-04 17:40:44 -07:00
Ilya Zhitomirskiy	792647340f	added acceptable_types to the cache	2011-10-04 16:51:18 -07:00
Ilya Zhitomirskiy	b42d675cb7	accounting for the unified receiver interface of the method	2011-10-04 15:51:39 -07:00
Ilya Zhitomirskiy	ab8308b9df	moved configured check into the RedisCache class	2011-10-04 15:46:03 -07:00
Ilya Zhitomirskiy	97342630c4	dg iz added some more documentation and only caching on all aspects	2011-10-04 14:39:56 -07:00
Ilya Zhitomirskiy	6ea540fb94	wip, adding to cache in receiver, caching is only triggered for receiving of posts	2011-10-04 10:32:17 -07:00
Ilya Zhitomirskiy	7926ebfb53	subclassing receivers, renamed perform to perform [bang]	2011-10-04 10:32:17 -07:00
Ilya Zhitomirskiy	4a8aea9e78	changed back to mock redis	2011-10-04 10:32:17 -07:00
Ilya Zhitomirskiy	289d582ce9	redis cache populates	2011-10-04 10:32:17 -07:00
Ilya Zhitomirskiy	01515725fe	WIP trim is still needed, also possible weirdness with the mock	2011-10-04 10:32:16 -07:00
Ilya Zhitomirskiy	8d12a57f37	reding from redis cache	2011-10-04 10:32:16 -07:00
Maxwell Salzberg	34f82d8bc1	try an in query directly for the tags	2011-10-03 17:14:57 -07:00
Maxwell Salzberg	008116fa3f	IZ MS more tests for status message scopes	2011-10-03 15:23:11 -07:00
Maxwell Salzberg	01fd1f23c7	moving stuff around	2011-10-03 15:23:11 -07:00
Maxwell Salzberg	1d2439ee76	clean up stream directory structure	2011-10-03 15:23:11 -07:00
Maxwell Salzberg	52bb5900a3	added shared behaviors for real	2011-10-03 15:23:10 -07:00
Maxwell Salzberg	6734aab378	added shared behaviors for streams	2011-10-03 15:23:10 -07:00
Maxwell Salzberg	9a4c478a7b	these spes are really green. too bad we need #moar	2011-10-03 15:23:10 -07:00
Maxwell Salzberg	0f073387ac	IZ MS refactor commenting disabled	2011-10-03 15:20:43 -07:00
Dan Hansen	e199010448	remove commented out spec	2011-10-03 15:00:14 -05:00
Dan Hansen	3eaa1c0584	moved photo processing from model to resque job, added tests ... removed Photo#not_processed	2011-10-03 14:58:44 -05:00
Dan Hansen	da851881a7	autolink spec should test that there is an A tag in the markdownified content and that it's href must equal the link that was posted instead of testing all of the markdownified content..	2011-10-02 22:50:39 -05:00
Dan Hansen	84ff366fef	make all links open in new tab. fix #1984	2011-10-02 22:24:35 -05:00
Gonzalo Rodriguez	0b97a3525a	Merge branch 'aspect_nav_rework'	2011-10-02 21:08:12 -02:00
Ilya Zhitomirskiy	5f29b77b1f	fixing wrong datatype on activity streams objectId	2011-10-01 19:07:11 -07:00
John Edmonds	19ea9e8b6d	Add tests for Content-Type returned from #create.	2011-10-01 11:48:41 -04:00
Gonzalo Rodriguez	d3a5bc1fb8	Merge branch 'master' into aspect_nav_rework	2011-10-01 03:58:50 -03:00
Maxwell Salzberg	fd42629c04	Merge pull request #2077 from christophe-de/username-blacklist ... add username blacklist	2011-09-30 12:00:15 -07:00
Maxwell Salzberg	621075d4e1	fix mentioning from profile page spec, add some tests for the ajax_stream? method	2011-09-30 10:54:13 -07:00
Paul Spieker	0c12471feb	add username blacklist	2011-09-30 14:17:04 +02:00
Maxwell Salzberg	a99d992706	GAHHHH DATABASE STRING OR INTEGER MAKE UP YOUR MIND	2011-09-29 18:53:25 -07:00
Maxwell Salzberg	c0ed7218fa	ugh postgres and your string ids\!	2011-09-29 18:30:12 -07:00
John Edmonds	dcd7e936df	Add test for Opera photo upload.	2011-09-29 21:24:00 -04:00
Maxwell Salzberg	dfb4c9c920	Merge pull request #2051 from uiri/672-facebook-majority-market-share ... Links in the message translate into a proper link on Facebook when sendin	2011-09-29 18:13:33 -07:00
Maxwell Salzberg	6ac0a46120	green jasmine by stubbing ajax_stream? in aspects controller	2011-09-29 18:04:21 -07:00
Uiri	0fbda5d077	Modularized and Tested™	2011-09-29 21:04:18 -04:00
Maxwell Salzberg	9760033fa5	weird postgres thing	2011-09-29 17:43:47 -07:00
Maxwell Salzberg	44942036da	make the socketing tests pending as we are not currently doing that	2011-09-29 13:33:44 -07:00
danielgrippi	e3bf03636b	pass in mobile as provider_display_name on posts if posting from mobile	2011-09-28 22:15:32 -07:00
Ilya Zhitomirskiy	c3746aec7f	passing around arrays instead of object on local batch receive	2011-09-28 21:34:48 -07:00
Ilya Zhitomirskiy	da0591f55e	tightened the spec, about to refactor	2011-09-28 21:03:10 -07:00
Ilya Zhitomirskiy	5cf11447e6	tightened the spec, about to refactor	2011-09-28 21:00:17 -07:00
Gonzalo Rodriguez	74d00d7db4	Merge branch 'master' into aspect_nav_rework	2011-09-28 19:52:15 -03:00
Ilya Zhitomirskiy	e8c7b570a9	small fix	2011-09-28 15:34:15 -07:00
danielgrippi	2b2443b6b9	aspect dropdown takes public and all aspects option	2011-09-27 21:09:27 -07:00
Gonzalo Rodriguez	e0ffd7c63e	Merge branch 'master' into aspect_nav_rework ... Conflicts: features/posts_from_main_page.feature public/javascripts/aspect-filters.js spec/javascripts/aspect-filters-spec.js	2011-09-27 00:08:05 -03:00
danielgrippi	4bd1f0997d	fix build	2011-09-25 13:14:09 -07:00
Maxwell Salzberg	049eb74ab2	added route to grab users profile picture if you know their username	2011-09-24 23:33:14 -07:00
Ilya Zhitomirskiy	a009c37d6f	fixed the cukes and the tag following	2011-09-23 18:58:19 -07:00
Ilya Zhitomirskiy	faa0451380	Revert "not passing in by members of if it wasn't passed into the stream" ... This reverts commit ff1cb665ed.	2011-09-23 09:59:05 -07:00
Ilya Zhitomirskiy	ff1cb665ed	not passing in by members of if it wasn't passed into the stream	2011-09-22 16:26:45 -07:00
Raphael Sofaer	2e96f0121e	simplify multi-server spec running with foreman. couldn't really get it automated tonight, not sure why.	2011-09-22 00:24:01 -04:00
Gonzalo Rodriguez	24be48d660	Strip full name considering cases where first or last name omitted	2011-09-20 22:18:35 -03:00
Ilya Zhitomirskiy	2cebfa54cc	fixed couple of specs, removed the federation fallback, and fixed the public hashtag pages (not displaying the publisher)	2011-09-19 15:52:25 -07:00
Maxwell Salzberg	b1e15f6a80	make specs pending	2011-09-16 18:36:58 -07:00
Maxwell Salzberg	bc1aef4999	MS IZ start to implement followed tags in the stream	2011-09-16 18:19:34 -07:00
Maxwell Salzberg	3d275868ce	make spec pending rather than commented out	2011-09-16 16:44:51 -07:00
Maxwell Salzberg	3bc81aeb67	stupid test polution :(	2011-09-16 16:42:35 -07:00
Maxwell Salzberg	e26b614e1d	added intergration test for dispatcher	2011-09-16 15:56:18 -07:00
Maxwell Salzberg	3d6169395f	add another dispatcher spec	2011-09-16 15:22:20 -07:00
Ilya Zhitomirskiy	e6e15483cd	more verbose testing of grouped_people	2011-09-16 13:34:56 -07:00
Jonne Hass	b706edf76f	pull in parallel_testing to speed up rspec ... - Initally run rake parallel:create - After each schema change run rake parallel:prepare - To run rspec super fast run rake parallel:spec - Todo fix upstreams summary logger	2011-09-16 22:14:12 +02:00
Maxwell Salzberg	5ca5db213f	add the opposite test, fix a typo in my previous test declaration	2011-09-16 11:31:01 -07:00
Maxwell Salzberg	6c414d8562	add tests for object_should_be_processed_as_public? and delegegated public to the parent of relayable objects	2011-09-16 11:24:13 -07:00
Maxwell Salzberg	d3b6143a45	remove heroku gem'	2011-09-16 09:44:03 -07:00
Ilya Zhitomirskiy	c98189b057	refactored the salmon models and the xml, added a pending spec to strip '='	2011-09-16 08:53:13 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy	4cdfe8431b	signing with SHA256, have a temp fallback on verification	2011-09-16 08:53:13 -07:00
danielgrippi	999efbd451	IZ DG MS; fix method call in public receiver	2011-09-15 19:37:56 -07:00
danielgrippi	60cb9e43a7	DG MS; renamed Salmon jobs; CGI::unescape() incoming xml in public receive route	2011-09-15 15:33:28 -07:00
danielgrippi	ba8e50e34c	DG MS; renamed a file; fixed the build	2011-09-15 15:16:34 -07:00
danielgrippi	97f80272b2	DG MS; changed Job:: to Jobs::; require all mail jobs from Job base class	2011-09-15 12:42:53 -07:00
danielgrippi	ec011f0800	DG MS; optimized local comments to be batched; backfilled more tests	2011-09-15 11:22:47 -07:00
danielgrippi	cfa260927d	DG MS; remove unusused job	2011-09-15 11:22:47 -07:00
danielgrippi	930ea6c425	Fix failure, decode in receiver	2011-09-14 21:41:46 -07:00
danielgrippi	fab6f9ccd9	DG MS; fixed tests; explicitly send in dispatcher in httpmulti	2011-09-14 17:51:25 -07:00
Maxwell Salzberg	60ace5c297	DG MS; Broke out HydraWrapper in HttpMulti job	2011-09-14 15:50:07 -07:00
alda519	a9e4b4ce99	fixed broken test, spec added	2011-09-14 20:46:52 +02:00
danielgrippi	91e649977c	MS DG update copyright	2011-09-14 11:23:12 -07:00
alda519	0906f21bdd	fixed spec	2011-09-14 10:43:30 +02:00
danielgrippi	60793fa1aa	fixed failing spec	2011-09-14 00:10:04 -07:00
The Lambda Calculus	6be533b987	Merge pull request #1975 from TheLambdaCalculus/b1126-additional-refactoring ... Added RSpec test for #1126	2011-09-13 20:55:46 -07:00
The Lambda Calculus	83fc972c61	Added RSpec test for #1126	2011-09-13 23:27:54 -04:00
Ilya Zhitomirskiy	6b9ad7c4c6	SM IZ pared down markdownify to basic markdown, bumped version of RedCarpet	2011-09-13 20:20:49 -07:00
Maxwell Salzberg	119cb37ba5	DG MS; broke validations into methods in receiver	2011-09-13 16:42:47 -07:00
Maxwell Salzberg	adaefd0cb5	MS DG rspec is green update gemfile	2011-09-13 13:34:49 -07:00
Maxwell Salzberg	5258a37ce5	MS DG clean up Postzord::Dispatcher::Private	2011-09-13 13:11:43 -07:00
Maxwell Salzberg	665facaeb0	DG MS renamed private dispatcher; started refactor including public ... dispatcher	2011-09-12 17:02:40 -07:00
Maxwell Salzberg	0ab0526cd6	DG MS; put validates_associated in relayable, removed from receiver logic	2011-09-12 15:06:17 -07:00
Maxwell Salzberg	5177e5b218	DG MS test receive_relayable	2011-09-12 14:05:32 -07:00
Maxwell Salzberg	6e60905d0d	DG MS major refactor of salmon and corresponding federation logic	2011-09-12 14:05:32 -07:00
Maxwell Salzberg	87c994fa47	MS DG cleaned up and fleshed out salmon specs	2011-09-12 14:05:32 -07:00
Maxwell Salzberg	34ed07260f	MS IZ DG moar salmon refactoring	2011-09-12 14:05:31 -07:00
Maxwell Salzberg	e0429ee823	MS DG pulling apart salmon and making our custom hacks more obvious	2011-09-12 14:05:31 -07:00
Maxwell Salzberg	6b0507949c	updated salmon to let us not always encrypt the header	2011-09-12 14:05:31 -07:00
danielgrippi	1d0bec11f7	Add counter cache for comments on posts	2011-09-11 15:02:24 -07:00
danielgrippi	1bd37038cc	fixed/moved specs; made Person.all_from_aspects scope (move direct AR querying from AspectStream; added more documentation in AspectStream	2011-09-11 14:16:48 -07:00
danielgrippi	21182c88ec	initial tests for AspectStream	2011-09-11 14:16:48 -07:00
danielgrippi	ec4dc7a905	Created AspectStream; removed all logic from AspectsController#index	2011-09-11 14:16:48 -07:00
Daniel Grippi	95aad7f15d	Merge pull request #1940 from alda519/profiles_helper-image ... default profile photo is no longer marked as set	2011-09-10 19:25:47 -07:00
danielgrippi	fe915ecb09	don't redirect to AspectsController#new from AspectsController#index if no aspect is present	2011-09-10 09:25:38 -07:00
alda519	b5f8f49ddd	default profile photo is no longer marked as set	2011-09-10 17:31:34 +02:00
Ilya Zhitomirskiy	ad11bd2a31	the Devise email regex was not catching pods that were anything other than a standard url	2011-09-09 18:05:58 -07:00
Maxwell Salzberg	91eabf0fce	attempt to add muting of notifications when post has a hidden visibility; i am getting a load path error in resque now, but that seems to be independent of this commit	2011-09-08 23:21:13 -07:00
Sarah Mei	37579814c4	More querying_spec refactoring. #visible_posts now has sufficient test coverage to aggressively refactor.	2011-09-08 14:55:21 -07:00
Sarah Mei	d1604a5bb5	Blow out the visible_posts specs so I can more easily see what it's doing	2011-09-08 11:58:14 -07:00
danielgrippi	c5fbe1584a	fix the build; don't test on enqueueing a job to fetch facebook friends every time we hit the facebook finder -- only do this on log in	2011-09-08 10:59:35 -07:00
Gonzalo Rodriguez	6131d5d29d	Merge branch 'master' into aspect_nav_rework	2011-09-08 01:54:49 -03:00
Jonne Hass	bc4872d3a5	ensure handle is downcased on search, fix #1912	2011-09-07 15:17:42 +02:00
Ilyaaaaaaaaaaaaa Zhitomirskiy	1246a98d9b	commented out empty spec	2011-09-07 03:07:27 -07:00
Maxwell Salzberg	0e7521df9f	adding csv generator	2011-09-07 02:50:43 -07:00
Sarah Mei	6fbb68480b	One more aspects.first removed. I think they're breeding	2011-09-05 19:28:10 -07:00
Sarah Mei	7d10b3fdb0	Remove more refs to aspects.first - should make postgres builds green	2011-09-05 19:04:56 -07:00
Sarah Mei	f06b8c7a58	First pass at removing order dependencies so specs will be reliable on postgres and mysql	2011-09-05 17:51:45 -07:00
Sarah Mei	2d6c2f0b60	Cucumber/spec cleanup. Removed some stray aspect.firsts, which should improve reliability across databases. Removed some cucumber steps we don't use & consolidated duplicate steps.	2011-09-04 23:15:08 -07:00
Sarah Mei	5e388bf4c2	tag markdownify performance test so it isn't run on CI	2011-09-04 23:10:33 -07:00
Dan Hansen & Gonzalo Rodriguez	2057c8fcf1	Aspect navigation rework started.. ... ToDo: * Fix failing posts cuke, seems to be timing issue * Populate stream title when no aspects selected * All aspects selected by default?	2011-09-05 02:02:07 -03:00
Sarah Mei	c678f4732c	A bit of refactoring on person_spec since we got an odd failure on travis	2011-09-04 21:34:00 -07:00
Sarah Mei	d701581379	Fix 1.9 yaml error caused by asterisks in the glob path.	2011-09-03 20:35:16 -07:00
Sarah Mei	a5b120532a	Use a jasmine fixture with just one post for the comment specs.	2011-09-03 17:51:51 -07:00
Maxwell Salzberg	722a2a86ea	remove console.log; instantiate a page for jasmine tests	2011-09-03 12:21:09 -07:00
Sarah Mei	1a823d647e	Fix comment jasmine fixture generation to be more consistent (i.e. take out more aspects.first stuff). Fix comment jasmine spec to be more consistent - remove unneeded spies, etc.	2011-09-03 12:02:51 -07:00
Gonzalo Rodriguez	0aeab944bf	Related to #1885. Workaround to avoid crashing when searching tags with dots like cubbi.es ... What i did was to redirect to the tag without dots, in this case cubbies I didn't consider a good idea to add route support for /tags/cubbi.es since it get messed with request formats	2011-09-03 00:22:27 -03:00
Maxwell Salzberg	48cdf7c79f	fix poetry mode, due to a mistake I made previously. also fixed a 500 where youtube titles do the unexpected	2011-09-01 12:03:07 -07:00
Maxwell Salzberg	7d96b603d3	fix bug where if youtube_maps or vimeo_maps were passed in as explicitly nil, the app would 500. #somethingididnotknow (Hash#fetch is kind of weird	2011-09-01 10:14:53 -07:00
Maxwell Salzberg	b8ca4bfcab	added Link to profile page in webfinger profile to make federation a bit easier	2011-08-31 19:57:46 -07:00
Maxwell Salzberg	62aea0e820	fix for mention links, and the first tag links #ohYEAH	2011-08-31 18:06:30 -07:00
Maxwell Salzberg	272ab55482	Merge branch '1844-mentions-in-markdown' of https://github.com/brianwisti/diaspora into brianwisti-1844-mentions-in-markdown	2011-08-30 22:15:52 -07:00
Dan Hansen	2b31999f28	pull in jasmine-ajax, start testing our ajax callbacks with meaningful responses	2011-08-31 00:00:49 -05:00
Sarah Mei	a5cbf59c6a	Merge branch 'master' of github.com:diaspora/diaspora	2011-08-30 21:22:57 -07:00
Sarah Mei	f30e913743	Fix markdownify spec in 1.9.	2011-08-30 21:22:36 -07:00
Dan Hansen	cbc168fc27	only request comments once	2011-08-30 23:12:17 -05:00
Sarah Mei	b6e2e9452f	Fix YouTube titles on 1.9. (SIGH.)	2011-08-30 21:04:29 -07:00
Dan Hansen	7e20cece42	remove stray console.logs, set $.fx.off to true to make the failing likes spec pass in firefox	2011-08-30 21:44:43 -05:00
Dan Hansen	dc947e449b	fix issues with comment stream, fix likes, merge comment stream and comment toggler widgets. ... make timeago widget a simple wrapper for $.fn.timeago (we don't really need this.)	2011-08-30 21:07:40 -05:00
Brian Wisti	8aafc61071	merged with blank markdownify check	2011-08-30 12:55:52 -07:00
Maxwell Salzberg	bb8a9f0b3f	small bug in markdownify to prevent barfing with a nil message	2011-08-30 11:34:54 -07:00
Maxwell Salzberg	e25decedc3	Merge pull request #1845 from fermionic/1811-mobile-share-button ... 1811 mobile share button	2011-08-30 11:27:36 -07:00
danielgrippi	4d1c93d95b	Removed , but not the table. Record all in httpmulti success	2011-08-30 10:14:32 -07:00
danielgrippi	0dfcbca51b	Revert "removed the pod_stats table (was the cause of bloat on the database)." ... This reverts commit 902c40e42d.	2011-08-30 10:03:56 -07:00
danielgrippi	902c40e42d	removed the pod_stats table (was the cause of bloat on the database).	2011-08-30 10:01:59 -07:00
Sarah Mei	2255e80b69	So. It turns out that postgresql has a less-consistent idea of what .first means in an association with no default ordering. All the places we were doing bob.aspects.first (& etc.) needed to be more specific. & o ya, POSTGRES IS GREEN.	2011-08-29 22:03:05 -07:00
Zach Prezkuta	3f5dd7e5b1	Issue #1811: Share button missing in mobile version	2011-08-29 22:30:14 -06:00
Maxwell Salzberg	224b59322b	remove console.log in spec	2011-08-29 19:16:41 -07:00
Maxwell Salzberg	3bde507a3a	DC MS fix crazy status.net linkback accept header	2011-08-29 18:44:31 -07:00
Andrej Kacian	36e32ba497	Update jasmine tests for the stream element widget.	2011-08-30 01:46:39 +02:00
danielgrippi	bd77560636	cucumber green in postgres (i think?). touched up aspect spec.	2011-08-29 15:53:47 -07:00
Maxwell Salzberg	f479a9a144	Merge branch 'brianwisti-1305-full-markdown'	2011-08-29 10:56:48 -07:00
danielgrippi	b7f9400a9f	Moved post/comment text collapsing into respective widgets; removed from stream.js. Removed an unused function in stream.js (image hotlinking).	2011-08-28 22:04:06 -07:00
Sarah Mei	b60101b9ad	Use explicit parameters instead of request format to determine whether we render a remote or non-remote form in aspects#new. ... Facebox needs to get back a text/html response. We were using text/javascript to indicate that we wanted a remote form and text/html to indicate we wanted a non-remote form. The trouble is, if we request with text/javascript then that is the format we get back. It doesn't really make sense to use formats that way anyway, so I changed it to an explicit parameter. This had the nice side effect of simplifying our new-aspect views.	2011-08-28 16:08:57 -07:00
danielgrippi	802dd989a8	remove javascript in lieu of css; feature is still failing	2011-08-27 22:04:30 -07:00
Maxwell Salzberg	c66b7d584d	Merge branch '1305-full-markdown' of https://github.com/brianwisti/diaspora into brianwisti-1305-full-markdown ... Conflicts: Gemfile.lock	2011-08-27 14:13:15 -07:00
Gonzalo Rodriguez	cc1add81b0	Avoid RecordNotFound exception thrown by find method when invalid person_id	2011-08-27 02:45:58 -03:00
Dan Hansen	27d4fd8176	fix retractions, fix likes, backfill likes widget tests, remove typo from jasmine.yml, remove unneeded js files ... require confirmation for comments in js, get rid of rails helper	2011-08-26 15:24:07 -05:00
Dan Hansen	d75ef8d020	made backtotop a widget, added jquery-debounce	2011-08-26 12:30:28 -05:00
Ilyaaaaaaaaaaaaa Zhitomirskiy	8c9a585337	reshares now have notifications, slight refactor of the notification helper	2011-08-25 17:16:09 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy	e45278a043	notification for reshares WIP	2011-08-25 17:16:09 -07:00
Gonzalo Rodríguez	31733e1f9f	Merge pull request #1686 from grzuy/1486-invalid-birthday-crash ... Fix #1486 profile update was crashing with invalid birthday date	2011-08-25 16:40:57 -07:00
Maxwell Salzberg	bcae8a1952	chubbies needs its own way of assigning a current user	2011-08-23 17:16:15 -07:00
Raphael Sofaer	a63d1ad4ae	Sign out the signed in user if a different uid is passed to AuthorizationsController#new	2011-08-23 16:37:50 -07:00
Raphael Sofaer	6b88a75174	Log out a user if they arrive at AuthorizationsController#new carrying the username of a different user	2011-08-23 16:37:50 -07:00
Raphael Sofaer	c95f80be42	Re-nullify chubbies output and correctly handle diaspora_id param in create_account	2011-08-23 16:37:50 -07:00
Raphael Sofaer	76b0f31020	Fix the chubbies icon_url field, that needs to be icon path or be a url	2011-08-23 16:37:50 -07:00
danielgrippi	a7d9bbed84	wip	2011-08-23 16:37:50 -07:00
danielgrippi	27049e52b5	connect logic	2011-08-23 16:37:50 -07:00
Dan Hansen	6b040c7b4a	clean up websocket receiver, add specs to content updater	2011-08-22 20:03:38 -05:00
Ilyaaaaaaaaaaaaa Zhitomirskiy	7fd7fa968c	fixed the email from header issues and backfilled few tests	2011-08-22 17:38:40 -07:00
Andrej Kacian	59ba3f85e6	Moved live() bindings for post hide icon from Stream.initialize to Stream.initializeLives	2011-08-22 20:18:02 +02:00
Andrej Kacian	9fd4432e5a	Fix a jasmine test in CommentToggler	2011-08-22 20:05:18 +02:00
Dan Hansen	4a64a172d1	Merge branch 'master' of github.com:diaspora/diaspora into js-refactor-merged ... Conflicts: spec/javascripts/stream-spec.js	2011-08-21 20:57:01 -05:00
Dan Hansen	545611fffa	green?	2011-08-21 20:45:51 -05:00
Sarah Mei	163ac103cd	Haven't figured out why reset password email body is blank, but I pulled it into a controller test so we can figure it out there instead of in a cucumber feature.	2011-08-21 16:45:53 -07:00
Andrej Kacian	395df041db	Made toggleComments jasmine test aware that there are more posts in the fixture	2011-08-22 00:38:34 +02:00
Andrej Kacian	2a52face12	Add jasmine test for ajax spinner display	2011-08-22 00:38:34 +02:00
Dan Hansen	3ed50cab94	Merge branch 'master' of github.com:diaspora/diaspora into js-refactor-merged ... Conflicts: app/views/status_messages/bookmarklet.html.haml config/assets.yml db/schema.rb public/javascripts/contact-edit.js public/javascripts/publisher.js public/javascripts/view.js	2011-08-20 14:40:56 -05:00
Gonzalo Rodriguez	ceedbb14cb	Closes #1486. Profile update was crashing with invalid birthday date	2011-08-20 00:34:59 -03:00
Gonzalo Rodriguez	234af2a15b	Fixing some tests that weren't testing correctly ... These assertions were always returning true even if you dont populate the flash, because nil.should_not be_empty returns true	2011-08-19 23:57:33 -03:00
Raphael Sofaer	a74080e27d	Fix ServicesController spec	2011-08-19 16:52:26 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy	834c75894c	jasmine is green again	2011-08-19 14:42:28 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy	96d183a041	fixed private message emails not including the message	2011-08-19 11:33:55 -07:00
Maxwell Salzberg	6beeecefd8	add better messages telling a user that they sent share requests if they try and email exsisting users	2011-08-18 18:27:37 -07:00
Raphael Sofaer	60e9fd54e2	Fix a problem with re-saving deleted objects in a spec in postgres, add postgres to test group in gemfile	2011-08-18 16:05:14 -07:00
Raphael Sofaer	31584eed84	It turns out find_for_database_authentication calls find_for_authentication, not the other way around.	2011-08-18 16:05:14 -07:00
Raphael Sofaer	c7331230bc	Revert "Revert "Revert "remove uploaded test images after running the specs/cucumber"" -- using == now instead of =" ... This reverts commit b11bd23da2.	2011-08-18 12:06:04 -07:00
danielgrippi	b11bd23da2	Revert "Revert "remove uploaded test images after running the specs/cucumber"" -- using == now instead of = ... This reverts commit 7969b52035.	2011-08-18 11:20:49 -07:00
danielgrippi	7969b52035	Revert "remove uploaded test images after running the specs/cucumber" ... This reverts commit a6eb275c7a.	2011-08-18 11:11:08 -07:00
danielgrippi	a6eb275c7a	remove uploaded test images after running the specs/cucumber	2011-08-18 11:08:57 -07:00
Gonzalo Rodriguez	2d54d9a97e	Validate presence of message text on conversations. Closes #1329.	2011-08-17 23:52:31 -03:00
danielgrippi	a99e69edd6	down to 2 failures in postgres	2011-08-17 16:51:54 -07:00
Maxwell Salzberg	ad1b122e20	test batch_invite	2011-08-17 16:28:21 -07:00
Maxwell Salzberg	e0fb8a08cb	set the user email if inviting by email	2011-08-17 16:28:21 -07:00
Maxwell Salzberg	19eb549889	fixed up update controller action and building users #scary #gladsofaerisstillhere	2011-08-17 16:28:21 -07:00
Maxwell Salzberg	e039aabeef	senders must now own aspects	2011-08-17 16:28:21 -07:00
danielgrippi	eb8c540ac1	MS DG IZ major invite refactor. all tests are green minus weird stuff on dans computer, need to checkout this out on pivots	2011-08-17 16:28:21 -07:00
danielgrippi	bf0eb3dac3	4 failures left in postgres	2011-08-17 14:18:51 -07:00
Raphael Sofaer	88b317f0c1	Fix jasmine spec for aspectFilters	2011-08-17 10:17:14 -07:00
Brian Wisti	b87c7bb489	Improve code block support	2011-08-16 21:48:48 -07:00
Brian Wisti	03127cd592	basic support for Redcarpet Markdown	2011-08-16 21:48:48 -07:00
Maxwell Salzberg	a06f25b297	Merge pull request #1763 from grzuy/conversation-creation-refactor ... Refactor conversations creation	2011-08-16 10:26:54 -07:00
danielgrippi	511517b3c7	cleaned up and documented Invitation. moved an action into a User before_create callback	2011-08-15 16:44:37 -07:00
danielgrippi	32ae21a213	removed user invite counter, as it was already depricated	2011-08-15 15:15:43 -07:00
danielgrippi	669cd8578e	scoped invite_user_by_email job into Mail module	2011-08-15 12:35:32 -07:00
Gonzalo Rodriguez	2326206586	Refactor conversations creation	2011-08-12 23:07:01 -03:00
Raphael Sofaer	565d71a0cd	Bad solution for making sure that an invited facebook user is marked immediately as having been invited	2011-08-12 17:32:52 -07:00
danielgrippi	7b85dcec9c	dg rs; seed bob with facebook friends & fixed invitation view	2011-08-12 17:05:00 -07:00
Raphael Sofaer	8b743e7e3b	Fix stack level too deep error on reshares	2011-08-12 13:20:25 -07:00
Raphael Sofaer	cd640e1ac6	Pending spec for statusnet linkback plugin	2011-08-12 10:37:24 -07:00
Raphael Sofaer	3c34749dd7	Put a select limit on the person query on contactsController index, since we know exactly what we're doing with the data	2011-08-12 10:13:29 -07:00
Raphael Sofaer	9a77d3518f	Mobile authorizations index view	2011-08-11 16:39:39 -07:00
Raphael Sofaer	7f69714d08	Fix paul.elicker link, refactor people_helper	2011-08-11 16:26:14 -07:00
danielgrippi	08f12ee348	fixed the 'a post' bug in notification emails	2011-08-11 14:40:45 -07:00
Raphael Sofaer	7021cd79c8	Select distinct people in contacts index	2011-08-11 11:56:23 -07:00
Dan Hansen	2e9040e227	merged with master, 7 cukes failing. jasmine is green. need to remove rails.js helpers so things suck less	2011-08-10 23:57:33 -07:00
danielgrippi	db645e8da8	merged publics/show and posts/show	2011-08-10 18:07:38 -07:00
Raphael Sofaer	90a5cd2254	Get rid of error on aspect_memberships destroy if someone has noscript on or something	2011-08-10 17:40:38 -07:00
Raphael Sofaer	8086b9a9d4	Eliminate 500 errors on also_commented emails, the copy there is terrible	2011-08-10 16:58:35 -07:00
Raphael Sofaer	350a4b4f6d	Fix 500 on invitations new on unknown facebook user... bad solution, maybe we should just delete the offending invitations?	2011-08-10 16:42:08 -07:00
Raphael Sofaer	3431cd94fb	Make resque job specs specific about what error should be raised; fix expectation on hoptoad notifier	2011-08-10 16:36:42 -07:00
Raphael Sofaer	3658481c38	Fix errors when trying to mail comment notifications to post authors on posts other than status messages	2011-08-10 15:40:32 -07:00
danielgrippi	b6c26611ef	placed all mail jobs in the Job::Mail:: namespace & added into appropriate folders	2011-08-10 15:31:40 -07:00
Andrej Kacian	a904b59a03	Add rspec test for correct behavior of /u/nonexistentuser URL	2011-08-10 22:25:35 +02:00
Raphael Sofaer	1df654d416	Send a correct backtrace and some other nice things to airbrake on resque errors	2011-08-10 11:10:13 -07:00
danielgrippi	aa3d626ada	validate instead of throwing a db error	2011-08-10 10:38:28 -07:00
Maxwell Salzberg	8df5ba0c77	remove stray puts	2011-08-10 10:32:44 -07:00
Maxwell Salzberg	2d6a69cdc8	fix for 500s in liked emails for reshares and activity streams photos	2011-08-10 10:25:43 -07:00
Sarah Mei	0b02653f44	Merge pull request #1694 from ticho/tag-list-has-unfollow-icon ... Add a "unfollow" icon to each tag in followed tags listing	2011-08-09 21:44:21 -07:00
Maxwell Salzberg	4fb4f71169	prevent duplicate services from being created	2011-08-09 19:01:38 -07:00
Raphael Sofaer	333081f8b1	Fix resque job logging spec	2011-08-09 17:05:34 -07:00
Maxwell Salzberg	86e374b8ce	add hovercards back to mentions, reorganized some helpers, made getting started view mobile accessible	2011-08-09 16:54:24 -07:00
Raphael Sofaer	f8e53bfba5	Fix a user's atom feed route from a cell phone.	2011-08-09 16:20:27 -07:00
Raphael Sofaer	87ffce4f64	Get hoptoad notifications working from resque	2011-08-09 16:04:23 -07:00
Raphael Sofaer	a4e54a7b05	Protect ourselves from problems with youtube title serialization by rescuing type mismatches in the marshaller.	2011-08-09 14:04:31 -07:00
Andrej Kacian	bddd7c717b	Write jasmine test for the tag unfollow icon visibility	2011-08-09 22:54:31 +02:00
Maxwell Salzberg	e9d993b8f6	throw 404s when the person is no found	2011-08-09 13:03:45 -07:00
Raphael Sofaer	69619f9ba2	Rescue from duplicate key errors in AspectMembershipsController	2011-08-09 12:50:24 -07:00
Raphael Sofaer	7f5f696642	Don't let googlebot 500 us on the public post page	2011-08-09 12:26:10 -07:00
danielgrippi	a78fa96e99	don't display a reshare link if the original post has been deleted	2011-08-09 10:26:21 -07:00
Andrej Kacian	e5b6850556	Fix the test	2011-08-07 00:44:37 +02:00
Andrej Kacian	6cf42fb8ba	Better stab at the jasmine test.	2011-08-06 23:37:21 +02:00
Andrej Kacian	2716316dac	Add jasmine test for #1587 fix.	2011-08-06 23:37:21 +02:00
Sarah Mei	a62325be23	Fix references to facebox in jasmine specs.	2011-08-06 14:36:12 -07:00
Sarah Mei	421bfe6d8f	Handle the case in which the pod owner has not set up featured users.	2011-08-06 12:47:46 -07:00
Raphael Sofaer	dde4b30180	Fix rspec specs	2011-08-05 22:29:27 -07:00
Raphael Sofaer	7052654b25	Update factorygirl, fix the searcheable_person factory to work with factory_girl 2.0.3	2011-08-05 15:45:05 -07:00
Raphael Sofaer	f0f388d9e1	Fix weird error in jasmine suite	2011-08-05 15:09:16 -07:00
danielgrippi	6a56e3298c	only show connect to services if all services not already connected	2011-08-03 19:02:54 -07:00
Raphael Sofaer	61eea529cb	Don't update target.updated_at when updating target.likes_count	2011-08-03 18:36:34 -07:00
danielgrippi	99ac976594	fix redirects around getting_started and aspect/index	2011-08-03 18:07:43 -07:00
danielgrippi	987d334764	fixed tests, translations, initalizer	2011-08-03 18:02:58 -07:00
danielgrippi	984eef25be	UsersHelper -> GettingStartedHelper	2011-08-03 18:02:57 -07:00
danielgrippi	e589dd88b2	added has_connected_cubbies?	2011-08-03 18:02:57 -07:00
danielgrippi	120cf9835b	added more translations; welcome text switch	2011-08-03 18:02:57 -07:00
danielgrippi	b8b4ad3d84	added helpers for each of the getting started steps; make step sections dull if completed	2011-08-03 18:02:56 -07:00
danielgrippi	d51e495925	fetch featured users from remote servers on app init unless already in the db	2011-08-03 18:02:56 -07:00
danielgrippi	c9eeeb6150	ms dg; profile (step 1) finished	2011-08-03 18:02:56 -07:00
Maxwell Salzberg	7e8f17cc31	refactoring this stuff	2011-08-03 16:58:55 -07:00
Raphael Sofaer	1aac60bee3	Make sure that not deleting the service_users doesn't leave them stale	2011-08-03 15:39:23 -07:00
Raphael Sofaer	7d0c796762	Make sure that related data for fb users is attached to them	2011-08-03 15:30:58 -07:00
Raphael Sofaer	168ccc11b0	Call collapseText on stream initialize	2011-08-03 12:47:48 -07:00
Raphael Sofaer	0b1ef41838	Scope stream scrolled events to new elements	2011-08-03 12:36:07 -07:00
Raphael Sofaer	5967f01dab	Take out PostsFake, now that we ajax in comments it's not worth the extra complications	2011-08-03 11:09:21 -07:00
Raphael Sofaer	be5453f0b4	Fix photo show pages with likes	2011-08-02 10:17:49 -07:00
Raphael Sofaer	65c4b1ceaf	Merge pull request #1711 from gandaro/1602-delete-profile-photo ... test for issue #1602's fix; typos	2011-08-01 16:11:17 -07:00
Raphael Sofaer	8d88818ea0	Merge pull request #1712 from ticho/typofix-in-featured-contacts-test ... Fix typo for contacts_controller #featured test	2011-08-01 16:10:43 -07:00
Raphael Sofaer	2a0df9841a	Correct batch emailer fixture	2011-08-01 16:00:01 -07:00
danielgrippi	756a20ecd4	link a user to featured users if user has zero contacts	2011-08-01 15:19:51 -07:00
Raphael Sofaer	3d88095ba2	Updating batch inviter	2011-08-01 14:49:21 -07:00
Andrej Kacian	a5e8db04a0	Fix typo for contacts_controller #featured test	2011-08-01 23:20:23 +02:00
Jakob Kramer	4b9c8487e6	test for issue #1602's fix; typos	2011-08-01 20:12:30 +02:00
Sarah Mei	b7b1c6b276	Fix interaction between I18n fallbacks and our interpolation fallback code. Refactor I18n tests into their own file. Remove some test support code that made it hard to test I18n.	2011-07-30 22:41:46 -07:00
Maxwell Salzberg	bb8db654d6	add basic pod error logging, and added guard and removed autotest	2011-07-30 11:44:27 -07:00
danielgrippi	905a982d35	add two more default aspects for new users	2011-07-29 19:21:18 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy	3a6f0583c7	added featured users dg iz	2011-07-29 19:00:15 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy	e42d7273a8	featured users section	2011-07-29 19:00:15 -07:00
Raphael Sofaer	54a5d96391	Add a couple tests for post federation, because Max is suspicious	2011-07-29 17:21:10 -07:00
Maxwell Salzberg	73616a3e7a	new users now autofollow diasporahq@joindiaspora.com; upon connecting to a user, you now get post visibilities for their public posts (that your pod knows about)	2011-07-29 17:20:10 -07:00
Raphael Sofaer	f9bf34a73e	Fix defaults for activerecord models in i18n	2011-07-29 15:51:38 -07:00
Raphael Sofaer	bea333842f	Make sure that a MissingInterpolationArgument in the english locale is raised	2011-07-29 14:30:20 -07:00
Raphael Sofaer	b56838e5b1	Fall back to english on MissingInterpolationError	2011-07-29 14:30:20 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy	16bd3e4c2f	less delay on search; start on 2 chars instead of 3	2011-07-29 12:26:04 -07:00
danielgrippi	f560321626	optimized people search	2011-07-29 12:04:10 -07:00
Raphael Sofaer	5e39368414	Get rid of 500 on mobile comment creation	2011-07-29 12:01:35 -07:00
Raphael Sofaer	091701e565	Pending spec for allowing an unknown commenter to comment on a public post	2011-07-29 11:08:38 -07:00
Maxwell Salzberg	9d0764dadb	two failing tests for the mobile site. SOMEBODY FIX THEM	2011-07-29 10:14:59 -07:00
Dan Hansen & Sarah Mei	2d9a709212	Fix contacts spec - default order on the association means we need to reload after adding one	2011-07-28 23:38:17 -07:00
Maxwell Salzberg	b2bce9e1b2	update jquery mobile to beta1	2011-07-28 23:32:41 -07:00
Maxwell Salzberg	a325970e5d	test to make sure mobile site does not 500 with all media types	2011-07-28 13:16:43 -07:00
maxwell	7a5852e73a	fix a bug with openssl keys in development. note to future max and ... rafi. never monkey patch anything on the top of a completely random model. never again. ever. TODO: look into replacing a monkey patch on a to_s in User#generate_key that makes the single test green, but my dell had a heart attack other places, that might just be sqlite3 or my dell	2011-07-24 20:06:07 -07:00
Raphael Sofaer	99aafb18cd	Reshares show up on sharing, prevent multi-resharing, still need to make that ui nice	2011-07-22 17:13:31 -07:00
Raphael Sofaer	0e2936f069	Reshare spec, not repost spec	2011-07-22 16:03:54 -07:00
Raphael Sofaer	78bced56bb	Reshares and reshare retractions are green.	2011-07-22 16:00:19 -07:00
Raphael Sofaer	4b1d5b772d	Failing spec for the second retraction for a reshared post, reshares need to refer to guids	2011-07-22 14:19:58 -07:00
Raphael Sofaer	ad5dba052c	First reshare retraction spec is green	2011-07-22 13:12:12 -07:00
Raphael Sofaer	17774d8b3b	Getting repost back to almost green.	2011-07-21 19:15:47 -07:00
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
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	20de3a5622	Refactor StatusMessagesController#create, move the photo dispatching into an after_dispatch hook	2011-07-21 16:30:00 -07:00
Maxwell Salzberg	ad8ccbbeb9	added test for admin inviter	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
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	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
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	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	f60a748c21	Ajax in the contacts for mentioning after page load	2011-07-15 14:23:44 -04:00
danielgrippi	3e7e2b4d2a	DH remove test pollution from EventBroker#subscribe spec	2011-07-14 18:03:30 -07:00
Dan Hansen	bdb4c888a9	Remove embedder spec from git repo, it's now in spec/javascripts/widgets/embedder-spec.js	2011-07-13 22:49:32 -07:00
Dan Hansen	ca2413ff6b	Widgets now subscribe to a widget/ready event. Apply change to all widgets, added some tests & lots of cleanup.	2011-07-13 22:23:31 -07:00
Raphael Sofaer	abe10b3889	Comment out falsely failing JS tests, we should just stop using extend, it is needlessly hard to test.	2011-07-13 11:03:55 -07:00
Maxwell Salzberg	6523f0542a	require haml in chubbies to kill error	2011-07-12 20:19:38 -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
Raphael Sofaer	e30b82dd45	Fix resend links in inviter	2011-07-12 15:08:03 -07:00
danielgrippi	039b65b5cc	a little js cleanup for post.js	2011-07-12 00:12:08 -07:00
danielgrippi	d364f158b8	cache counters in for likes. pending Diaspora::Likeable module...	2011-07-11 15:05:55 -07:00
danielgrippi	2e15b6a61e	Likes in comments, cache counter disabled for now.	2011-07-11 15:00:48 -07:00
Raphael Sofaer	e59f49aace	Fix specs after merge	2011-07-11 14:38:51 -07:00
Raphael Sofaer	eafe6a7c85	Merge branch 'ajaxy-comments'	2011-07-11 14:05:45 -07:00
Raphael Sofaer	39ff51a9d7	Make comments index ajaxy	2011-07-11 14:03:59 -07:00
Ilyaaaaaaaaaaaaa Zhitomirskiy	594c9b02b1	A admin is now able to allow open invitations	2011-07-11 13:32:02 -07:00
Raphael Sofaer	3f555eefc4	Server side of ajaxy comments done, need to modify comments/_comments and make it work.	2011-07-11 09:11:16 -07:00
Raphael Sofaer	2fb0fce1a8	Nest likes and comments routes in the post route	2011-07-10 21:44:34 -07:00
Raphael Sofaer	d1f2bc5fcb	Remove object_path spec	2011-07-10 21:05:55 -07:00
Raphael Sofaer	97ca10ddda	Huge commit I know, but move show and destroy routes into PostsController and PostsController#show into PublicsController	2011-07-10 20:06:31 -07:00
Raphael Sofaer	968100860a	Don't show commented tags in the tag stream for now, until we optimize that	2011-07-07 15:39:28 -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	9d506231b1	querying correctly in tagscontroller to include posts with comments containing hashtag	2011-07-07 12:27:48 -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
Raphael Sofaer	1f448e8555	as_json wants a string	2011-07-07 10:56:55 -07:00
Raphael Sofaer	8cf0fa8446	Don't get tags in the publisher	2011-07-07 10:48:07 -07:00
Raphael Sofaer	a1ee8eb83b	stub tests for not n-querying in the publisher	2011-07-07 09:06:24 -07:00