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
4f7dda6012 bang! kill redis cache. 2012-02-02 12:45:43 -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
Sarah Mei
085d6552b3 Drop comments, likes, and PMs from people who the (post/conversation) owner is ignoring. 2012-02-01 17:52:11 -08:00
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
danielgrippi
02021584a7 EvilQuery for Participation, refactor comment creation 
you can now create a comment with User#comment!(post, text)
 2012-02-01 15:09:31 -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
Jonne Haß
7a8bd7595b do not auto follow back if already sharing 2012-01-31 14:34:09 +01:00
Maxwell Salzberg
5914ed4ef1 defer comments posting in comment controller 2012-01-30 11:34:50 -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
e4fa8d8466 Fix tags_helper, add specs 2012-01-29 11:46:51 -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ß
0e7b084713 fix 500 in PostsController#show for non existing post 2012-01-29 14:47:51 +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
0e0d40d00e Remove pagination from json format of contacts#index; add explanatory comments. I KNOW. But it's super confusing and I can't find a way to rewrite the code to be more clear. Soloing FTL. 2012-01-28 15:31:11 -08:00
Sarah Mei
03e3d8e993 Refactor contacts#index to have explicit html and mobile formats again, because apparently infinite scroll wants the html version, not the json version. 2012-01-28 15:31:11 -08:00
Sarah Mei
a27b17bc68 Slight refactor to contacts#index 2012-01-28 15:31:11 -08:00
Sarah Mei
3ec09930fe Refactor contacts#index specs. json requests now paginate correctly, but infinite scroll is still broken. 2012-01-28 14:43:47 -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
Sarah Mei
7d4a81560d Move contact pagination to controller - fixes #2760 2012-01-27 21:56:27 -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
8529293eee resque deals with stringified hashes, not symbolized ones [ci skip] 2012-01-27 16:48:28 -08:00
danielgrippi
31bfef9dd2 pass in service_type strings instead of objects to deferred_dispatcher. 2012-01-27 16:05:38 -08:00
Maxwell Salzberg
67432bfaf4 suppress annoying resque errors; add a task to clear Resque failures 2012-01-27 14:57:04 -08:00
danielgrippi
d8c6dc0d79 added source to stream element js template. [ci skip] 2012-01-27 13:51:24 -08:00
Maxwell Salzberg
c69df0fb29 fix photos controller test 2012-01-27 13:06:27 -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
Maxwell Salzberg
e2cb572c15 random cleanup; delete some unused methods, clean up some logic in some 
controllers; update the default referee to /stream [ci skip]
 2012-01-27 02:23:38 -08:00
Maxwell Salzberg
c100f8bfdd clean up Person scopes, and re-use one in contact controller to deprecate a controller method 2012-01-27 02:23:38 -08:00
Maxwell Salzberg
7cef6a8d22 remove unneeded line from apps_controller [ci skip] 2012-01-27 02:23:37 -08:00
Maxwell Salzberg
46da8310f5 small styling changes 2012-01-27 02:23:37 -08:00
Maxwell Salzberg
8002091d67 kinda refactor another sucky controller method 2012-01-27 02:23:37 -08:00
Maxwell Salzberg
cc5334ce9a make this scary join a scope [ci skip] 2012-01-27 02:23:37 -08:00
Maxwell Salzberg
c43bb90794 we never use this data [ci skip] 2012-01-27 02:23:37 -08:00
Maxwell Salzberg
117acdd17f move mention regex to a constant in mention 2012-01-27 02:23:37 -08:00
Maxwell Salzberg
718c4fd38c refactor status_message_controller#create to suck less. it still sucks 2012-01-27 02:23:37 -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
danielgrippi
c133c16dc2 DG MS; don't fetch people or contact objects (you don't need) on multi stream. 2012-01-26 14:52:31 -08:00
danielgrippi
005b165e87 defer dispatching to help app processes not bloat in memory 2012-01-26 13:24:53 -08:00
Maxwell Salzberg
c23e6d9afd dispatcher#post should not take opts 2012-01-26 13:24:53 -08:00
Steven Fuchs
9e337fc8b0 read_all button on notifications page redirects to stream. 2012-01-25 19:03:31 -05: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
Jonne Haß
e1658f8d8b switch PhotosController#index over to guid, fix #2729 2012-01-25 12:45:02 +01:00
Jonne Haß
9c67cd7eb9 collapse Post#last_three_comments and Commentable#last_three_comments, do not double query comments in CommentsController#index for a JSON response, remove spec that tests ordering as it's not deterministic on psql without specified order 2012-01-25 12:44:50 +01:00
danielgrippi
72aee6b2c1 don't use .last(3), use .limit(3) instead. also, don't put an order on an association as it isn't overridable. (this commit minimizes AR object instantiation in the stream) 2012-01-24 23:47:45 -08:00
danielgrippi
eaed3505e4 Don't create share_visibilities for public posts, sans migration of deleting old data. 2012-01-24 16:49:07 -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ß
19785d909b ensure services is an array in StatusMessagesController#create 
This fixes posting to a single service for Ruby 1.9
For some reason Rails doesn't convert a single foo[]=bar
not to the expected :foo => ["bar"] but to :foo => "bar"
On Ruby 1.8 String#map exists and just yields self, on
Ruby 1.9 String#map got removed
 2012-01-24 18:54:36 +01: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
Jonne Haß
12575bd7f0 update http_accept_language and try to find the preferred locale first, should fix #2715 2012-01-23 14:59:09 +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
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
Steven Fuchs
7cbcaafbeb oops, application_helper gone from application_controller. 2012-01-22 23:28:55 -05:00
Steven Fuchs
052690941b move set_header_data back into application_controller 2012-01-22 23:23:21 -05: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
danielgrippi
740cedde44 temporarly remove newrelic_ignore in PublicsController for heroku analysis 2012-01-22 14:12:24 -08:00
Sarah Mei
872a96dc71 Refactor services controller spec 2012-01-22 08:28:23 -08:00
Jonne Haß
ebfc3de878 do not require newrelic or airbrake unless they are configured 2012-01-22 15:38:55 +01: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
Jonne Haß
a53b1ccaae remove stray :A, thanks @aia 2012-01-22 13:50:36 +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
MrZYX
1ab9520b36 generate recipient header with Mail::Address to properly handle non-ASCII characters 2012-01-21 19:16:09 +01:00
Maxwell Salzberg
e461956a97 allow custom app_name prefixes for newrelic 2012-01-20 12:25:05 -08:00
Steven Fuchs
9836860ca3 Merge remote branch 'upstream/master' into im-sorry-bye-vanna 2012-01-20 12:23:45 -05:00
danielgrippi
750e26e8fb Merge branch 'stream-js-cleanup' 
Conflicts:
	public/javascripts/app/models/stream.js
 2012-01-19 17:07:17 -08:00
danielgrippi
c219cee97d fix inf scroll issues in stream view 2012-01-19 17:01:45 -08:00
Maxwell Salzberg
642d20cecd update cdn jquery, fix #2699 2012-01-19 15:48:17 -08:00
Maxwell Salzberg
0ce0e47ff8 fix #2698; allow a user to delete a reshare of a deleted post 2012-01-19 15:24:07 -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
5721c9e512 remove depricated methods 2012-01-18 13:29:43 -08:00
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