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
|
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 |
|
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 |
|
Steven Fuchs
|
5ea4bc0a1b
|
Merge remote branch 'upstream/master' into return-contact-popup-to-notify
|
2012-01-29 18:13:30 -05: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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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
|
363ca8c07e
|
Merge branch 'master' of git://github.com/diaspora/diaspora into input-placeholders
|
2012-01-22 14:42:45 +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
|
c3b9bb9a9a
|
expanding likes works again
|
2012-01-21 18:55:07 -08:00 |
|
danielgrippi
|
9e3521396d
|
clear new comment on submit; include the newer autoexpander in jasmine
|
2012-01-20 21:58:07 -08:00 |
|
danielgrippi
|
25d0f0d87f
|
updated jquery autoResize; comment boxes now expand
|
2012-01-20 21:45:55 -08:00 |
|
Steven Fuchs
|
9836860ca3
|
Merge remote branch 'upstream/master' into im-sorry-bye-vanna
|
2012-01-20 12:23:45 -05:00 |
|
danielgrippi
|
7bcbd86cdf
|
remove stray console.log
|
2012-01-20 01:21:13 -08:00 |
|
danielgrippi
|
b4e0483a18
|
fixed really nasty inf scroll bug (hotfix)
|
2012-01-20 01:20:41 -08:00 |
|
danielgrippi
|
b9c98b2b44
|
support shortened post routes in js router
|
2012-01-19 23:41:49 -08:00 |
|