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 |
|