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

2305 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
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
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
Florian Staudacher
ad5a17776f Merge branch 'master' of git://github.com/diaspora/diaspora into input-placeholders 2012-01-19 13:29:35 +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
Florian Staudacher
81ae0c644c start using new placeholders on login page 2012-01-18 01:17:20 +01: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
Jordi Mallach
685662c3de Merge branch 'master' of git://github.com/diaspora/diaspora 2012-01-14 12:43:46 +01: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ß
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
Jordi Mallach
a6f68fa670 Update Catalan translation to e4f4f06. 2012-01-13 20:51:28 +01:00
Sarah Mei
e4f4f06404 Terminology clean up - remove references to Diaspora Handle, make capitalization of Diaspora ID consistent. 2012-01-13 11:24:27 -08:00
Jonne Haß
e96dd58cff Merge branch 'master' of git://gitorious.org/diaspora-l10n-ca/diaspora-l10n-ca 2012-01-13 19:32:51 +01:00
Jonne Haß
e5663126d9 updated 80 locale files [ci skip] 2012-01-13 19:32:42 +01:00
Jordi Mallach
e898e2d03f Updated Catalan translation to c11fdb0. 2012-01-09 19:20:38 +01:00
Jordi Mallach
42dc12988a Updated Catalan translation to 1b8f78e. 2012-01-09 18:55:54 +01:00
danielgrippi
c11fdb0459 put 'Admin' back in #user_menu for admins. this fixes #2595 [ci skip] 2012-01-08 23:43:17 -08:00
danielgrippi
d5a4f9eb98 use content_view for comments (markdown, tagging) 2012-01-07 20:19:47 -08:00
danielgrippi
d2807b5202 markdown for posts on front end, tags broken 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
933299e31c added translations to templates; mock out the locale file in jasmine 2012-01-07 14:23:28 -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
5e88ca846a remove jquery-debounce in lieu of _.debounce; remove web_socket vendor libs 2012-01-07 14:23:27 -08:00
danielgrippi
5bbe8bfccd remove Mustache.js, use _.template as a replacement (we only want to use one js templating library) 2012-01-07 14:23:27 -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
02ca7a32f0 added reshare logic back (doesn't append it to the stream...) 2012-01-07 14:23:25 -08:00
danielgrippi
c95f4f30e7 add view.js to config/assets.yml 2012-01-07 14:23:24 -08:00
danielgrippi
1b8f78e006 remove sort order logic from controllers; backbone stream does not support it; was to be depricated anyway 2012-01-07 14:23:24 -08:00
danielgrippi
ae6fa5bebb don't use Diaspora widget system or stream.js when backbone is active; 
migrating like actions over to backbone; some cleanup; bump jquery to
1.7.1
 2012-01-07 14:23:22 -08:00
danielgrippi
525fd3c4e4 make views associated in stream inherit from App.Views.StreamObject (location of shared deletion function) 2012-01-07 14:23:22 -08:00
danielgrippi
f62b26fc73 put the frontend into its own folder; only use one routes file 2012-01-07 14:23:21 -08:00
danielgrippi
3f7d992a0b DH DG; added new routes for streams; fixed pagination 2012-01-07 14:23:21 -08:00
Dan Hansen
ba9ece0014 Use routers, remove some hacks 2012-01-07 14:23:21 -08:00
Daniel Grippi
d504bf4591 add current user to body tag data field (hackity hack). add comment links to posts 2012-01-07 14:23:20 -08:00
danielgrippi
c360e82f11 DG DH; backbone stream now sort-of renders on multis_controller; wip 2012-01-07 14:23:20 -08:00
Maxwell Salzberg
2422bdab46 MS SM; make loading jquery from cdn or local a helper so we can stub it in cukes 2012-01-07 12:55:46 -08:00
Jonne Haß
a1c30ac096 updated 35 locale files [ci skip] 2012-01-07 00:00:30 +01:00
Maxwell Salzberg
fa55200e9c MS DC; as newrelic yml is always included, you need it in your bundle; also, make travis scripts noisy if they fail 2012-01-05 17:50:11 -08:00
Maxwell Salzberg
cc6596262c default newrelic to use ssl 2012-01-05 17:31:38 -08:00
Maxwell Salzberg
cedc49bf09 MS DC; oauth keys are now pulled out of application.yml to be simplier. incldue newrelic as heroku expects it, without affecting people who do not use newrelic. If you do use new relic in production, you have to put your newrelic api key in application.yml 2012-01-05 17:31:38 -08:00
Jonne Haß
c0e4fa831a fix syntax error in production.rb 2012-01-05 20:17:30 +01:00
Maxwell Salzberg
0199949f3c move analytics to initializer, thx MrZYX 2012-01-05 10:55:29 -08:00
Maxwell Salzberg
5a0f948a85 better file requires in production.rb 2012-01-05 00:02:59 -08:00
Maxwell Salzberg
fdea2f94ff remove icky analytics code from layouts, move to middleware 2012-01-04 23:54:48 -08:00
Maxwell Salzberg
9cdfea02b0 add the GC profiling option for newrelic for 1.9.2; see: http://newrelic.com/docs/ruby/ruby-gc-instrumentation 2012-01-04 22:28:18 -08:00
Jonne Haß
4a260056c0 lets see if this fixes #1337 2012-01-04 15:33:41 +01:00
Jonne Haß
52c75a7ad4 Revert "Revert "auto follow back feature"" 
This reverts commit 6408105917.

Conflicts:

	db/schema.rb
 2012-01-04 13:49:56 +01:00
Jonne Haß
296730de04 updated 12 locale files [ci skip] 2012-01-04 13:17:36 +01:00
Maxwell Salzberg
a7d59ce115 add EnviromentConfiguration to keep track of heroku specfic enviroment hacks 2012-01-03 16:01:21 -08:00
Jonne Haß
a8136ed86b d'oh aka --amend 2012-01-02 21:11:47 +01:00
Jonne Haß
cc961d66e2 symbolize smtp_authentication setting to conform to rails docs 2012-01-02 21:08:57 +01:00
Jonne Haß
934175c49c updated 15 locale files [ci skip] 2012-01-01 12:55:03 +01:00