Commit graph

2939 commits

Author SHA1 Message Date
Diaspora Europe
57de352238 added some specs for json response 2012-02-24 10:22:16 +01:00
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