Commit graph

5239 commits

Author SHA1 Message Date
Dennis Collinson
4692055d8a now using handlebars for client side templates 2012-01-22 16:59:44 -08: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
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
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
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
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