nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
10968 commits 4 branches 0 tags 121 MiB
Commit graph

1185 commits

Author SHA1 Message Date
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
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
danielgrippi
356494b78b DG DC; $("window") doesn't actually work in the binding scenario 2012-01-19 17:16:58 -08:00
danielgrippi
750e26e8fb Merge branch 'stream-js-cleanup' 
Conflicts:
	public/javascripts/app/models/stream.js
 2012-01-19 17:07:17 -08:00
danielgrippi
b583a7a444 Put dennis's changes back in 
Revert "Revert "refactoring backbone urls""

This reverts commit 838da1fd52.

Revert "revert 9b1d64bb76 as it is causing inf. scroll to break (stream model now has a post collection)"

This reverts commit 2a69c0ebd4.
 2012-01-19 17:05:30 -08:00
danielgrippi
c219cee97d fix inf scroll issues in stream view 2012-01-19 17:01:45 -08:00
Maxwell Salzberg
3fa2592728 fix a bug with client side validations and jquery cache thx 2 grippi for idea 2012-01-19 15:59:20 -08:00
Maxwell Salzberg
838da1fd52 Revert "refactoring backbone urls" 
This reverts commit 4ad58bdf2f.
 2012-01-19 14:20:31 -08:00
Maxwell Salzberg
2a69c0ebd4 revert 9b1d64bb76 as it is causing inf. scroll to break (stream model now has a post collection) 2012-01-19 11:18:13 -08:00
Jonne Haß
51851ea1f2 pass response into fetched event as expected 2012-01-19 15:57:11 +01: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
Dennis Collinson
9b1d64bb76 stream model has a posts collection 2012-01-18 19:08:36 -08:00
Dennis Collinson
4ad58bdf2f refactoring backbone urls 2012-01-18 19:08:36 -08:00
danielgrippi
c82ac5f3e2 fix collapsing of posts [ci skip] 2012-01-18 12:40:33 -08:00
danielgrippi
880efd3e72 use '/reshare' instead of 'reshare/' to ensure the correct path (js) 2012-01-17 17:53:02 -08:00
danielgrippi
641ca9fdd2 we want to POST to /status_messages on Publisher submit 2012-01-17 17:46:49 -08:00
Dennis Collinson
9cde06a628 You can now like "reshares", stream is polymorphic 2012-01-17 17:22:56 -08:00
Steven Fuchs
a11c8d8a96 javascripts for marking notifications items as unread on both the notifications page and popup menu. 2012-01-17 19:20:42 -05:00
Florian Staudacher
81ae0c644c start using new placeholders on login page 2012-01-18 01:17:20 +01:00
Florian Staudacher
849db2f34b started moving from infieldlabel to (html5) placeholders 2012-01-18 01:15:12 +01:00
danielgrippi
bfe0b7129c move all stream actions into PostController 2012-01-17 15:53:06 -08:00
Dennis Collinson
66d71a217e you should be able to reshare reshares again, first pass 2012-01-16 19:56:52 -08:00
Maxwell Salzberg
d5563d8802 TT MS; fix a bug when the mention string is not actually in the mentions 2012-01-16 15:59:40 -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
danielgrippi
9d2b1e9415 actually clear photos from the publisher. also, i hate the photo uploader we're using. 2012-01-14 15:40:44 -08:00
Jonne Haß
a07b742c85 remove old code from timeago widget 2012-01-14 23:58:34 +01:00
Jonne Haß
b382bdd3e3 load timeago 2012-01-14 23:29:28 +01:00
Jonne Haß
5d0223601b fallback to english pluralization rule if none is found 2012-01-14 21:26:01 +01:00
Jonne Haß
c5654a43db do proper pluralization for JS 2012-01-14 20:27:17 +01:00
Tray Torrance
ca07f5b9a3 Close #2606 and address other FF 3.x deficiencies. 2012-01-13 21:46:37 -08:00
Dennis Collinson
9b8afba9cf metaprogram template addition 2012-01-12 19:41:39 -08:00
Dennis Collinson
dec3006b50 DH DC don't render feedback view on public posts 2012-01-12 17:47:03 -08:00