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

5474 commits

Author SHA1 Message Date
danielgrippi
c82ac5f3e2 fix collapsing of posts [ci skip] 2012-01-18 12:40:33 -08:00
Maxwell Salzberg
254860bddc SM MS; Read email sent to diaspora-dev for more information about this 
commit. Add migration and rake task to copy hidden information from
share_visibilities to users. see: http://devblog.joindiaspora.com/?p=44
 2012-01-17 19:29:01 -08:00
danielgrippi
a658552c3f fix stream helper for mobile 2012-01-17 19:21:36 -08:00
danielgrippi
641ca9fdd2 we want to POST to /status_messages on Publisher submit 2012-01-17 17:46:49 -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
36fd43db4c incorporated improvements from @maxwell from last pull request. 2012-01-17 19:27:48 -05: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
fdc0b681eb remove unused api serializers (cruft) 2012-01-17 16:03:24 -08: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
6e02f61395 MS remove custom resque job logging as it is making heroku very sad 2012-01-16 20:25:56 -08: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
danielgrippi
84af585f87 rescue SocketError on UpdateServiceUser job when dev box is in single process mode and not connected to the internet 2012-01-14 15:40:43 -08:00
Jonne Haß
a482d90bf0 do the extra include of language helper for the vanna controller… 2012-01-14 21:59:49 +01:00
Maxwell Salzberg
ca7632776f prevent mobile comments from 500ing 2012-01-14 11:52:24 -08:00
Jonne Haß
c5654a43db do proper pluralization for JS 2012-01-14 20:27:17 +01:00
Maxwell Salzberg
0b6c5421c3 use deep merge. since we now have nested js, we need to do the merge recursively; fixes #2660 2012-01-14 02:49:34 -08:00
Maxwell Salzberg
b10eb9e56a we do not need to require this file here. sorry about that 2012-01-14 01:12:16 -08:00
Maxwell Salzberg
35676cddac fix #2627 (webfinger produces 500 error, and refactor a little to encapsulate into Webfinger object a bit more 2012-01-14 00:40:42 -08:00
danielgrippi
240d595714 removing photos_count method from StatusMessage in hopes of fixing the counter (still a bit confused, though...) 2012-01-13 23:33:59 -08:00
Tray Torrance
ca07f5b9a3 Close #2606 and address other FF 3.x deficiencies. 2012-01-13 21:46:37 -08:00
Maxwell Salzberg
c45057bd94 update settings logic, and heroku rake task 2012-01-13 13:59:34 -08:00
danielgrippi
efe55f395d remove ajax_stream? logic from streams now that we're using backbone & never ajaxing on mobile; remove unreferenced community_spotlight stream & controller 2012-01-13 13:50:52 -08:00
Jonne Haß
26aff017df do not call pphotos on a non StatusMessage in the page title helper either 2012-01-13 22:46:31 +01:00
Jonne Haß
0cc0b152d7 do not call .photo_count on a reshare etc. 2012-01-13 22:09:22 +01: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
danielgrippi
aed413b463 remove unused method and controller action (move_contact) 2012-01-13 12:15:32 -08: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
408bafca09 add/refactor normalize_pod_services so configured services is always defined regardless if SERVICES are set up 2012-01-12 15:04:14 -08:00
Maxwell Salzberg
2757cbb149 fix ssl problem with donate link 2012-01-12 14:49:54 -08:00
Daniel Grippi
de29fd5e02 Merge pull request #2637 from CodeBlock/2598-backbone-back-button 
Fix #2598 (back button issue) by having jQuery force the browser to not cache JSON responses... [ci skip]
 2012-01-11 18:13:07 -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
Ricky Elrod
5626948b3f Fix #2598 by having jQuery force the browser to not cache JSON responses. 2012-01-11 13:10:10 -05: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
Daniel Grippi
bdc9421bc5 Merge pull request #2549 from lprelle/no_stream_redirect_from_settings 
No stream redirection from settings
 2012-01-08 20:22:53 -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
Daniel Grippi
fe193741d0 Merge pull request #2581 from ChaseReid/patch-1 
added support for uploading images with .tiff extensions
 2012-01-08 17:22:19 -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
