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

2827 commits

Author SHA1 Message Date
danielgrippi
0797460586 whats on your mind -> start a conversation 2012-01-29 09:19:36 -08:00
Jakob Kramer
44ff6ae8d8 fixed a link titled 'RSS' linking to an atom feed 2012-01-29 15:20:34 +01:00
Jonne Haß
9b07ce07d6 --amend [ci skip] 2012-01-29 13:13:08 +01:00
Jonne Haß
03f119ede7 fix heavy sentence construction, ugh haven't seen one of these in a while :P [ci skip] 2012-01-29 13:09:03 +01:00
Maxwell Salzberg
13d1e68540 refactor people#index 2012-01-28 23:48:37 -08:00
Sarah Mei
d40746bff7 Fixes #2713 - searching for punctuation now doesn't throw a 500. Refactored people#index specs. 2012-01-28 13:45:39 -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
danielgrippi
d8c6dc0d79 added source to stream element js template. [ci skip] 2012-01-27 13:51:24 -08:00
danielgrippi
ff71bc5a44 remove @backbone reference in people/show (thx @mrZYX for the catch); added loaders to people and tag pages 2012-01-27 10:53:03 -08: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
fa1ee731af DG MS; made an imageUrl handlebars helper for assets served through handlebars templates. 2012-01-26 17:04:03 -08:00
Maxwell Salzberg
939383ef32 You can now use rake assets:precompile to upload all of your static assets to s3. This uses your prexisiting settings in AppConfig for s3. then, start your server with ASSET_HOST={cdn_hostname} remember to include https and no trailing slash 2012-01-25 11:22:45 -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
Dennis Collinson
f506a8778c moving javascript hax 2012-01-23 19:32:15 -08:00
Dan Hansen
51332931ee almost done 2012-01-23 19:31:01 -08:00
Jonne Haß
7aaaf4f43b use guid instead of id for /people/ urls 2012-01-23 23:35:31 +01:00
danielgrippi
8f38a19976 stray underscore reference in handlebars template [ci skip] 2012-01-23 10:27:37 -08:00
Steven Fuchs
d8f2e73ea2 refer to model for target value, not set attributes. 2012-01-23 12:05:43 -05: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
danielgrippi
778683f3e3 don't extend helpers in the notifications index view; make notification_count and unread_message_count controller helper methods (now that we're not using vanna) 2012-01-22 22:26:27 -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ß
c8e09bf325 localize back to top [ci skip] 2012-01-22 13:54:31 +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
7ef70b9090 collapse reshare text [ci skip] 2012-01-21 19:02:58 -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
Steven Fuchs
9836860ca3 Merge remote branch 'upstream/master' into im-sorry-bye-vanna 2012-01-20 12:23:45 -05:00
danielgrippi
c219cee97d fix inf scroll issues in stream view 2012-01-19 17:01:45 -08: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
danielgrippi
c82ac5f3e2 fix collapsing of posts [ci skip] 2012-01-18 12:40:33 -08:00
Maxwell Salzberg
b09e76a0ce introduce base_pod_uri, so we can support domains that use www and [bare] with webfinger 2012-01-17 17:34:42 -08:00
Steven Fuchs
aae5fe04ce css for marking as unread, and hook for notification page to be part of it when called. 2012-01-17 19:21:25 -05:00
Florian Staudacher
81ae0c644c start using new placeholders on login page 2012-01-18 01:17:20 +01:00
danielgrippi
339c47d782 moved stream logic into its own controller (StreamsController) 2012-01-17 15:53:06 -08:00
danielgrippi
bfe0b7129c move all stream actions into PostController 2012-01-17 15:53:06 -08:00
Dennis Schubert
e0a63e624f Fix my quick fix (use '.present?' instead of 'not .nil?') 2012-01-17 21:25:21 +01:00
Dennis Schubert
57697dea28 Quick fix: Fix 500 on /conversations when a author is missing. This is a temporary fix, see #2682 2012-01-17 21:10:45 +01:00
Maxwell Salzberg
5d01904231 fix bookmarklet. fixes #2605 2012-01-16 14:36:21 -08:00
danielgrippi
177f608276 fix oembed issues in backbone land 2012-01-15 15:56:34 -08:00
danielgrippi
91e3f5f6ff remove cache counter for photos, as it was causing too many edge-case errors & added complexity across models 2012-01-14 15:40:43 -08:00
Maxwell Salzberg
ca7632776f prevent mobile comments from 500ing 2012-01-14 11:52:24 -08:00
Tray Torrance
ca07f5b9a3 Close #2606 and address other FF 3.x deficiencies. 2012-01-13 21:46:37 -08:00
Jonne Haß
e1edef9ff1 lets see how all this markdown in the title looks. Attempt to fix #2395 2012-01-13 22:09:22 +01:00
Dennis Collinson
adc0a0b244 don't display iteration of templates 2012-01-12 20:44:55 -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
Maxwell Salzberg
2757cbb149 fix ssl problem with donate link 2012-01-12 14:49:54 -08:00
danielgrippi
1efce2cede Revert "Merge pull request #2547 from stwf/unread_notifications" 
This reverts commit c61e84bc50, reversing
changes made to b88899ff2a.
 2012-01-11 12:11:00 -08:00
