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

2951 commits

Author SHA1 Message Date
Steven Fuchs
23aff2af5e run second search ajaxily when no results are found from remote pod. 2012-03-07 23:19:50 -05:00
Diaspora Europe
92a857533e improve mobile sign up and sign in view 2012-03-07 17:01:16 +01:00
Diaspora Europe
ecc86c1f86 handle many users in a message #2912 2012-03-07 13:00:55 +01:00
Maxwell Salzberg
76450f7882 Merge pull request #2906 from Raven24/fix-2770 
fix for #2770
 2012-03-06 22:36:53 -08:00
danielgrippi
bdcbf5b985 responsive show pages [ci skip] 2012-03-06 15:19:05 -08:00
Joe Bivins
8df0bb85fe Wrap the publisher params tag in a div instead of a paragraph. 
Safari 4.1.3 cited the closing params tag as being an unmatched tag.
Changing the paragraph to a div causes the error to disappear.
 2012-03-03 12:42:54 -05:00
danielgrippi
0112285985 Merge branch 'master' into profiles 
Conflicts:
	lib/diaspora/shareable.rb
 2012-02-27 14:27:05 -08:00
Maxwell Salzberg
c85e2a9b5d Merge pull request #2935 from Raven24/host-meta 
adapt host-meta document to RFC 6415
 2012-02-25 17:11:06 -08:00
Maxwell Salzberg
a1f39398be Merge pull request #2902 from JMSilla/master 
Fix atom feed bug (bug mash 7) [ci skip]
 2012-02-25 16:47:13 -08:00
Florian Staudacher
6a9a0e61f9 adapt host-meta document to RFC 6415 2012-02-25 16:56:34 +01:00
danielgrippi
dc0b5db0ac Merge branch 'profiles' of github.com:diaspora/diaspora into profiles 2012-02-24 20:14:26 -08:00
Dennis Collinson
b28508ecbc MS DC show last post and show page works unauthenticated 
phasing out app.user() for app.currentUser
 2012-02-24 19:09:00 -08:00
David Morley
33fada305c put all the elements back on the page and make facebook inviter usable again 2012-02-24 20:46:27 -06:00
danielgrippi
39d31d5888 Merge branch 'master' of github.com:diaspora/diaspora into profiles 2012-02-24 14:36:18 -08:00
Maxwell Salzberg
0db2bd9e40 Merge pull request #2908 from diasporg/adminclean 
clean up admin page [ci skip]
 2012-02-24 10:44:52 -08:00
Florian Staudacher
663a5a0e7c escape all passed params in js - fixes #2922 2012-02-24 14:15:08 +01:00
Dennis Collinson
9769dfb303 cukes passing 2012-02-23 17:24:19 -08:00
danielgrippi
846b14fac6 DG MS; you can comment from show pages. killer tofu. 2012-02-22 17:42:51 -08:00
danielgrippi
ebcde41e69 display original author if post is a reshare 2012-02-21 15:23:30 -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
f83b82902c markdownify text; better folder structure for photo-viewer templates 2012-02-21 15:23:29 -08:00
danielgrippi
3d1ac7ed55 added basic reshare attribution 2012-02-21 15:23:29 -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
30de08b340 fix post presenter / arrow ordering 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
a3e8ced6a1 haha more arrow controlz 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
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
David Morley
a63bcd0080 make popular tags human readable 2012-02-19 21:28:12 -06:00
David Morley
c41923081a resque with header 2012-02-19 15:50:12 -06:00
David Morley
6e4844629a admin cleanup 2012-02-19 15:29:07 -06: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
JMSilla
1fe15654c5 Fix problem with atom feed entry titles being too long 2012-02-18 16:18:54 +00:00
Maxwell Salzberg
063912287c use the user presenter, luke 2012-02-16 13:19:14 -08:00
danielgrippi
62c0ad13b7 DG MS; move logic out of layout into LayoutsHelper. 2012-02-15 18:38:36 -08:00
Daniel Grippi
10c5757193 Merge pull request #2891 from Raven24/bookmarklet-oops 
bookmarklet - publisher needs a little more js...
 2012-02-14 12:33:32 -08:00
Florian Staudacher
a03a57efb7 publisher needs a little more js... 2012-02-14 21:28:37 +01:00
danielgrippi
f3f2b8ca44 change routes to properly reflect page names (activity/stream). 2012-02-14 11:16:41 -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
Daniel Grippi
1638f32042 Merge pull request #2841 from Raven24/bookmarklet-specs 
intentionally failing specs - dirty input breaks bookmarklet (+fix)
 2012-02-13 21:14:56 -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
Maxwell Salzberg
5f4ebc94bb small typo [ci skip] 2012-02-13 17:06:55 -08:00
Maxwell Salzberg
ef40350bae fix authorizations page css to use media box 2012-02-13 17:06:18 -08:00
danielgrippi
ecdbd1bb26 remove joindiaspora specific home page from repo [ci skip] 2012-02-10 15:45:48 -08:00
danielgrippi
3c7ebe3200 forgot to save a template [ci skip] 2012-02-10 15:24:47 -08:00
danielgrippi
3e4d2fe7e8 adding custom landing page for heroku 2012-02-10 15:20:15 -08:00
danielgrippi
ed3d5c429a fix a bunch of small css related media box issues [ci skip] 2012-02-10 15:18:27 -08: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
9fcc2a4ffa make previously added specs green 2012-02-09 01:01:28 +01:00
danielgrippi
84eb313e20 updated routes to reflect page titles (explore/participate) 2012-02-08 14:40:28 -08:00
Dennis Collinson
558ceec92a a user can mark themselves as nsfw 2012-02-07 19:03:20 -08:00
Dennis Collinson
efd99344eb git status 2012-02-07 18:29:51 -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 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
Hrishi
a2d427f06c fix for the bug 8 (The back-to-top button covers the send button on the private message page) 2012-02-02 13:15:52 +05:30
danielgrippi
488e064e11 swap pin for heart [ci skip] 2012-02-01 16:53:22 -08:00
danielgrippi
310a0679f1 particpate stream, yo! 2012-02-01 16:05:16 -08:00
Maxwell Salzberg
f826340336 push stream listings to the side a bit 2012-02-01 13:56:52 -08:00
Maxwell Salzberg
51e5b0e02f reorder side stream to insinuate new groupings 2012-02-01 13:39:21 -08:00
Jakob Kramer
eb445e45ba fix missing translation in mentioning-lightbox 2012-01-31 22:16:48 +01: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
Lennart Prelle
5deab956c0 use a form with a configurable paypal id 2012-01-29 20:14:31 +01:00
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