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

2144 commits

Author SHA1 Message Date
Sean Tilley
d505826bc5 Fix photo uploader, kill breakage #2951 2012-03-01 00:38:03 -06:00
Maxwell Salzberg
0d93227f07 hopefully make travis happy: 2012-02-28 17:52:13 -08:00
danielgrippi
b6c4cab669 fix styling issue with popup comment box and last paragraphs [ci skip] 2012-02-28 15:27:31 -08:00
danielgrippi
cb9420bfd6 don't use symlinks; fix assets ordering issues. 2012-02-28 11:04:15 -08:00
danielgrippi
61b4e77bde Merge branch 'profiles' 2012-02-28 10:29:17 -08:00
Dan Hansen
1a0c756bb3 Hovering over the upload file button uses the cursor pointer, Bug Mash Monday #5 2012-02-28 12:11:15 -06:00
danielgrippi
74cdc91bb1 fix likes and comment loading in the stream 2012-02-27 20:38:59 -08:00
danielgrippi
3d48dc4fb0 fix stream css 2012-02-27 19:08:37 -08:00
danielgrippi
1e518cbcff fix media view 2012-02-27 18:50:33 -08:00
danielgrippi
81de530ce3 use better serif fonts 2012-02-27 18:41:28 -08:00
Maxwell Salzberg
879b3d135a title now updates with switch 2012-02-27 18:40:56 -08:00
Maxwell Salzberg
fce3cba946 post viewer styling cleanup 2012-02-27 17:28:04 -08:00
Dennis Collective
f5ef1e8c14 Merge pull request #2814 from stwf/aspects-javascript-fixes 
update aspect name in aspects listing after editing.
 2012-02-27 17:19:05 -08:00
danielgrippi
0e9f825208 parse markdown in rich media view 2012-02-27 15:59:25 -08:00
danielgrippi
57c3bdb685 added home button to an active interaction-pane 2012-02-27 15:58:13 -08:00
danielgrippi
932f2e526c fix bug with interaction pane scrolling 2012-02-27 15:30:44 -08:00
danielgrippi
5bebd97bca added translations to post viewer 2012-02-27 15:14:19 -08:00
danielgrippi
7bbf69e35e added lock to private posts on show pages 2012-02-27 15:09:15 -08:00
danielgrippi
278c7ee0c4 show feedback for posts on their show pages if user is not logged in. 2012-02-27 14:49:13 -08:00
danielgrippi
0112285985 Merge branch 'master' into profiles 
Conflicts:
	lib/diaspora/shareable.rb
 2012-02-27 14:27:05 -08:00
danielgrippi
66352c8bad have a guard on a handlebars helper. 2012-02-27 14:15:56 -08:00
danielgrippi
ebe7a302b6 DG MS; comments are back! 2012-02-27 12:29:09 -08:00
danielgrippi
896c098a07 changed handlebars "avatar" helper to "personImage"; added home button to interaction pane (only when sneaky -- needs further investigating on getting it showing up when the interaction pane is invoked); minor css tweaks. 2012-02-26 21:17:20 -08:00
danielgrippi
98a834884f this is not the right solution... it's way too obnoxious. 
Revert "don't show nsfw posts without a shield in the viewer"

This reverts commit 722116cebc.
 2012-02-26 14:24:16 -08:00