danielgrippi
bee8aa8bcd remove unused files/methods 2012-01-11 02:26:12 -08:00
danielgrippi
0e5bb81d66 remove all references to the websocket. bang bang. 2012-01-10 12:28:19 -08:00
Daniel Grippi
c61e84bc50 Merge pull request #2547 from stwf/unread_notifications 
Allow users to click on read notifications to mark them as unread
 2012-01-10 10:46:26 -08:00
Ricky Elrod
4556323bda Add the project name to the title of the Devise login page, so that 
applications that require a unique name in the window title (like
KeePassX) can use auto fill, etc.
 2012-01-10 11:23:13 -05:00
danielgrippi
779de03111 added alpha mark to asterisk in the header 2012-01-09 16:43:24 -08:00
danielgrippi
c11fdb0459 put 'Admin' back in #user_menu for admins. this fixes #2595 [ci skip] 2012-01-08 23:43:17 -08:00
danielgrippi
f09da04c8a add tooltips to stream faces [ci skip] 2012-01-08 17:43:58 -08:00
danielgrippi
c6f11f691d don't block tiff extensions in our out-of-date js uploader [ci skip] 2012-01-08 17:23:04 -08:00
danielgrippi
665517abfc use app.router.navagate for nav elements that don't expand (i.e. aspects, tags) 2012-01-08 14:41:43 -08:00
Sarah Mei
e0f8959647 Remove stray console.log. Not skipping CI because I think this may be causing the cucumber failures. 2012-01-08 03:24:11 -08:00
danielgrippi
07d81e0a85 added spinner keyframes to moz 2012-01-07 20:59:37 -08:00
danielgrippi
70737ddc9d Revert "reference the root o_embed_cache on reshares" 
This reverts commit 7020194a57.
 2012-01-07 20:27:06 -08:00
danielgrippi
7020194a57 reference the root o_embed_cache on reshares 2012-01-07 20:24:13 -08:00
danielgrippi
d5a4f9eb98 use content_view for comments (markdown, tagging) 2012-01-07 20:19:47 -08:00
danielgrippi
e928cc805a fixed markdown issues with reshares; removed puts from specs 2012-01-07 17:33:16 -08:00
danielgrippi
687eb7ba0b double check on photos 2012-01-07 15:48:40 -08:00
danielgrippi
d2807b5202 markdown for posts on front end, tags broken 2012-01-07 14:24:27 -08:00
danielgrippi
3db0cd3776 fix all cukes but the tags feature [ci skip] 2012-01-07 14:24:27 -08:00
danielgrippi
2024716c2c remove unusued javascript files; GC clearing from application/vanna controller 2012-01-07 14:24:27 -08:00
danielgrippi
3f7144f214 added hide post feature back to stream 2012-01-07 14:23:28 -08:00
danielgrippi
ae5fb67f71 long text truncation 2012-01-07 14:23:28 -08:00
danielgrippi
f72edbc039 added notification and unread mesasge count back to the header 2012-01-07 14:23:28 -08:00
danielgrippi
933299e31c added translations to templates; mock out the locale file in jasmine 2012-01-07 14:23:28 -08:00
Dennis Collinson
d5e9c5eebc DG DC add stream faces to page party 2012-01-07 14:23:28 -08:00
Dennis Collinson
7ccc81b0a4 fix conversations cuke 2012-01-07 14:23:28 -08:00
Dennis Collinson
b582f45452 green jasmine, yo 2012-01-07 14:23:28 -08:00
danielgrippi
5e28c8f6ec fix backing out of photo-only post cuke 2012-01-07 14:23:27 -08:00
danielgrippi
dbfb18e249 display reshare counts; test inf scroll & reshare counter in jasmine instead of cucumber 2012-01-07 14:23:27 -08:00
danielgrippi
dd85521701 fix header styling when not signed in; remove ilya's static page 2012-01-07 14:23:27 -08:00
danielgrippi
31fac53969 added blocks js model; load app.models.Post before any other model when loading assets 2012-01-07 14:23:27 -08:00
danielgrippi
85b5974fa9 removed top-level element delcarations from app templates 2012-01-07 14:23:27 -08:00
danielgrippi
64a90a30ef only load photos for a post if photos_count > 0; display 'limited' or 'public' in stream elements; fix small like bug in stream 2012-01-07 14:23:27 -08:00
danielgrippi
f804db36b8 DG DH; fix most of the cukes (7 failures left) 2012-01-07 14:23:26 -08:00
danielgrippi
1804b19ccc DG DH; dry-d up appending/prepending posts to the stream's collection 2012-01-07 14:23:26 -08:00
danielgrippi
565a0b21f7 fix .avatar declaration in the header template; make socketing always return nil straight away (we are not using the websocket in this branch, and it makes everything faster when it's off) 2012-01-07 14:23:26 -08:00
danielgrippi
42276a73c8 remove old stream initialization from js pages; remove websocket js code 
from the layout; rename templates to have a .jst extension
(JavaScriptTemplate?)
 2012-01-07 14:23:26 -08:00
danielgrippi
3268726a9a added LikesInfo view; simplified Feedback view (not sure how to mock the jasmine specs correctly... ugh) 2012-01-07 14:23:26 -08:00