Commit graph

1274 commits

Author SHA1 Message Date
Florian Staudacher
cd965e32fa fix comment stream jasmine - bind function after spy has been defined 2012-03-14 18:43:06 +01:00
Maxwell Salzberg
2a30e60fe0 Merge branch 'search-repeatedly' of https://github.com/stwf/diaspora into stwf-search-repeatedly 2012-03-13 16:41:16 -07: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
Maxwell Salzberg
0d5c518630 Merge pull request #2976 from jbivins/legacy-browser-support
Legacy browser support
2012-03-09 16:51:34 -08:00
Florian Staudacher
7505670a2a removed unnecessary js/css, since it works differently now 2012-03-09 18:16:21 +01:00
Steven Fuchs
9de477cf5a jasmine spec up and working. code out of (no longer called) contacts info page object. Fixed namespaces and created jasmine fixture for empty and pending searches. 2012-03-07 23:19:51 -05:00
Steven Fuchs
7048fa6d50 fixing conflicts in merge 2012-03-07 23:19:50 -05:00
Steven Fuchs
23aff2af5e run second search ajaxily when no results are found from remote pod. 2012-03-07 23:19:50 -05: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
Joe Bivins
7b47edff14 Move date parsing to a helper. 2012-03-04 13:36:35 -05:00
Joe Bivins
8df0bb85fe Wrap the publisher params tag in a div instead of a paragraph.
Safari 4.1.3 cited the closing params tag as being an unmatched tag.
Changing the paragraph to a div causes the error to disappear.
2012-03-03 12:42:54 -05:00
Joe Bivins
4769a25d59 Add ISO 8601 timestamp parsing for legacy browsers.
Would cause legacy browsers (e.g. Safari 4.1.3) to show posts in the
reverse order and the infinite scroll would not be triggered when
scrolling down to the end of the page.
2012-03-03 12:14:43 -05:00
danielgrippi
61b4e77bde Merge branch 'profiles' 2012-02-28 10:29:17 -08: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
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
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
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
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
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