danielgrippi
6e0b351d70 remove repetitive clock icon from the post viewer. 2012-02-26 14:23:47 -08:00
Sean Tilley
577c337705 Fix positining in message pane timestamps. 2012-02-26 04:31:48 -06:00
danielgrippi
722116cebc don't show nsfw posts without a shield in the viewer 2012-02-25 20:01:30 -08:00
danielgrippi
f70b290316 added two helpers to handlebars for avatar images / links to people. 2012-02-25 19:29:14 -08:00
Maxwell Salzberg
bb75458b74 Merge pull request #2923 from SuperTux88/searchbox-css-fix 
fix css for searchbox (fixes #2878)[ci skip]
 2012-02-25 17:13:39 -08:00
danielgrippi
c5b30b39de don't page nav when focused in the comment box 2012-02-24 22:47:00 -08:00
danielgrippi
2ee329d786 make sneaky passive by default. this fixes the bug where a user would like something when the interaction pane is active and the sneaky would show up when the feedback view was re-rendered. 2012-02-24 22:36:37 -08:00
danielgrippi
73f224e690 don't render page-viewer twice; last_post should actually get the last post posted, not the first one 2012-02-24 21:48:37 -08:00
danielgrippi
dc0b5db0ac Merge branch 'profiles' of github.com:diaspora/diaspora into profiles 2012-02-24 20:14:26 -08:00
Dennis Collinson
b28508ecbc MS DC show last post and show page works unauthenticated 
phasing out app.user() for app.currentUser
 2012-02-24 19:09:00 -08:00
Joe Bivins
b179de1e64 Add spacing between paragraphs and dots before items in an unordered list. [ci skip] 2012-02-24 20:18:10 -05:00
danielgrippi
39d31d5888 Merge branch 'master' of github.com:diaspora/diaspora into profiles 2012-02-24 14:36:18 -08:00
Dennis Collinson
5154500239 small refactoring around router.js 2012-02-24 14:33:57 -08:00
danielgrippi
2c0cfa53dc don't show left-right nav when idle 2012-02-24 13:31:17 -08:00
Dennis Collinson
6e55d6c011 DC MS DG; un-namespace single post JSON responses 2012-02-24 13:30:16 -08:00
Maxwell Salzberg
ead0b14a48 Merge pull request #2916 from Raven24/photos-lightbox 
make lightbox work for photos page (+tests)
 2012-02-24 10:46:01 -08:00
Benjamin Neff
392625dd4c fix css for searchbox (fixes #2878) 2012-02-24 03:20:30 +01:00
danielgrippi
34b9e1c7ca fix padding on comment button 2012-02-23 17:26:16 -08:00
Dennis Collinson
9769dfb303 cukes passing 2012-02-23 17:24:19 -08:00
danielgrippi
b38c49883b sneaky dock has an arrow now. you can click the top of the interaction bar to close/open it. 2012-02-23 17:23:24 -08:00
danielgrippi
2fa673b140 get sneaky 2012-02-23 16:45:10 -08:00
danielgrippi
a35dfa1157 remove some unused stuff in templates 2012-02-23 13:59:29 -08:00
danielgrippi
857f51b684 more moz fixes 2012-02-23 13:12:03 -08:00
danielgrippi
c3c20db8e8 fix arrow positioning for moz. 2012-02-23 13:12:03 -08:00
danielgrippi
e78ab14fc5 remove top-level divs from handlebars templates -- move that logic into the backbone view. 2012-02-23 12:18:29 -08:00
danielgrippi
806487a5ff namespace view folder with folders 2012-02-23 11:12:20 -08:00
Diaspora Europe
019b68281e handle text-overflow for long usernames #2557 2012-02-23 12:21:01 +01:00
danielgrippi
91e77e9dce small css tweaks 2012-02-22 20:50:56 -08:00
danielgrippi
71146f27db fix activity streams photo template 2012-02-22 19:23:52 -08:00
danielgrippi
b4923a77f0 add keybinding to the viewer 2012-02-22 19:19:24 -08:00
danielgrippi
846b14fac6 DG MS; you can comment from show pages. killer tofu. 2012-02-22 17:42:51 -08:00
danielgrippi
21d91f1b4c interaction buttons morph into reaction popup 2012-02-22 14:44:13 -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
danielgrippi
3ec7755c83 update reshare count when resharing; return PostPresenter for reshare root in the success response 2012-02-21 21:51:40 -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
ebcde41e69 display original author if post is a reshare 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
danielgrippi
3cab4d348a fix nav img issue 2012-02-21 15:23:30 -08:00
danielgrippi
7466808112 created post author view. 2012-02-21 15:23:29 -08:00
danielgrippi
6965d6da24 fix feedback views. use gross callbacks for now 2012-02-21 15:23:29 -08:00
danielgrippi
5ac6188f23 toggle feedback slider; css tweaks 2012-02-21 15:23:29 -08:00
danielgrippi
a1fe55fcb7 mark icons colored if user has interacted with a post. 2012-02-21 15:23:29 -08:00
danielgrippi
f4269f2d44 DG RY; provide a background color to post author for legibility on post pages with background images 2012-02-21 15:23:29 -08:00
danielgrippi
f31418feb3 pjax clicking on nav arrows; move author header into backbone land; comment out comment form for now 2012-02-21 15:23:29 -08:00
danielgrippi
ca8e8ac0c2 added animation @mixin; refactored post-viewer binding calls 2012-02-21 15:23:29 -08:00
danielgrippi
2815885bcf add user_like to PostPresenter; use proper inheritance for feedback views 2012-02-21 15:23:29 -08:00
danielgrippi
f83b82902c markdownify text; better folder structure for photo-viewer templates 2012-02-21 15:23:29 -08:00
danielgrippi
5a1f3675b5 namespacing. set up initial feedback hooks. 2012-02-21 15:23:29 -08:00
danielgrippi
e60bd7b3e5 fix photoset positioning 2012-02-21 15:23:28 -08:00
danielgrippi
c0eeb7680b pages wip 2012-02-21 15:23:28 -08:00
danielgrippi
7acbfe1b78 refactored some js to make sense of how we're going to attack the post show page with a js Page 2012-02-21 15:23:28 -08:00
danielgrippi
7ec13d26ac add bootstrap back 2012-02-21 15:23:28 -08:00
danielgrippi
ead286bf99 DG RY; moved actions to the bottom of the show pages; fixed arrows 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
cc0e04ea3f DG MS; fix user controls 2012-02-21 15:23:28 -08:00
danielgrippi
691bdb96cd DG MS; post vitals on top left; user action placeholder on top right 2012-02-21 15:23:28 -08:00
Maxwell Salzberg
e0b29048f4 haxy auto comment functionality; try me and then revert me" 2012-02-21 15:23:27 -08:00
danielgrippi
c3c23209c3 more fiddling with box model; added arrows 2012-02-21 15:23:27 -08:00
danielgrippi
c36c6e9569 finally figured out flexbox [ci skip] 2012-02-21 15:23:27 -08:00
danielgrippi
1c4a689af7 DG MS; added a new layout for post pages. 2012-02-21 15:23:27 -08:00
danielgrippi
e3ebf05ac2 DG MS; new templates for post show pages. 2012-02-21 15:23:27 -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
Florian Staudacher
7c73a526dd fix for #2770 
- apply the padding to the wrapper element, not to the textarea
   apparently padding a textarea makes it shrink in firefox... ?
 - don't use manual padding, instead specify max-height for images
   extra-huge images are jolted, but they don't explode the layout
 - closing handled by view,
   gets rid of "Publisher.close is not a function" error msg
 2012-02-19 21:14:12 +01: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
David Morley
b5bb66c66d fix 2898 - public profile unauthed user 2012-02-18 16:28:05 -08:00
Maxwell Salzberg
1e170291e5 add a missing test for block user, and fix ignoring a user from a non stream page; rename a javascript method as it was actually the oppisite of what it said it was doing 2012-02-18 16:28:04 -08:00
danielgrippi
be363b98e5 DG MS; move logic out of layout into LayoutsHelper. 2012-02-18 16:28:03 -08:00
danielgrippi
7ca423b3f2 DG MS; don't initialize a stream on post pages. 2012-02-18 16:28:02 -08:00
Dennis Collinson
32d58e8a9b toggle all nsfw posts 2012-02-18 16:26:17 -08:00
danielgrippi
34cc358345 aliasing in routes.js [ci skip] 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