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. [ci skip]
|
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 |
|
danielgrippi
|
a3d596a853
|
DG MS; only fetch contacts when focused in on Publisher.input(); limit autocomplete; added uma back; fixed jasmine tests.
|
2012-01-26 18:51:02 -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 |
|
Jonne Haß
|
bddd9b244f
|
flickr embedding doesn't break the JS anymore
|
2012-01-26 05:38:43 +01:00 |
|
Maxwell Salzberg
|
3808547ac4
|
adding back the images we use in development
|
2012-01-24 18:20:50 -08:00 |
|
Maxwell Salzberg
|
9aaec14800
|
remove a bunch of unused images. we might use one or two of these on test but we can deal with it later [ci skip]
|
2012-01-24 17:52:40 -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 |
|
Jonne Haß
|
6f283632c5
|
fix resharing a reshare, javascript isn't ruby :P
|
2012-01-24 19:44:45 +01:00 |
|
danielgrippi
|
b021a26674
|
make mentions in selector more ledgable [ci skip]
|
2012-01-24 10:09:21 -08:00 |
|
Jonne Haß
|
51d1bbbd70
|
app.user returns false instead of undefined if logged out, fix #2723
|
2012-01-24 11:56:48 +01:00 |
|
Sarah Mei
|
dbfbab3a4f
|
jammit is looking for this file. @denniscollective have a look at this tomorrow and remove if we don't need it
|
2012-01-23 21:11:38 -08:00 |
|
Dennis Collinson
|
f9e9a3500e
|
rebased, removed orphaned callbacks
|
2012-01-23 19:38:38 -08:00 |
|
Dennis Collinson
|
870ad3d9f7
|
DC DG; some fixes, mentioning works.
|
2012-01-23 19:32:15 -08:00 |
|
Dan Hansen
|
51332931ee
|
almost done
|
2012-01-23 19:31:01 -08:00 |
|
Dan Hansen
|
e169879311
|
remove jquery.elastic dependency
|
2012-01-23 19:31:00 -08:00 |
|
Dan Hansen
|
3b4e3fd87e
|
mentions now work for stream publisher
|
2012-01-23 19:31:00 -08:00 |
|
danielgrippi
|
94ad9264f1
|
DG DH; wip
|
2012-01-23 19:31:00 -08:00 |
|
Dan Hansen
|
168d6cbdbe
|
jquery.mentionsInput wip, almost done
|
2012-01-23 19:31:00 -08:00 |
|
Jonne Haß
|
7aaaf4f43b
|
use guid instead of id for /people/ urls
|
2012-01-23 23:35:31 +01: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 |
|