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

2205 commits

Author SHA1 Message Date
Maxwell Salzberg
ead0b14a48 Merge pull request #2916 from Raven24/photos-lightbox 
make lightbox work for photos page (+tests)
 2012-02-24 10:46:01 -08:00
Benjamin Neff
392625dd4c fix css for searchbox (fixes #2878) 2012-02-24 03:20:30 +01:00
danielgrippi
34b9e1c7ca fix padding on comment button 2012-02-23 17:26:16 -08:00
Dennis Collinson
9769dfb303 cukes passing 2012-02-23 17:24:19 -08:00
danielgrippi
b38c49883b sneaky dock has an arrow now. you can click the top of the interaction bar to close/open it. 2012-02-23 17:23:24 -08:00
danielgrippi
2fa673b140 get sneaky 2012-02-23 16:45:10 -08:00
danielgrippi
a35dfa1157 remove some unused stuff in templates 2012-02-23 13:59:29 -08:00
danielgrippi
857f51b684 more moz fixes 2012-02-23 13:12:03 -08:00
danielgrippi
c3c20db8e8 fix arrow positioning for moz. 2012-02-23 13:12:03 -08:00
danielgrippi
e78ab14fc5 remove top-level divs from handlebars templates -- move that logic into the backbone view. 2012-02-23 12:18:29 -08:00
danielgrippi
806487a5ff namespace view folder with folders 2012-02-23 11:12:20 -08:00
Diaspora Europe
019b68281e handle text-overflow for long usernames #2557 2012-02-23 12:21:01 +01:00
danielgrippi
91e77e9dce small css tweaks 2012-02-22 20:50:56 -08:00
danielgrippi
71146f27db fix activity streams photo template 2012-02-22 19:23:52 -08:00
danielgrippi
b4923a77f0 add keybinding to the viewer 2012-02-22 19:19:24 -08:00
danielgrippi
846b14fac6 DG MS; you can comment from show pages. killer tofu. 2012-02-22 17:42:51 -08:00
danielgrippi
21d91f1b4c interaction buttons morph into reaction popup 2012-02-22 14:44:13 -08:00
danielgrippi
8f4fed8c0e add participants to info pane on post viewer 2012-02-22 13:15:54 -08:00
Florian Staudacher
412853bfcc make lightbox work for photos page (+tests) 2012-02-22 14:45:43 +01:00
danielgrippi
3ec7755c83 update reshare count when resharing; return PostPresenter for reshare root in the success response 2012-02-21 21:51:40 -08:00
danielgrippi
899136d0e5 display proper counts after feedback actions; modified destroy responses to return PostPresenter objects 2012-02-21 21:44:44 -08:00
danielgrippi
37981b71fe MS; DG; adding cucumbers for post templates 2012-02-21 17:31:26 -08:00
danielgrippi
b1cbd0f4a9 fix all but 2 jasmine specs 2012-02-21 15:23:30 -08:00
danielgrippi
ebcde41e69 display original author if post is a reshare 2012-02-21 15:23:30 -08:00
danielgrippi
3db133a3a7 be less agressive when re-rendering on feedback actions 2012-02-21 15:23:30 -08:00
danielgrippi
3cab4d348a fix nav img issue 2012-02-21 15:23:30 -08:00
danielgrippi
7466808112 created post author view. 2012-02-21 15:23:29 -08:00
danielgrippi
6965d6da24 fix feedback views. use gross callbacks for now 2012-02-21 15:23:29 -08:00
danielgrippi
5ac6188f23 toggle feedback slider; css tweaks 2012-02-21 15:23:29 -08:00
danielgrippi
a1fe55fcb7 mark icons colored if user has interacted with a post. 2012-02-21 15:23:29 -08:00
danielgrippi
f4269f2d44 DG RY; provide a background color to post author for legibility on post pages with background images 2012-02-21 15:23:29 -08:00
danielgrippi
f31418feb3 pjax clicking on nav arrows; move author header into backbone land; comment out comment form for now 2012-02-21 15:23:29 -08:00
danielgrippi
ca8e8ac0c2 added animation @mixin; refactored post-viewer binding calls 2012-02-21 15:23:29 -08:00
danielgrippi
2815885bcf add user_like to PostPresenter; use proper inheritance for feedback views 2012-02-21 15:23:29 -08:00
danielgrippi
f83b82902c markdownify text; better folder structure for photo-viewer templates 2012-02-21 15:23:29 -08:00
danielgrippi
5a1f3675b5 namespacing. set up initial feedback hooks. 2012-02-21 15:23:29 -08:00
danielgrippi
e60bd7b3e5 fix photoset positioning 2012-02-21 15:23:28 -08:00
danielgrippi
c0eeb7680b pages wip 2012-02-21 15:23:28 -08:00
danielgrippi
7acbfe1b78 refactored some js to make sense of how we're going to attack the post show page with a js Page 2012-02-21 15:23:28 -08:00
danielgrippi
7ec13d26ac add bootstrap back 2012-02-21 15:23:28 -08:00
danielgrippi
ead286bf99 DG RY; moved actions to the bottom of the show pages; fixed arrows 2012-02-21 15:23:28 -08:00
Maxwell Salzberg
25cf776059 the previous and next posts are now supplied in json of the presenter; give the template creator a default value 2012-02-21 15:23:28 -08:00
danielgrippi
cc0e04ea3f DG MS; fix user controls 2012-02-21 15:23:28 -08:00
danielgrippi
691bdb96cd DG MS; post vitals on top left; user action placeholder on top right 2012-02-21 15:23:28 -08:00
Maxwell Salzberg
e0b29048f4 haxy auto comment functionality; try me and then revert me" 2012-02-21 15:23:27 -08:00
danielgrippi
c3c23209c3 more fiddling with box model; added arrows 2012-02-21 15:23:27 -08:00
danielgrippi
c36c6e9569 finally figured out flexbox [ci skip] 2012-02-21 15:23:27 -08:00
danielgrippi
1c4a689af7 DG MS; added a new layout for post pages. 2012-02-21 15:23:27 -08:00
danielgrippi
e3ebf05ac2 DG MS; new templates for post show pages. 2012-02-21 15:23:27 -08:00
danielgrippi
ff875a5b3c DG MS; determine what template to use on the client from the server 2012-02-21 15:23:27 -08:00
Florian Staudacher
7c73a526dd fix for #2770 
- apply the padding to the wrapper element, not to the textarea
   apparently padding a textarea makes it shrink in firefox... ?
 - don't use manual padding, instead specify max-height for images
   extra-huge images are jolted, but they don't explode the layout
 - closing handled by view,
   gets rid of "Publisher.close is not a function" error msg
 2012-02-19 21:14:12 +01:00
Maxwell Salzberg
0a49cfd866 Merge pull request #2876 from jbivins/2354-empty-post-page-redirect-3 
Go to root page if deleting post from the show page
 2012-02-18 17:14:42 -08:00
Maxwell Salzberg
7aba1ce1f7 Merge branch 'Raven24-user-photos' 
Conflicts:
	public/javascripts/app/router.js
	public/stylesheets/sass/application.sass
 2012-02-18 17:12:14 -08:00
Joe Bivins
76c11b8d37 Add test case for when a user removes their own post from the show page. 
Adjust redirection logic.
 2012-02-18 19:47:25 -05:00
David Morley
b5bb66c66d fix 2898 - public profile unauthed user 2012-02-18 16:28:05 -08:00
Maxwell Salzberg
1e170291e5 add a missing test for block user, and fix ignoring a user from a non stream page; rename a javascript method as it was actually the oppisite of what it said it was doing 2012-02-18 16:28:04 -08:00
danielgrippi
be363b98e5 DG MS; move logic out of layout into LayoutsHelper. 2012-02-18 16:28:03 -08:00
danielgrippi
7ca423b3f2 DG MS; don't initialize a stream on post pages. 2012-02-18 16:28:02 -08:00
Dennis Collinson
32d58e8a9b toggle all nsfw posts 2012-02-18 16:26:17 -08:00
danielgrippi
34cc358345 aliasing in routes.js [ci skip] 2012-02-18 16:26:17 -08:00
danielgrippi
debdd6cb6b change routes to properly reflect page names (activity/stream). 2012-02-18 16:26:16 -08:00
Maxwell Salzberg
10a059e8f8 remove console.log [ci skip] 2012-02-18 16:26:16 -08:00
Florian Staudacher
8249847e9c bookmarklet now is a complete html document (+test) 
it auto-expands to the size of the text that was selected
it self-closes after posting again
 2012-02-18 16:26:15 -08:00
danielgrippi
2f7465450e you can now follow / unfollow a post from the stream; fixed cukes. 2012-02-18 16:26:15 -08:00
danielgrippi
87aa1fde34 change language around explore/participate. 2012-02-18 16:26:15 -08:00
danielgrippi
dba50ae273 Bring the likes back. Ditch the pins. 
Revert "swap pin for heart [ci skip]"

This reverts commit 488e064e11.

Conflicts:

	app/views/templates/likes_info.jst

Revert "reference pin icon in mobile view [ci skip]"

This reverts commit 9377dd30f4.

Revert "first pass at strickly user level rename from like => pin. still need to update assets"

This reverts commit d06ccb9ba9.

Conflicts:

	config/locales/diaspora/en.yml

add heart icon back
 2012-02-18 16:26:15 -08:00
danielgrippi
431a04b0a8 made nsfw shield nicer and more condensed [ci skip] 2012-02-18 16:26:14 -08:00
Maxwell Salzberg
6f3fb6ee67 fix css of new comment box [ci skip] 2012-02-18 16:26:14 -08:00
Maxwell Salzberg
819e8b1f48 typo in my js SRY [ci skip] 2012-02-18 16:26:13 -08:00
danielgrippi
011f70a9f4 fix a bunch of small css related media box issues [ci skip] 2012-02-18 16:26:13 -08:00
Maxwell Salzberg
5ea6648550 add more images to use handlebars imageUrl helper 2012-02-18 16:26:12 -08:00
danielgrippi
6573559faf fix weird search bar shadow issue in chrome [ci skip] 2012-02-18 16:26:11 -08:00
danielgrippi
24e37cf32b fix syntax in comment.rb 2012-02-18 16:26:11 -08:00
danielgrippi
a1df9fe8db fix jasmine 2012-02-18 16:26:11 -08:00
danielgrippi
29ea9c05e3 fix reshare tempalte; reorder header 2012-02-18 16:26:10 -08:00
danielgrippi
173894d926 stubbornella media and img dom structure FTW! major css deletion <3 2012-02-18 16:26:10 -08:00
danielgrippi
a16a8fc784 Participate / Explore have been upgraded to top-level status. 2012-02-18 16:26:10 -08:00
Florian Staudacher
2d29f93e42 fix shifted image button in firefox 2012-02-18 16:26:10 -08:00
Maxwell Salzberg
4f2783487d Merge pull request #2881 from beardedninja/master 
Added a post conversion hook to PageDown + amended test for autolinking, fixes #2792
 2012-02-18 16:12:39 -08:00
David Morley
dcac17855e fix 2898 - public profile unauthed user 2012-02-18 12:30:01 -06:00
Joe Bivins
1b058cf908 Fix #2354 (attempt 3). 
Sends the user to the application root (redirecting to /explore) after
they remove post from the post page with one post on it.
 2012-02-17 23:14:23 -05:00
Maxwell Salzberg
20c79f1bb2 add a missing test for block user, and fix ignoring a user from a non stream page; rename a javascript method as it was actually the oppisite of what it said it was doing 2012-02-16 17:37:13 -08:00
Maxwell Salzberg
bc9e4ca196 Merge pull request #2853 from Raven24/publisher-images 
fix shifted image button in firefox [ci skip]
 2012-02-16 17:25:06 -08:00
danielgrippi
62c0ad13b7 DG MS; move logic out of layout into LayoutsHelper. 2012-02-15 18:38:36 -08:00
danielgrippi
5f83abe418 DG MS; don't initialize a stream on post pages. 2012-02-15 15:07:28 -08:00
Dennis Collinson
e16a20e18c toggle all nsfw posts 2012-02-14 14:15:24 -08:00
danielgrippi
7f550d2d92 aliasing in routes.js [ci skip] 2012-02-14 12:59:19 -08:00
danielgrippi
f3f2b8ca44 change routes to properly reflect page names (activity/stream). 2012-02-14 11:16:41 -08:00
Maxwell Salzberg
8307514439 remove console.log [ci skip] 2012-02-14 10:39:42 -08:00
Florian Staudacher
4263797099 bookmarklet now is a complete html document (+test) 
it auto-expands to the size of the text that was selected
it self-closes after posting again
 2012-02-14 18:57:30 +01:00
danielgrippi
32f93a0391 you can now follow / unfollow a post from the stream; fixed cukes. 2012-02-13 19:13:43 -08:00
danielgrippi
b27961b38a change language around explore/participate. 2012-02-13 19:13:43 -08:00
danielgrippi
ab76b0cd8e Bring the likes back. Ditch the pins. 
Revert "swap pin for heart [ci skip]"

This reverts commit 488e064e11.

Conflicts:

	app/views/templates/likes_info.jst

Revert "reference pin icon in mobile view [ci skip]"

This reverts commit 9377dd30f4.

Revert "first pass at strickly user level rename from like => pin. still need to update assets"

This reverts commit d06ccb9ba9.

Conflicts:

	config/locales/diaspora/en.yml

add heart icon back
 2012-02-13 19:13:43 -08:00
danielgrippi
f1c119452a made nsfw shield nicer and more condensed [ci skip] 2012-02-13 14:12:14 -08:00
Alex Harrison
1225517c51 Merge remote branch 'upstream/master' 2012-02-12 21:45:14 +01:00
Maxwell Salzberg
f3d790a4c2 fix css of new comment box [ci skip] 2012-02-10 16:48:55 -08:00
Maxwell Salzberg
427a1694db typo in my js SRY [ci skip] 2012-02-10 15:53:25 -08:00
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
Alex Harrison
54571268e5 Added a post conversion hook to PageDown to add target="_blank" (fixes #2792) 2012-02-09 23:30:28 +01: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
Florian Staudacher
cab953848f added tests for photos page 2012-02-09 23:12:39 +01:00
Florian Staudacher
082d5c9fd4 initial photo page functionality is back, featuring backbone and handlebars 2012-02-09 20:55:34 +01:00
Florian Staudacher
0208aa12f0 fix shifted image button in firefox 2012-02-09 15:24:05 +01: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
Steven Fuchs
ef7dc1c017 update aspect name in page listing after editing. 2012-02-03 08:37:35 -05: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
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
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ß
54cb3ea3cb more than 100% height <3, fix #2710 [ci skip] 2012-01-22 14:01:21 +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
8b4f0473a7 mobile header gradient reflects the desktop gradient; added background texture to mobile 2012-01-21 15:19:06 -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