Commit graph

11184 commits

Author SHA1 Message Date
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
Maxwell Salzberg
7036c82562 Merge pull request #2968 from dmorley/patch-12
remove shapado and getsatisfaction
2012-03-01 10:25:23 -08:00
David Morley
2b0dc3e1ec remove shapado and getsatisfaction 2012-03-01 10:15:53 -08:00
Diaspora Europe
41c3698ebf remove unused youtube_titles from comments and posts 2012-03-01 15:37:20 +01:00
Sean Tilley
fd540aacc9 Merge pull request #2964 from DeadSuperHero/photofix
Add extra bit to ensure fixedness for #2951
2012-03-01 02:04:12 -08:00
Sean Tilley
b4332b80e4 Add extra bit to ensure fixedness for #2951 2012-03-01 03:59:49 -06:00
Daniel Grippi
7a774661bb Merge pull request #2777 from stwf/tweak-twitter-truncation
take url shortening into effect before truncating twitter posts
2012-02-29 22:49:46 -08:00
Daniel Grippi
ad9df616e0 Merge pull request #2963 from DeadSuperHero/photofix
Fix photo uploader, kill breakage #2951 [ci skip]
2012-02-29 22:46:28 -08:00
Sean Tilley
d505826bc5 Fix photo uploader, kill breakage #2951 2012-03-01 00:38:03 -06:00
Diaspora Europe
e2776420bc added likes specs to post view 2012-02-29 12:12:32 +01: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
Maxwell Salzberg
d80afc64ec fix ordering for logged out users 2012-02-27 19:16:05 -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
22cda15aa8 presenter now has a title 2012-02-27 18:11:41 -08:00
danielgrippi
0df179c514 fix specs 2012-02-27 17:56:52 -08:00
Dennis Collective
7abbe4a642 Merge pull request #2925 from diasp/2833-conversations-should-return-json
Conversations should return json #2833
2012-02-27 17:34:10 -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
Jonne Haß
38e4394e55 updated 22 locale files [ci skip] 2012-02-27 22:33:19 +01: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
Jakob Kramer
c2ae103030 disable superscripts on server-side markdownify, since they are disabled client-side too 2012-02-26 22:30:54 +01:00
Maxwell Salzberg
a4e312d537 Merge pull request #2936 from DeadSuperHero/messagepanefix
Fix positioning in message pane timestamps. [ci skip]
2012-02-26 11:03:46 -08:00
Sean Tilley
577c337705 Fix positining in message pane timestamps. 2012-02-26 04:31:48 -06:00
Steven Fuchs
66afb7baff use a stub instead of creating a post to simpy supply text 2012-02-25 23:59:02 -05: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
3e65d39b68 rename some stuff in hydra to make it more clear [ci skip] 2012-02-25 18:19:19 -08:00
Maxwell Salzberg
42a93f9490 remove weird monkey patch in sessions controller #wtf 2012-02-25 17:41:46 -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
Maxwell Salzberg
c85e2a9b5d Merge pull request #2935 from Raven24/host-meta
adapt host-meta document to RFC 6415
2012-02-25 17:11:06 -08:00
Maxwell Salzberg
9e236e0234 Merge pull request #2930 from jbivins/spacing-between-paragraphs
Add spacing between paragraphs and dots before items in an unordered lis...[ci skip]
2012-02-25 17:10:48 -08:00