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
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
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
Maxwell Salzberg
b7fc774d06
semi-colons; use them
2012-03-07 16:24:02 -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
fa5424653a
fix markup display on reshares. DERP. [ci skip]
2012-02-06 08:02:27 -08:00
danielgrippi
b2be1b2c53
a little less broken. formatting is broken on reshares, but the cukes should now pass.
2012-02-05 22:58:08 -08:00
danielgrippi
bb95bf55f6
fix images in reshares. unfortunately, the reshare presenter is broken right now and i'm passing out in front of my laptop (re: cuke failure) :( [ci skip]
2012-02-05 21:54:06 -08:00
danielgrippi
5d051fcc52
we're now rolling 100% handlebars for our templates, with jammit handling them as static assets.
2012-02-05 16:42:34 -08:00
danielgrippi
36e5ca431f
replace two more underscore templates with handlebar counterparts [ci skip]
2012-02-05 13:40:34 -08:00
Jonne Haß
bddd9b244f
flickr embedding doesn't break the JS anymore
2012-01-26 05:38:43 +01:00
danielgrippi
0a670ccf8a
convert comment underscore template to a handlebars template.
2012-01-22 23:37:13 -08:00
danielgrippi
9510e1ca6f
i mustache you a question, but i'll shave it for you later.
2012-01-22 22:01:57 -08:00
danielgrippi
5d15c53f6b
Revert "Revert "now using handlebars for client side templates" for now"
...
This reverts commit 5f9c469b12
2012-01-22 22:01:57 -08:00
Dennis Collinson
5f9c469b12
Revert "now using handlebars for client side templates" for now
...
This reverts commit 4692055d8a
2012-01-22 17:16:22 -08:00
Dennis Collinson
4692055d8a
now using handlebars for client side templates
2012-01-22 16:59:44 -08:00
danielgrippi
8150d32b86
using pageDown Markdown library, fixing autolinking. created app.helpers.textFormatter, which takes care of text formatting; functions can be called individually throughout the app
2012-01-15 18:28:58 -08:00
danielgrippi
177f608276
fix oembed issues in backbone land
2012-01-15 15:56:34 -08:00
Maxwell Salzberg
ee6fc18703
fix oembed specs by allowing ; in auto link on client side"
2012-01-12 17:25:01 -08:00
danielgrippi
c11fdb0459
put 'Admin' back in #user_menu for admins. this fixes #2595 [ci skip]
2012-01-08 23:43:17 -08:00
danielgrippi
a1cf279226
support twitter hashbangs in urls for url parsing [ci skip]
2012-01-08 17:35:56 -08:00
danielgrippi
5e65c88bd8
better regex for capturing urls (sensitive to urls in tags) [ci skip]
2012-01-08 17:06:25 -08:00
danielgrippi
a899e71ce5
switch order of auto-linking
2012-01-07 21:19:13 -08:00
danielgrippi
ad2e6a414f
autolink urls in content view
2012-01-07 20:47:30 -08:00
danielgrippi
d5a4f9eb98
use content_view for comments (markdown, tagging)
2012-01-07 20:19:47 -08:00
