Dennis Collinson
78b0ee10da
bump item height for great justice.
2012-03-22 18:43:35 -07:00
Dennis Collinson
254bd9b89c
move padding down to post
2012-03-22 18:14:29 -07:00
Dennis Collective
48d2bf02b6
Merge pull request #3030 from Raven24/patch-1
...
don't let oembed content grow beyond stream width
2012-03-22 11:40:55 -07:00
danielgrippi
0883ce1dbb
fix a bunch of cukes. the disabled functionilty in rails helpers changed and we had to update out JS accordingly
2012-03-21 13:50:24 -07:00
Raven24
907e19e885
don't let oembed content grow beyond stream width
2012-03-21 17:51:05 +01:00
Maxwell Salzberg
af008ab713
remove unused expander plugin
2012-03-19 19:13:15 -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
Diaspora Europe
563e94b804
let date looks nice
2012-03-15 16:44:25 +01:00
danielgrippi
5e75c6d675
fix jasmine around contact-list.js
2012-03-14 16:26:30 -07: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
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
298327d2af
Merge pull request #2982 from diasp/2912-message-overflows
...
Handle many users in a message #2912[ci skip]
2012-03-13 15:58:18 -07:00
Diaspora Europe
c48e792c75
added notification badge
2012-03-13 17:27:40 +01:00
Diaspora Europe
afd750536f
added badges to mobile css
2012-03-13 16:46:04 +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
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
Diaspora Europe
ecc86c1f86
handle many users in a message #2912
2012-03-07 13:00:55 +01:00
Maxwell Salzberg
76450f7882
Merge pull request #2906 from Raven24/fix-2770
...
fix for #2770
2012-03-06 22:36:53 -08:00
Maxwell Salzberg
d211272cab
Merge pull request #2981 from DeadSuperHero/beautyqueen
...
Fix #2974 , markdown headers now different from headers in post [ci skip]
2012-03-06 22:35:04 -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
danielgrippi
bdcbf5b985
responsive show pages [ci skip]
2012-03-06 15:19:05 -08:00
Sean Tilley
053ca1d20b
Fix #2974 , markdown headers now different from headers in post
2012-03-06 17:10:04 -06: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
Sean Tilley
b4332b80e4
Add extra bit to ensure fixedness for #2951
2012-03-01 03:59:49 -06:00
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