Maxwell Salzberg
232c4b7931 fix for mobile multi stream [ci skip] 2012-01-07 23:31:17 -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
985657cbc3 pass in correct avatar sizes in person json response 2012-01-07 20:06:05 -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
Dennis Collinson
daba42c857 mentions now render client side, wow 2012-01-07 14:24:28 -08:00
Dennis Collinson
b13e72bc00 spec fix for markdown 2012-01-07 14:24:28 -08:00
danielgrippi
dea21634a2 add raw_message method to Reshare 2012-01-07 14:24:27 -08:00
danielgrippi
0fb1bf5d4b hash tags are linked on the front end, adding markdown.js file 2012-01-07 14:24:27 -08:00
danielgrippi
d2807b5202 markdown for posts on front end, tags broken 2012-01-07 14:24:27 -08:00
danielgrippi
c3ea1dfc6e DC DG fix search cucumber step 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
24950bd364 restored ability to 'unlike' 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
71bae10317 fixed notification specs; removed a cuke around reshares already tested in jasmine 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
danielgrippi
4fabbe93a5 fix ResharesController / StatusMessage controller spec; remove another js response 2012-01-07 14:23:26 -08:00
danielgrippi
719e265b68 modified app to return a hash if current_user is not present; removed view specs in postsController specs & moved logic to js/jasmine 2012-01-07 14:23:26 -08:00
danielgrippi
0a4b4fb344 remove duplication in jasmine tests (Post view / Feedback view); one correclty failing jasmine spec for Feedback view; created a StatusMessage model for the publisher 2012-01-07 14:23:26 -08:00
danielgrippi
02ca7a32f0 added reshare logic back (doesn't append it to the stream...) 2012-01-07 14:23:25 -08:00
danielgrippi
027bb3dee7 removed content-updater widget; better tests around likes on feedback widget; extend the defaultPresenter return value instead of passing the function in Feedback view 2012-01-07 14:23:25 -08:00
danielgrippi
505adbe07b aspect stream uses backbone; don't ajax in aspect selectors for now 2012-01-07 14:23:25 -08:00
danielgrippi
4029b26c03 created publisher view; wip 2012-01-07 14:23:25 -08:00
danielgrippi
b120faa4f9 took some functions out of stream-element widget; refactored Header view; refactored tooltip logic in Post view 2012-01-07 14:23:25 -08:00
danielgrippi
1a5e493b22 downcase namespacing of app 2012-01-07 14:23:25 -08:00
danielgrippi
fe4530f86b fixed 500 on notifications#index 2012-01-07 14:23:25 -08:00
danielgrippi
52183b8cc4 fix name in header; 27 failures 2012-01-07 14:23:25 -08:00
danielgrippi
039df8f879 fixed 14 cukes (all comments features) 2012-01-07 14:23:25 -08:00
Dennis Collinson
f5609f2182 App views base renders subviews like magic 2012-01-07 14:23:24 -08:00
danielgrippi
7c5e3cb415 switch like_stream to use backbone 2012-01-07 14:23:24 -08:00
danielgrippi
31d24c60c7 added spec for .like_action link being rendered; added comments div back to stream_element for now 2012-01-07 14:23:24 -08:00
danielgrippi
7f51bc02ef grey left nav 2012-01-07 14:23:24 -08:00
danielgrippi
1b8f78e006 remove sort order logic from controllers; backbone stream does not support it; was to be depricated anyway 2012-01-07 14:23:24 -08:00
danielgrippi
828624f392 slightly fade in stream elements; made a better spinner for the stream (css3) 2012-01-07 14:23:24 -08:00
danielgrippi
193e5d61c5 adding some texture to the header to distinguish the branch 2012-01-07 14:23:24 -08:00
danielgrippi
1ffdfa8465 DC DG; created feedback view; moved jasmine fixtures; modified jasmine spec helper; jasmine is green 2012-01-07 14:23:24 -08:00
danielgrippi
67e56dce2c backbone view for header; moved user dropdown logic in there; moved jasmine specs over; removed old widget 2012-01-07 14:23:23 -08:00
danielgrippi
841cc29d25 add api block to photo; photos display in stream 2012-01-07 14:23:23 -08:00
danielgrippi
6911ed5d7d expand comments working 2012-01-07 14:23:23 -08:00
danielgrippi
b94b5240a8 added block user functionality to the stream 2012-01-07 14:23:23 -08:00
danielgrippi
6760e3868d remove js resposne for likes, do it in backbone with json responses instead 2012-01-07 14:23:23 -08:00
danielgrippi
d9d878f11f added api response for likes; cleaned up view logic; specify like collection url from parent model (Post) 2012-01-07 14:23:23 -08:00
danielgrippi
ae6fa5bebb don't use Diaspora widget system or stream.js when backbone is active; 
migrating like actions over to backbone; some cleanup; bump jquery to
1.7.1
 2012-01-07 14:23:22 -08:00
danielgrippi
cd1d25dc30 remove widget references on backbone stream pages; don't call time_for_stream if @backbone (the method references @stream.stream_posts) 2012-01-07 14:23:22 -08:00
danielgrippi
dc82316f13 bind Twipsy in stream_element_view.js 2012-01-07 14:23:22 -08:00
danielgrippi
f5172fa977 comment and post deletion now works on the backbone stream 2012-01-07 14:23:22 -08:00
danielgrippi
46b1567622 added loader gif when 'more' is clicked in stream; fixed nsfw positioning 2012-01-07 14:23:22 -08:00
danielgrippi
ffae0f8e85 added more jasmine spec; NSFW wip 2012-01-07 14:23:22 -08:00
danielgrippi
cec2d27204 ported likes logic for the stream over from old branch 2012-01-07 14:23:22 -08:00
danielgrippi
bc1ffd317e reference 'el' explicitly (render methods now return this instead of this.el); comment area focusing working again 2012-01-07 14:23:22 -08:00
danielgrippi
9e4e58e002 fix facebook specs; comment controller specs 2012-01-07 14:23:22 -08:00
danielgrippi
414fb8d454 corrected template views; status message now includes oembed; updated post.rb api to supply oembed and object_url 2012-01-07 14:23:21 -08:00
danielgrippi
e6d4ec2dc8 added as::photo view 2012-01-07 14:23:21 -08:00
danielgrippi
34e3403e2e jasmine green again; template switching in place, defaulting to displaying post text 2012-01-07 14:23:21 -08:00
Dennis Collinson
8e3db3aebe make jasmine view tests work, load templates, party 2012-01-07 14:23:21 -08:00
danielgrippi
4883c70ae2 move templates into app/views/templates/_templates.haml 2012-01-07 14:23:21 -08:00
danielgrippi
52e3f1b240 DC DG; test stream view WIP 2012-01-07 14:23:21 -08:00
danielgrippi
1ecfa92c9e DH DG; create comments via backbone 2012-01-07 14:23:21 -08:00
Dan Hansen
80f797a581 introduce comments 2012-01-07 14:23:21 -08:00
Dan Hansen
ba9ece0014 Use routers, remove some hacks 2012-01-07 14:23:21 -08:00
Daniel Grippi
dca3581ae2 added likes to the stream element underscore partial 2012-01-07 14:23:20 -08:00
Daniel Grippi
d504bf4591 add current user to body tag data field (hackity hack). add comment links to posts 2012-01-07 14:23:20 -08:00
Daniel Grippi
176963fdad serialize current user json into body tag for now 2012-01-07 14:23:20 -08:00
Daniel Grippi
19db5519c0 DG DH; made acts_as_api play nice with backbonejs. comments are semi-functional; stream elements use the StreamElement js widget (for now). 2012-01-07 14:23:20 -08:00
danielgrippi
aa7343d759 add profile streams to backbone. this breaks hovercards, atm. 2012-01-07 14:23:20 -08:00
danielgrippi
42ce3b277b backbone all the streams, besides user. don't use the acts_as_api way for now. 2012-01-07 14:23:20 -08:00
danielgrippi
91ba6447d0 add acts_as_api to the models directly for now. the 'root node' problem (posts : {}) breaks backbone. wip 2012-01-07 14:23:20 -08:00
danielgrippi
2a13381773 DG DH; pagination on backbone stream 2012-01-07 14:23:20 -08:00
danielgrippi
c360e82f11 DG DH; backbone stream now sort-of renders on multis_controller; wip 2012-01-07 14:23:20 -08:00
Maxwell Salzberg
91c21f5d92 MS SM; removed seemingly unused(?) layout file 2012-01-07 12:56:32 -08:00
Maxwell Salzberg
2422bdab46 MS SM; make loading jquery from cdn or local a helper so we can stub it in cukes 2012-01-07 12:55:46 -08:00
Maxwell Salzberg
523a960d94 peace troll 2012-01-05 18:53:27 -08:00
Jonne Haß
00a800ab07 this should fix a weired test polution case on travis where the x-git-revision header is suddenly nil 2012-01-06 03:26:00 +01:00
Maxwell Salzberg
41ecf2b27d make a method in EnviromentConfiguration to test if newrelic is setup 2012-01-05 18:14:06 -08:00
Maxwell Salzberg
cedc49bf09 MS DC; oauth keys are now pulled out of application.yml to be simplier. incldue newrelic as heroku expects it, without affecting people who do not use newrelic. If you do use new relic in production, you have to put your newrelic api key in application.yml 2012-01-05 17:31:38 -08:00
Maxwell Salzberg
d9c2b0d4b5 make cdn jquery http/s agnostic 2012-01-04 23:57:28 -08:00
Maxwell Salzberg
fdea2f94ff remove icky analytics code from layouts, move to middleware 2012-01-04 23:54:48 -08:00
Maxwell Salzberg
7cc6e3ed68 uncomment cdn line.. whoops 2012-01-04 22:19:37 -08:00
Maxwell Salzberg
cf2c12d98b converting to string makes this not an htmlsafe buffer 2012-01-04 12:03:15 -08:00
Jonne Haß
52c75a7ad4 Revert "Revert "auto follow back feature"" 
This reverts commit 6408105917.

Conflicts:

	db/schema.rb
 2012-01-04 13:49:56 +01:00
Maxwell Salzberg
71b58fa6fc only queue process_photo jobs if the owner is local. this should cut down on some resque errors 2012-01-04 00:08:29 -08:00
Maxwell Salzberg
e9465e7001 move websocket to make rails happy 2012-01-03 22:47:44 -08:00
Maxwell Salzberg
34e4c027d0 small typo 2012-01-03 22:47:10 -08:00
Maxwell Salzberg
4e574c3fef fixed loading jquery from the CDN, and the fallback to the local copy still works 2012-01-03 20:02:52 -08:00
Maxwell Salzberg
63cdd93afc the websocket has been completely removed, and replaced for a stub until 
we find a better way to reimpliment it in a  more sane way
 2012-01-03 18:39:54 -08:00
Maxwell Salzberg
9b05e80e3f fix oembed caches so data must be present 2012-01-03 18:00:16 -08:00
Maxwell Salzberg
43090d38eb AppConfig in heroku can now read array variables 2012-01-03 16:18:51 -08:00
Maxwell Salzberg
a7d59ce115 add EnviromentConfiguration to keep track of heroku specfic enviroment hacks 2012-01-03 16:01:21 -08:00
Chase Reid
90eda36272 added support for uploading images with .tiff extensions 2012-01-02 21:40:46 -05:00
robhogg
b792a6d3e0 Fixed typo 2012-01-02 21:24:44 +00:00
robhogg
8fbe180446 Modified nsfw? to use case-insensitive regex match. 2012-01-02 21:24:44 +00:00
Jonne Haß
1e8e0b55fd paranthesis ftw, sorry for the noise 2012-01-02 21:17:11 +01:00
Jonne Haß
67b2af0da6 check if ca_file is commented out completly 2012-01-02 21:07:46 +01:00
danielgrippi
176a33880f fix all specs minus one from o_embed_data_spec 2011-12-31 14:19:54 -05:00
danielgrippi
6ab03d33b4 hotfix for an error that would cause a 500. (this is a temp fix for fixing the photo cache counter on deletions) 2011-12-30 23:51:13 -05:00
Steven Fuchs
f72a4b4476 notifications controller should return the guid and unread state of the updated notification 2011-12-23 22:58:01 -05:00
Steven Fuchs
a1d474111b controller now only accepts string values for unread. 2011-12-23 15:35:07 -05:00
Steven Fuchs
cd75c6ea67 cleaner reading of unread parameter 2011-12-23 11:36:20 -05:00
Lennart Prelle
0a83b0d37a forget the return 2011-12-23 13:51:40 +01:00
Lennart Prelle
9ab4cd113e remove redirect to stream from settings 2011-12-23 13:44:41 +01:00
Steven Fuchs
f3486e831f changes is_unread parameter to unread 2011-12-22 22:57:05 -05:00
Steven Fuchs
a7af886da2 add 'read' class ro read messages to match the 'unread' class associated with unread messages. This will keep us from attaching jquery functionality to notification types we may not know about. 2011-12-22 15:53:14 -05:00
Steven Fuchs
f2be6e8bcf controller can accept a parameter as to whether the notification should be marked as read or unread 2011-12-22 15:20:48 -05:00
Jonne Haß
2817fb95de do not use example config if there's a custom one 2011-12-22 02:03:41 +01:00
Maxwell Salzberg
22d5e913cc remove splunk logging 2011-12-21 14:24:03 -08:00
danielgrippi
0f42c98a7b merge Pistos's reshare branch into master 2011-12-20 14:42:18 -08:00
danielgrippi
e9b6da605f fix specs; move presence_of_content validation check into a before_destory to play nicely with federation 2011-12-20 10:42:30 -08:00
Pistos
f83e56e5f3 Added a counter cache for the number of reshares of a post. 2011-12-19 17:12:17 -05:00
Pistos
e951fa6a9c Use Post#reshare_count in the view so that we take advantage of the memoization instead of hitting the DB more than necessary. 2011-12-19 17:12:17 -05:00
Pistos
a604dd2aa6 Refactor implementation of #reshare_count. 
The old implementation which uses Post.where causes

  undefined method `abstract_class?' for Object:Class

in spec/controllers/posts_controller_spec.rb.  Not sure whether that's a problem
with Rails, or rspec, or what.
 2011-12-19 17:12:17 -05:00
Pistos
51566ebe0b Improve wording of error message in Reshare#root_must_be_public validation. 2011-12-19 17:12:17 -05:00
Pistos
99f2d4f018 Original (root) posts should simply have "Reshare" as the English link text (not "Reshare original"). 2011-12-19 17:12:17 -05:00
Pistos
e9c87f7f44 Always show "Reshare original" for link. Show number of reshares in the post_initial_info div. 
This is to improve UX by making it much more obvious how to reshare a post that
has already been reshared.  Prior to this change, the link to reshare would show
only the reshare count, e.g. "7 reshares".  Most users would have no idea that
they need to click "7 reshares" to reshare the post themselves.
 2011-12-19 17:12:17 -05:00
Vittorio Cuculo
0e77fcb084 Fix #2488 soundcloud embedding 2011-12-19 09:50:39 +01:00
danielgrippi
97b8045f20 added counter cache for photos on StatusMessage 2011-12-16 20:39:24 -08:00
Lennart Prelle
20a39714bf added translation for close account 2011-12-15 15:35:30 +01:00
Jonne Hass
d6f98d12e1 even more spec fixing, postgres throws statement invalids for duplicate keys, luckily record not unique is a subsubclass of it so we can just catch the higher error 2011-12-11 04:45:11 +01:00
Jonne Hass
fe82cd6609 lets not set NOT NULL fields to null… 2011-12-11 04:12:58 +01:00
Jonne Hass
12d0eee7d9 use new translation keys for will_paginate instead of the setting 2011-12-11 02:49:43 +01:00
Jonne Hass
57661fe9dd fixed a couple of specs 2011-12-11 02:08:38 +01:00
Jonne Hass
5726b37fb9 diaspora connect: fix edge case where pod lost the client information 2011-12-11 01:37:15 +01:00
Jonne Hass
8b141ed5d5 oauth feature green, except for the pod forgot client edge case 2011-12-10 12:54:39 +01:00
Jonne Hass
4dd55ebdad fix diaspora connect for the new oauth stuff WIP. There's one bug where the oauth_identifier changes but the client doesn't get informed or doesn't save it. I hope it's the last bug. Btw. this is all ugly 2011-12-10 12:54:39 +01:00
Jonne Hass
05be43e21a fix #2504 2011-12-10 12:44:55 +01:00
danielgrippi
fb39a1e16d fix account deletion specs 2011-12-09 17:51:45 -08:00
Maxwell Salzberg
8f8769aab5 basic NSFW filtering for authors who say their post is nsfw 2011-12-08 18:22:27 -08:00
Maxwell Salzberg
c0ac664d64 translated close account 2011-12-08 16:32:20 -08:00
danielgrippi
342593988b MS DG; fixed close account cukes 2011-12-08 16:32:20 -08:00
Maxwell Salzberg
90458381f5 basic page for deleting account with temporary text and cute cat picture 2011-12-08 16:32:20 -08:00
Maxwell Salzberg
ee12f19ff6 dispatch before deleting 2011-12-08 16:32:20 -08:00
Ilya Zhitomirskiy
e57698bbe8 setting the account deletion name in the xml 2011-12-08 16:32:19 -08:00
Ilya Zhitomirskiy
1552b5bcc2 keep the pivate key, required for retries 2011-12-08 16:32:19 -08:00
Maxwell Salzberg
f800d50a2b i think this works 2011-12-08 16:32:19 -08:00
Ilya Zhitomirskiy
0bd101dca9 change close account to clear profile, still need to dispatch account deletion xml 2011-12-08 16:32:19 -08:00
Ilya Zhitomirskiy
7667029e71 wip, stated the serialized model 2011-12-08 16:32:19 -08:00
Ilya Zhitomirskiy
03ca34767a ms iz rendering nothing for hcard and webfinger if account is closed, not showing aspect dropdown if the user account is closed 2011-12-08 16:32:18 -08:00
danielgrippi
e6ed2d397a added close account to user 2011-12-08 16:32:18 -08:00
danielgrippi
cd6f97fa0e DG IZ; remove authorizations from user; double check that aspect_visibilities are deleted 2011-12-08 16:32:18 -08:00
danielgrippi
644e382cfd DG IZ; remove more stuff associated with user; removed dependant destroys 2011-12-08 16:32:18 -08:00
Ilya Zhitomirskiy
3035f173bd ms iz wip, clearing profile, started deleting post visibilities 2011-12-08 16:32:18 -08:00
Ilya Zhitomirskiy
05612ef733 ms iz wip 2011-12-08 16:32:18 -08:00
Maxwell Salzberg
2282fd35d1 kill no longer used youtube titles code with fire 2011-12-08 16:16:57 -08:00
Gonzalo Rodriguez
c7c46d2b7b Update edit form after aspect rename. Closes #2363. 2011-12-07 01:57:04 -02:00
danielgrippi
beeb02dcd6 omniauth 1.0 replaced 'user_info' with 'info' 2011-12-06 17:53:41 -08:00
danielgrippi
d0f58e1bd4 Revert "upgrade devise; devise_invitable" 
This reverts commit 0f56ee7b77.
 2011-12-06 11:01:50 -08:00
danielgrippi
0f56ee7b77 upgrade devise; devise_invitable 2011-12-06 10:50:29 -08:00
Jonne Hass
a892ea41eb refactor out profile url generation into local_or_remote_person_path and use it everywhere. closes #2471 2011-12-06 13:08:21 +01:00
tmlee
3b6c6c564f Include "Looking For #link" under params[:q] blank else branch 2011-12-03 21:23:39 -02:00
Gonzalo Rodriguez
c62a9a2e63 Little refactor on PeopleController#index 2011-12-03 21:19:58 -02:00
Daniel Grippi
71354a1673 Merge pull request #2469 from geckoxx/comment_stream_new 
better commented_posts_stream
 2011-12-02 10:42:36 -08:00
Johannes Hackel
36c9b9ecdd fix next sql error 2011-12-02 16:33:12 +01:00
Johannes Hackel
4b25545e82 fix sql error 2011-12-02 15:03:15 +01:00
Kaleem Ullah
afa1274d7c change upload photo alt text 2011-12-01 10:22:35 +04:00
Pistos
aa0aaa2f92 Revert "Merge pull request #2428 from geckoxx/comment_stream" 
This reverts commit 8a27568273, reversing
changes made to 31ef2d60f7.

Conflicts:

	app/helpers/stream_helper.rb
	app/views/aspects/index.html.haml
	config/locales/diaspora/en.yml
	config/routes.rb
	spec/lib/stream/comments_spec.rb
 2011-11-30 22:22:32 -05:00
Daniel Grippi
cec1f09202 specs green 2011-11-30 09:56:47 -08:00
Daniel Grippi
682d45d9bd Merge pull request #2426 from geckoxx/like_stream 
Like stream
 2011-11-30 09:11:17 -08:00
Daniel Grippi
5a1b73dc61 Merge pull request #2433 from geckoxx/2274-empty-tag 
Fix Bug 2274, empty tag
 2011-11-30 09:07:30 -08:00
aboire
d03695e128 update url invitation facebook 2011-11-30 17:44:45 +04:00
Johannes Hackel
23fa7a0a3e like stream new 2011-11-29 17:27:09 +01:00
danielgrippi
873e04f24d Revert "use select distinct as opposed to group by". Using a distinct 
causes a 500

This reverts commit 805346c70c.
 2011-11-28 15:17:36 -08:00
danielgrippi
805346c70c use select distinct as opposed to group by 2011-11-28 15:09:20 -08:00
Daniel Grippi
161d9d527c Merge pull request #2270 from fermionic/allow-photo-views-in-mobile 
re-enable photo viewing on mobile
 2011-11-28 11:03:13 -08:00
Daniel Grippi
a4027f3d22 Merge pull request #2417 from jperyl/2284-display-user-handle-in-hovercard-2 
Issue #2284: simple fix
 2011-11-28 09:32:41 -08:00
Daniel Grippi
8a27568273 Merge pull request #2428 from geckoxx/comment_stream 
comment_stream
 2011-11-28 09:05:45 -08:00
Vittorio Cuculo
fdd52782d2 show diaspora_handle on profile [mobile] 2011-11-24 09:42:15 +01:00
Johannes Hackel
ef28e89809 people_controller_spec 2011-11-23 23:45:09 +01:00
Jonne Hass
a40fbc9617 Merge pull request #2403 from gandaro/outdated-information-cubbies 
deleted tokens:show:login_with_diaspora_is_comming
 2011-11-23 13:07:10 -08:00
Michael Sofaer
2b8d07f94b Censorship point has been made ... for now. 2011-11-22 15:54:50 -08:00
Johannes Hackel
66acd7db14 specs, stay on page 2011-11-22 12:54:19 +01:00
Johannes Hackel
eb65074360 Fix Bug 2274, empty tag 2011-11-22 12:16:00 +01:00
Dan Hansen & Sarah Mei
d9bd25e114 Only repopulate cache on contact destroy if user exists 2011-11-21 21:39:26 -08:00
Johannes Hackel
7368bb9e62 comment_stream 2011-11-20 18:37:10 +01:00
Dan Hansen & Sarah Mei
7e4028626f Fix lightbox for non-logged-in user 2011-11-19 21:45:31 -08:00
Sarah Mei
ad27eaac3d Fix photo#show for non-logged-in user 2011-11-19 21:17:39 -08:00
Jake Peryl
07f05ebead Issue #2284: simple fix 2011-11-17 01:22:01 +01:00
danielgrippi
cc4531f73c stop censorship. sopa 2011-11-16 16:04:21 -08:00
Jonne Hass
565ef69441 translate Email in the sidebar 2011-11-16 21:55:09 +01:00
Jonne Hass
74582fe07d Merge pull request #2340 from manuels/userignore_icon 
Modified "Ignore user" icon
 2011-11-16 10:48:55 -08:00
Jonne Hass
09bad3a7f6 Merge pull request #2314 from Pistos/svg-to-png 
Converted all [used] SVG graphics to PNG.
 2011-11-16 10:45:33 -08:00
Jakob Kramer
3f3dbf0c6c deleted tokens:show:login_with_diaspora_is_comming, because it got outdated by now 2011-11-15 14:42:47 +01:00
danielgrippi
8e55fc158b use root_path in header if not logged in 2011-11-14 19:04:27 -08:00
danielgrippi
6be778b9b2 change root_path and root_url to multi_path 2011-11-14 18:01:09 -08:00
danielgrippi
6408105917 Revert "auto follow back feature" 
This reverts commit 226554becf.

Conflicts:

	config/locales/diaspora/en.yml
 2011-11-14 17:18:43 -08:00
Sarah Mei & Tim Frazer
e38cb41f85 Better error messages for folks coming in with a bad invitation token, whether by clicking the "view this invitation in your browser" link or by clicking the accept invitation button. 
Get rid of 500 error on the "view this invitation in your browser" link
 2011-11-14 17:02:13 -08:00
Michael Sofaer & Sarah Mei
8294472420 Merge branch 'master' of https://github.com/diaspora/diaspora 2011-11-14 14:16:20 -08:00
Michael Sofaer & Sarah Mei
3e1d06ded3 Memorial splash page 2011-11-14 14:16:09 -08:00
Kevin Fitzpatrick & Tim Frazer
84e4866e6b Merge branch 'master' of github.com:diaspora/diaspora 2011-11-14 12:33:10 -08:00
Kevin Fitzpatrick & Tim Frazer
96f2aaa57a Background sending password reset instructions. 2011-11-14 12:30:47 -08:00
Jonne Hass
226554becf auto follow back feature 2011-11-14 20:25:11 +01:00
Pistos
05b1e2fc19 Fixed issue #2380 : No more 500 error when following an unnormalized version of an existing tag. 
e.g. if "test" exists and you try to follow "Test".
 2011-11-13 23:26:53 -05:00
Jonne Hass
6526e2f305 fix #2392 2011-11-13 22:37:18 +01:00
Jonne Hass
9839ac559c fixed timeago for posts#show if not logged in 2011-11-11 23:06:08 +01:00
Jonne Hass
65f8136690 made public translatable in the publisher dropdown 2011-11-11 23:00:46 +01:00
Pistos
ef075b7b15 Don't render "getting started" help text over aspect dropdown if the user isn't actually getting started. 
This fixes a UI bug which showed remnants of the "getting started" text on hover.
 2011-11-10 20:41:09 -05:00
Pistos
d3d92e5957 Only render "getting started" help text for users that really are getting started. 
This fixes a UI bug which showed remnants of the "getting started" frontend code on hover.
 2011-11-10 20:04:26 -05:00
Pistos
ef990e04cd Refactor new user helper text in publisher; improved code readability. 2011-11-10 20:03:52 -05:00
Jonne Hass
b3142ac208 redirect to sign in page from photo#show on a private photo when user isn't signed in 2011-11-10 22:44:12 +01:00
Jonne Hass
10fa7ba024 fixed 500 on photos#show for private photos and logged out user 2011-11-10 19:31:00 +01:00
Lennart Prelle
d95b28a9be added translation to tag_path in _right_selection 2011-11-10 15:14:07 +01:00
Daniel Grippi
6c68fd752f Merge pull request #2362 from Pistos/remove-invalid-comment-in-publisher 
Remove a comment from the publisher Haml code, so publisher isn't mangled
 2011-11-09 16:33:37 -08:00
Daniel Grippi
319d72deb9 Merge pull request #2345 from 21echoes/higher_post_limit 
higher post limits
 2011-11-09 16:11:39 -08:00
Daniel Grippi
eb6fc5f130 Merge pull request #2367 from lprelle/newhere_to_locale_translation 
#NewHere to locale translation
 2011-11-09 16:09:12 -08:00
Jason Robinson
c04bcebfca Bookmarklet render if statement negated for code simplicity 2011-11-09 22:44:57 +02:00
Jason Robinson
af5c469f10 Created missing view for mobile bookmarklet. Adjusted status_messages_controller.rb to render it. 2011-11-09 22:44:57 +02:00
Lennart Prelle
f2997f5146 change #newhere to translation 2011-11-09 20:38:06 +01:00
Pistos
e0a9b50c84 Remove a comment from the publisher Haml code, so publisher isn't mangled in Firefox 3. "//" is not really proper Haml comment syntax anyway. 2011-11-09 12:50:10 -05:00
Jonne Hass
59b99fe917 pluralization for show more comments, fix #2350 2011-11-09 11:07:35 +01:00
Maxwell Salzberg
8cab4cb2e2 open up tag show publisher, have a cuter message on the page 2011-11-08 12:34:06 -08:00
Jonne Hass
730d2d9754 add missing .html_safe 2011-11-08 21:32:15 +01:00
Maxwell Salzberg
5c2b59da22 add a link to the tag show page from the search page 2011-11-08 11:47:17 -08:00
Ilya Zhitomirskiy
e1253c4018 fade in on hover, larger x on the welcome div 2011-11-07 23:11:48 -08:00
Ilya Zhitomirskiy
d1d24a049c added close buttons which clear getting started when they're all closed 2011-11-07 21:59:29 -08:00
Ilya Zhitomirskiy
15e7a0cc6e pop-over close buttons, wip 2011-11-07 21:59:29 -08:00
David Kettler
74bcc6f06e now that we have the 'read more' link in the stream, let posts be as long as the mysql character limit 2011-11-07 21:21:36 -08:00
danielgrippi
6f7c9e9301 Remove resque_rescheduler as it was killing our app servers (receiving 
http requests).

Revert "retry less"

This reverts commit 7784156e3b.

Revert "supress resque retries"

This reverts commit 80cdcd4edd.

Revert "Retry federation if remote pod is down"

This reverts commit bcbc86e502.

Conflicts:

	app/models/jobs/http_multi.rb
 2011-11-07 12:50:02 -08:00
danielgrippi
9d91b70f9d fix scope 2011-11-07 12:18:23 -08:00
Manuel Schölling
3e9efad9d6 Fixed icon path of 'Ignore User' icon and converted to .png 2011-11-07 21:15:33 +01:00
danielgrippi
8da1d6a7fc multi stream hotfix (re: cache) 2011-11-07 12:15:24 -08:00
Maxwell Salzberg
35216808e0 do not specifiy order for a scope that does not have to do with order 2011-11-06 21:16:57 -08:00
Sarah Mei
0fc43b580b Remove some empty files. If you're gonna scaffold, plz remove empty files before committing kkthx. 2011-11-06 20:27:36 -08:00
danielgrippi
de88c0ab48 correct newrelic_ignore 2011-11-06 19:35:30 -08:00
Pistos
14842c1b43 Merge remote-tracking branch 'johnedmonds/issue1144' 2011-11-06 22:21:53 -05:00
Manuel Schölling
99d51b72e8 Modified "Ignore user" icon 2011-11-07 00:15:41 +01:00
Jonne Hass
78e03056e8 little reorder in application.yml.example and only show donations in sidebar if paypal stuff is set 2011-11-06 23:03:20 +01:00
Jonne Hass
9a556f7cb2 Merge pull request #2338 from buddhamagnet/2307-private-inbox-bug 
2307 private inbox bug
 2011-11-06 13:12:03 -08:00
buddhamagnet
d8a22da275 amended view to pass in time to translated string for private inbox thread time display 2011-11-06 18:47:51 +00:00
buddhamagnet
77474b214a added translateable text to inbox thread times 2011-11-06 18:08:51 +00:00
Jonne Hass
af1558831b Improved reshare receive 
- Do not error out on Reshare#fetch_post/after_parse if we get a 404
- Do error out if another error happens in Reshare#fetch_post/after_parse
- Retry failling receive jobs a few times
 2011-11-06 18:26:10 +01:00