danielgrippi
b866d9356a
Merge branch 'master' of github.com:diaspora/diaspora
2012-02-10 15:18:49 -08:00
danielgrippi
ed3d5c429a
fix a bunch of small css related media box issues [ci skip]
2012-02-10 15:18:27 -08:00
Maxwell Salzberg
6bc44f6f5a
add more images to use handlebars imageUrl helper
2012-02-10 13:44:45 -08:00
danielgrippi
0056bc354e
fix weird search bar shadow issue in chrome [ci skip]
2012-02-09 18:35:19 -08:00
danielgrippi
2b15bc7938
fix syntax in comment.rb
2012-02-09 18:29:52 -08:00
danielgrippi
535c39ae7b
fix jasmine
2012-02-09 18:21:51 -08:00
danielgrippi
f7e09df49b
fix reshare tempalte; reorder header
2012-02-09 15:50:32 -08:00
danielgrippi
e6e49bbf1f
stubbornella media and img dom structure FTW! major css deletion <3
2012-02-09 14:29:01 -08:00
danielgrippi
398ca3d97b
Participate / Explore have been upgraded to top-level status.
2012-02-09 14:29:01 -08:00
danielgrippi
84eb313e20
updated routes to reflect page titles (explore/participate)
2012-02-08 14:40:28 -08:00
Dennis Collinson
8ae18bb393
nsfw's users posts are now nsfw
2012-02-07 19:14:44 -08:00
Dennis Collinson
efd99344eb
git status
2012-02-07 18:29:51 -08:00
Ricardo
b4c0c0e679
Fix #1308 : publisher submits w/o pasted text
...
Text can be input not only with the keyboard but also with a right-click
paste or a middle mouse button paste in X. The publisher now listens to
the 'textchange' event instead of ignoring anything but a 'keyup'.
2012-02-07 22:40:56 +08:00
Maxwell Salzberg
e46bf0cba4
that weird header is not loading bug was a missing semicolan #dumb #javascript
2012-02-06 18:33:14 -08:00
Dennis Collinson
a399572995
MS DC; fix participate stream ordering problem that was putting new posts on the bottom of things
2012-02-06 16:51:32 -08:00
Dennis Collinson
578e8ef269
broken
2012-02-06 14:55:14 -08:00
danielgrippi
de757db48b
fix ruby reshare model; extract sortOrder in app.models.Stream.
2012-02-06 08:26:11 -08: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
fafa74a222
fix spec, mustache scoping issue in partial.
2012-02-05 21:23:45 -08:00
danielgrippi
7d60d96132
set handlebars compiler in jammit config.yml (handlebars worries about maintaining a compilation cache, we don't have to do this manually.) [ci skip]
2012-02-05 21:18:34 -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
danielgrippi
5a72f868d3
replace two underscore templates with their handlebars counterparts
2012-02-05 12:50:28 -08:00
danielgrippi
39ff47150b
allow jammit to serve up our handlebars templates, making them cacheable! added bonus: changing a handlebars template now doesn't involve re-running rspec to regenerate them. zing.
2012-02-04 15:50:36 -08:00
Dennis Collinson
354ed7ef05
paginating participate stream
2012-02-03 17:55:06 -08:00
Dennis Collinson
3991903b56
MS DG DC Participate stream that has things bubble to the top
2012-02-03 17:23:57 -08:00
danielgrippi
4be7daaabf
downgrade backbonejs for now back to 0.5.x; leave underscore
2012-02-03 14:29:50 -08:00
danielgrippi
67a79d5937
upgrade backbone and underscore js
2012-02-03 11:38:05 -08:00
Dennis Collective
6dbd644b01
Merge pull request #2719 from stwf/return-contact-popup-to-notify
...
aspects popup menu missing from 'started sharing' notifications
2012-02-03 00:42:10 -08:00
danielgrippi
4151f9c1a4
Revert "remove some unused images [ci skip]"
...
This reverts commit 1e508218d2
2012-02-02 11:17:30 -08:00
danielgrippi
488e064e11
swap pin for heart [ci skip]
2012-02-01 16:53:22 -08:00
danielgrippi
1e508218d2
remove some unused images [ci skip]
2012-02-01 16:45:55 -08:00
danielgrippi
9377dd30f4
reference pin icon in mobile view [ci skip]
2012-02-01 16:41:27 -08:00
danielgrippi
310a0679f1
particpate stream, yo!
2012-02-01 16:05:16 -08:00
Sarah Mei
7389b895d6
Fix #2799 - bullet points in a post that has 'read more'
2012-02-01 14:31:07 -08:00
Maxwell Salzberg
f826340336
push stream listings to the side a bit
2012-02-01 13:56:52 -08:00
Sarah Mei
3ed68fc036
Fixes #2788 - show formatted text under show more
2012-02-01 11:55:20 -08:00
Steven Fuchs
77fc4b6cab
moved tests from jasmine to controller specs
2012-01-31 13:58:41 -05:00
danielgrippi
1d19dba9b4
add missing bootstrap files.
2012-01-29 15:19:46 -08:00
Steven Fuchs
5ea4bc0a1b
Merge remote branch 'upstream/master' into return-contact-popup-to-notify
2012-01-29 18:13:30 -05:00
danielgrippi
bcbabc5fd2
Switch boilerplate for bootstrap 2 on mobile. [ci skip]
2012-01-29 11:51:47 -08:00
Sarah Mei
1f710232d8
Clicking 'read more' now removes the link and collapses the adjacent paragraphs. Also: hella semicolons. Fixes #2766
2012-01-28 22:29:43 -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
Steven Fuchs
24359623fe
return auto-reading to notifications shown in popup menu.
2012-01-27 13:53:27 -05: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
53128f3153
set mentions limit at 1 instead of 2. [ci skip]
2012-01-26 18:57:41 -08:00
