Sarah Mei
d40746bff7
Fixes #2713 - searching for punctuation now doesn't throw a 500. Refactored people#index specs.
2012-01-28 13:45:39 -08:00
danielgrippi
f250b79105
post owners can now delete any comments on their own posts. fixes #2652
2012-01-27 18:24:46 -08:00
danielgrippi
d773749374
comment stream now uses handlebars.
2012-01-27 17:46:35 -08:00
danielgrippi
d8c6dc0d79
added source to stream element js template. [ci skip]
2012-01-27 13:51:24 -08:00
danielgrippi
ff71bc5a44
remove @backbone reference in people/show (thx @mrZYX for the catch); added loaders to people and tag pages
2012-01-27 10:53:03 -08:00
danielgrippi
0da5f18ad5
add placeholder in CommentStreamView. [ci skip]
2012-01-26 19:58:00 -08:00
danielgrippi
5a78796ec0
Merge branch 'input-placeholders' of https://github.com/Raven24/diaspora into Raven24-input-placeholders
2012-01-26 19:52:27 -08:00
danielgrippi
fa1ee731af
DG MS; made an imageUrl handlebars helper for assets served through handlebars templates.
2012-01-26 17:04:03 -08:00
Maxwell Salzberg
939383ef32
You can now use rake assets:precompile to upload all of your static assets to s3. This uses your prexisiting settings in AppConfig for s3. then, start your server with ASSET_HOST={cdn_hostname} remember to include https and no trailing slash
2012-01-25 11:22:45 -08:00
Daniel Grippi
89472992cc
Merge pull request #2720 from MrZYX/people_slash_guid
...
use guid instead of id for /people/ urls
2012-01-24 13:14:08 -08:00
Dennis Collinson
f506a8778c
moving javascript hax
2012-01-23 19:32:15 -08:00
Dan Hansen
51332931ee
almost done
2012-01-23 19:31:01 -08:00
Jonne Haß
7aaaf4f43b
use guid instead of id for /people/ urls
2012-01-23 23:35:31 +01:00
danielgrippi
8f38a19976
stray underscore reference in handlebars template [ci skip]
2012-01-23 10:27:37 -08:00
danielgrippi
c94cc1cef2
markdown text in comments (auto linking, etc). we can use {{{ }}} notation here because markdown strips out xss, etc.
2012-01-23 00:57:05 -08:00
danielgrippi
bf5538d035
convert header template from underscore to handlebars [ci skip]
2012-01-23 00:40:19 -08:00
danielgrippi
0a670ccf8a
convert comment underscore template to a handlebars template.
2012-01-22 23:37:13 -08:00
danielgrippi
3a76490640
window.app.user() doesn't return attributes nested in a key; added a comment_view spec
2012-01-22 23:37:13 -08:00
danielgrippi
778683f3e3
don't extend helpers in the notifications index view; make notification_count and unread_message_count controller helper methods (now that we're not using vanna)
2012-01-22 22:26:27 -08:00
Daniel Grippi
2c50de0726
Merge pull request #2714 from stwf/im-sorry-bye-vanna
...
Remove Vanna Controller from app and fix up notifications controller, views, scripts, specs
2012-01-22 22:15:14 -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
Sarah Mei
5bd929b697
Remove references to GetSatisfaction
2012-01-22 20:46:13 -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
Steven Fuchs
e882dedd33
remove vanna controller from app, adjust scripts, specs, views and controllers to work.
2012-01-22 17:39:35 -05:00
Florian Staudacher
729f815736
checkbox labels should now be where they're supposed to (they were color:#CCC before, I left them #222 for now)
...
also labels are font-weight:normal and a little smaller since they seemed very dominant compared to the input fields (if not desireable, just remove font-size:.96em)
are there any more inputs I don't (yet) know about...?
2012-01-22 15:18:11 +01:00
Florian Staudacher
363ca8c07e
Merge branch 'master' of git://github.com/diaspora/diaspora into input-placeholders
2012-01-22 14:42:45 +01:00
Jonne Haß
c8e09bf325
localize back to top [ci skip]
2012-01-22 13:54:31 +01:00
Maxwell Salzberg
50e8e90066
add basic nsfw for mobile. fixes #2709
2012-01-22 01:56:16 -08:00
danielgrippi
cc1ac843cc
re-added widget; fixed tests; use _.throttle instead of depricated custom debounce
2012-01-21 20:23:00 -08:00
danielgrippi
7ef70b9090
collapse reshare text [ci skip]
2012-01-21 19:02:58 -08:00
danielgrippi
c3b9bb9a9a
expanding likes works again
2012-01-21 18:55:07 -08:00
danielgrippi
8b4f0473a7
mobile header gradient reflects the desktop gradient; added background texture to mobile
2012-01-21 15:19:06 -08:00
Steven Fuchs
9836860ca3
Merge remote branch 'upstream/master' into im-sorry-bye-vanna
2012-01-20 12:23:45 -05:00
danielgrippi
c219cee97d
fix inf scroll issues in stream view
2012-01-19 17:01:45 -08:00
Maxwell Salzberg
aa449f3a2d
a couple of additions to the branch
2012-01-19 13:33:05 +01:00
Florian Staudacher
ad5a17776f
Merge branch 'master' of git://github.com/diaspora/diaspora into input-placeholders
2012-01-19 13:29:35 +01:00
danielgrippi
c82ac5f3e2
fix collapsing of posts [ci skip]
2012-01-18 12:40:33 -08:00
Maxwell Salzberg
b09e76a0ce
introduce base_pod_uri, so we can support domains that use www and [bare] with webfinger
2012-01-17 17:34:42 -08:00
Steven Fuchs
aae5fe04ce
css for marking as unread, and hook for notification page to be part of it when called.
2012-01-17 19:21:25 -05:00
Florian Staudacher
81ae0c644c
start using new placeholders on login page
2012-01-18 01:17:20 +01:00
danielgrippi
339c47d782
moved stream logic into its own controller (StreamsController)
2012-01-17 15:53:06 -08:00
danielgrippi
bfe0b7129c
move all stream actions into PostController
2012-01-17 15:53:06 -08:00
Dennis Schubert
e0a63e624f
Fix my quick fix (use '.present?' instead of 'not .nil?')
2012-01-17 21:25:21 +01:00
Dennis Schubert
57697dea28
Quick fix: Fix 500 on /conversations when a author is missing. This is a temporary fix, see #2682
2012-01-17 21:10:45 +01:00
Maxwell Salzberg
5d01904231
fix bookmarklet. fixes #2605
2012-01-16 14:36:21 -08:00
danielgrippi
177f608276
fix oembed issues in backbone land
2012-01-15 15:56:34 -08:00
danielgrippi
91e3f5f6ff
remove cache counter for photos, as it was causing too many edge-case errors & added complexity across models
2012-01-14 15:40:43 -08:00
Maxwell Salzberg
ca7632776f
prevent mobile comments from 500ing
2012-01-14 11:52:24 -08:00
