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

2252 commits

Author SHA1 Message Date
David Morley
cec98ba454 Update config/assets.yml 2012-01-23 20:18:41 -08:00
Dan Hansen
51332931ee almost done 2012-01-23 19:31:01 -08:00
Dan Hansen
168d6cbdbe jquery.mentionsInput wip, almost done 2012-01-23 19:31:00 -08:00
Maxwell Salzberg
5b947db0d7 remove a couple of stray things I mistakenly -am -ed in. also, I am a jerk 2012-01-22 23:07:26 -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
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
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
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
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ß
c8e09bf325 localize back to top [ci skip] 2012-01-22 13:54:31 +01:00
David Morley
1221218e70 Update config/assets.yml 2012-01-21 07:50:06 -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
e461956a97 allow custom app_name prefixes for newrelic 2012-01-20 12:25:05 -08:00
Jonne Haß
abd8fb104c updated 6 locale files [ci skip] 2012-01-20 13:43:43 +01:00
Maxwell Salzberg
493553f979 working on making heroku_san magical 2012-01-19 19:21:10 -08:00
Jonne Haß
ce0507f9eb move config/ci to script/ci, update rubygems before bundle install 2012-01-19 13:57:47 +01:00
Jonne Haß
a4b9ae4f8a ensure known rubygems on travis 2012-01-19 13:36:51 +01:00
Maxwell Salzberg
1fe7793ec5 Place Rack:SSL before hoptoad 2012-01-19 00:56:06 -08:00
Frederico Araujo
5ce4f60736 Added Fallback to use old hoptoad_api_key if not application.yml is not update 2012-01-19 13:20:59 +07:00
David Morley
d6fffa1309 Update config/application.yml.example 2012-01-18 18:42:35 -08:00
Maxwell Salzberg
7cafac8c05 I should really start using autosave-on-lose-focus in vimi [ci skip] 2012-01-18 18:03:15 -08:00
Maxwell Salzberg
fe03d7875d update some docs on how circumvent_ssl_requirement works [ci skip]" 2012-01-18 18:01:38 -08:00
Maxwell Salzberg
69e81a0dc3 move loading rack ssl to an initializer, so we have EnviromentConfiguration and AppConfig. also, circumvent ssl requirement option is now back" 2012-01-18 17:57:26 -08:00
Maxwell Salzberg
08adcf3e3e blarg. ActionDispatch::Static isnt always there. took out the option so people can run their ssl pods correctly for now 2012-01-18 17:27:23 -08:00
Maxwell Salzberg
1b3cdbb78a Revert "add a circumvent_ssl_requirement option to application.yml.example; sending out a mail to diaspora-dev for more info" 
This reverts commit ed45789403.
 2012-01-18 16:52:13 -08:00
Maxwell Salzberg
ed45789403 add a circumvent_ssl_requirement option to application.yml.example; sending out a mail to diaspora-dev for more info 2012-01-18 15:50:22 -08:00
Maxwell Salzberg
18e895c247 include Rack::SSL to upgrade all requests to ssl 2012-01-18 15:09:08 -08:00
Frederico Araujo
f4801651eb Issue #2688 Remove hoptoad_notifier and use airbreak 2012-01-18 23:07:00 +07:00
Maxwell Salzberg
86c8f99188 update the .example, which unfortunatly i think will make travis happier and avoid some loading bs 2012-01-17 17:14:22 -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
Maxwell Salzberg
467f3b0bda MS TT; Add heroku_san to gemfile, adjust custom heroku rake tasks 2012-01-16 20:25:56 -08:00
danielgrippi
8150d32b86 using pageDown Markdown library, fixing autolinking. created app.helpers.textFormatter, which takes care of text formatting; functions can be called individually throughout the app 2012-01-15 18:28:58 -08:00
danielgrippi
f2cc8b4e41 Revert "move unicorn into the heroku group till we decide if we switch completly to it or not" 
This reverts commit 641cedf343.

Revert "Merge pull request #2663 from torrancew/with_unicorn"

This reverts commit 2a2efd097f, reversing
changes made to 78978f051e.
 2012-01-15 16:07:00 -08:00
Jonne Haß
203607945b updated 12 locale files [ci skip] 2012-01-15 23:04:57 +01:00
Daniel Grippi
2a2efd097f Merge pull request #2663 from torrancew/with_unicorn 
Needz moar unicorns please [ci skip]
 2012-01-15 04:22:03 -08:00
Jonne Haß
bec3e2c92b set faradays timeout 25 2012-01-15 02:49:14 +01:00
Tray Torrance
cd4c880f95 Add unicorn to bundle, supply a basic unicorn config. 2012-01-14 12:25:51 -08:00
Jonne Haß
c5654a43db do proper pluralization for JS 2012-01-14 20:27:17 +01:00
Jonne Haß
8e47b26f01 Merge branch 'master' of git://gitorious.org/diaspora-l10n-ca/diaspora-l10n-ca 2012-01-14 20:07:20 +01:00
Jonne Haß
9e482ff1b1 updated 99 locale files [ci skip] 2012-01-14 20:07:11 +01:00
Jonne Haß
ca87a3f9ea add two to the javascript pluralizations 2012-01-14 16:43:35 +01:00
Jordi Mallach
52c88440a2 Update Catalan translation to e1edef9. 2012-01-14 12:49:26 +01:00