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
Maxwell Salzberg
25a15259bc
explicitly require airbrake middleware if it is configured.... i should not have to do this however
2012-01-22 11:06:18 -08:00
Jonne Haß
1d8dbdd8d8
the middleware stack is just an array and insert_before just an alias to insert, basically, guess what inset(0, something) does. AKA finally fix Rack:SSL
2012-01-22 19:20:35 +01:00
Jonne Haß
98bdf68003
do not rely on hoptoad to insert rack ssl
2012-01-22 18:42:06 +01: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ß
7fd606ba19
Merge branch '2688-airbreak' of https://github.com/fred/diaspora
...
Conflicts:
config/application.yml.example
2012-01-22 15:05:37 +01:00
Jonne Haß
54cb3ea3cb
more than 100% height <3, fix #2710 [ci skip]
2012-01-22 14:01:21 +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
Maxwell Salzberg
49f18d435a
upgrade factory girl there are 3 failing cukes.
2012-01-21 21:58:50 -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
Jonne Haß
b831a9b4db
Merge pull request #2706 from dmorley/patch-10
...
Update config/assets.yml
2012-01-21 07:56:37 -08:00
David Morley
1221218e70
Update config/assets.yml
2012-01-21 07:50:06 -08:00
danielgrippi
9e3521396d
clear new comment on submit; include the newer autoexpander in jasmine
2012-01-20 21:58:07 -08:00
danielgrippi
25d0f0d87f
updated jquery autoResize; comment boxes now expand
2012-01-20 21:45:55 -08:00
Maxwell Salzberg
912211dc0b
make omniauth look at where our ca_file is
2012-01-20 17:21:18 -08:00
Maxwell Salzberg
dcce2976b5
reset soft so you dont lose your custom homepage when you deploy
2012-01-20 16:37:32 -08:00
Maxwell Salzberg
73655efd53
add precompile rake task for heroku (aliasing our jammit and sass setup) [ci skip]
2012-01-20 15:42:20 -08: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
Jonne Haß
abd8fb104c
updated 6 locale files [ci skip]
2012-01-20 13:43:43 +01:00
danielgrippi
7bcbd86cdf
remove stray console.log
2012-01-20 01:21:13 -08:00
danielgrippi
b4e0483a18
fixed really nasty inf scroll bug (hotfix)
2012-01-20 01:20:41 -08:00
danielgrippi
b9c98b2b44
support shortened post routes in js router
2012-01-19 23:41:49 -08:00
Maxwell Salzberg
493553f979
working on making heroku_san magical
2012-01-19 19:21:10 -08:00
Maxwell Salzberg
f3120b3d5a
add stash to before/after deploy so you dont lose in progress h@x
2012-01-19 19:20:11 -08:00
danielgrippi
f0a698d806
added before_deploy and after_deploy tasks
2012-01-19 19:20:11 -08:00
danielgrippi
356494b78b
DG DC; $("window") doesn't actually work in the binding scenario
2012-01-19 17:16:58 -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
b583a7a444
Put dennis's changes back in
...
Revert "Revert "refactoring backbone urls""
This reverts commit 838da1fd529b1d64bb762a69c0ebd4
2012-01-19 17:05:30 -08:00
danielgrippi
c219cee97d
fix inf scroll issues in stream view
2012-01-19 17:01:45 -08:00
Maxwell Salzberg
3fa2592728
fix a bug with client side validations and jquery cache thx 2 grippi for idea
2012-01-19 15:59:20 -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
838da1fd52
Revert "refactoring backbone urls"
...
This reverts commit 4ad58bdf2f
2012-01-19 14:20:31 -08:00
