Dennis Collinson
78b0ee10da
bump item height for great justice.
2012-03-22 18:43:35 -07:00
Maxwell Salzberg
2e1f353ac4
Merge branch 'show-more' of https://github.com/Raven24/diaspora into Raven24-show-more
...
Conflicts:
public/javascripts/app/views/content_view.js
2012-03-19 19:11:57 -07:00
Maxwell Salzberg
e0c71e13de
Merge pull request #3012 from Raven24/oembed-fixes
...
small fixes for oembed in posts [ci skip]
2012-03-19 19:03:26 -07:00
Florian Staudacher
784f1ffbe1
using $ instead of jQuery ...
2012-03-15 20:15:48 +01:00
Florian Staudacher
3d1925ec63
small fixes for oembed:
...
- make container inline-block to fit content (for overlay buttons to be centered)
- fix javascript ("src" instead of "href" for iframes), also disambiguate variable names
2012-03-15 17:39:02 +01:00
Maxwell Salzberg
7aa906b463
make setupBinds make even more sense
2012-03-14 11:16:25 -07:00
Florian Staudacher
cd965e32fa
fix comment stream jasmine - bind function after spy has been defined
2012-03-14 18:43:06 +01:00
Florian Staudacher
813b706f8e
added little fix for extra long content
2012-03-14 02:09:27 +01:00
Florian Staudacher
9aa0a7ed58
extracted "show more" part from #2941 , tests still WIP
2012-03-14 02:09:27 +01:00
Maxwell Salzberg
51c47695b2
Merge pull request #2978 from Raven24/video-thumbnail
...
oembed video thumb [oh yeah]
2012-03-09 16:56:42 -08:00
Florian Staudacher
7505670a2a
removed unnecessary js/css, since it works differently now
2012-03-09 18:16:21 +01:00
Maxwell Salzberg
b7fc774d06
semi-colons; use them
2012-03-07 16:24:02 -08:00
Maxwell Salzberg
76450f7882
Merge pull request #2906 from Raven24/fix-2770
...
fix for #2770
2012-03-06 22:36:53 -08:00
Florian Staudacher
2976f7d7d1
added overlayed "play" icon to thumb,
...
made the "loader" gif background for oembed container
make videos autoplay after click
2012-03-07 00:52:26 +01:00
Florian Staudacher
98d1e29055
extracted oembed thumb stuff from #2941 , also fixes oembed cukes
2012-03-05 00:44:08 +01:00
danielgrippi
74cdc91bb1
fix likes and comment loading in the stream
2012-02-27 20:38:59 -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
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
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
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
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
danielgrippi
39d31d5888
Merge branch 'master' of github.com:diaspora/diaspora into profiles
2012-02-24 14:36:18 -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
c3c20db8e8
fix arrow positioning for moz.
2012-02-23 13:12:03 -08:00
danielgrippi
806487a5ff
namespace view folder with folders
2012-02-23 11:12:20 -08:00
danielgrippi
91e77e9dce
small css tweaks
2012-02-22 20:50:56 -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
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
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
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
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
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
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
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
1c4a689af7
DG MS; added a new layout for post pages.
2012-02-21 15:23:27 -08:00