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

799 commits

Author SHA1 Message Date
Jonne Haß
3855eaf223 bump handlebars_assets 2013-03-21 21:25:18 +01:00
Jonne Haß
10e5bb7b0d bump guard 2013-03-21 21:25:18 +01:00
Jonne Haß
c1ffc59ddb bump client_side_validations 2013-03-21 21:25:18 +01:00
Jonne Haß
669faa042d bump addressable 2013-03-21 20:50:25 +01:00
Jonne Haß
a55f6fd98c Merge branch 'hotfix/0.0.3.4' into develop 
Conflicts:
	Changelog.md
	config/defaults.yml
 2013-03-18 21:10:29 +01:00
Jonne Haß
1a995aa47c bump rails to 3.2.13, release 0.0.3.4 2013-03-18 21:07:55 +01:00
Jonne Haß
2afa2899c5 rework Gemfile 2013-03-15 21:00:27 +01:00
Juan Manuel Azambuja
1115e10536 Merge branch 'develop' into diaspora_with_sprites 
Conflicts:
	Gemfile
	Gemfile.lock
	app/assets/stylesheets/application.css.sass
	app/assets/templates/comment_tpl.jst.hbs
	app/assets/templates/stream-element_tpl.jst.hbs
	app/helpers/aspects_helper.rb
	app/helpers/contacts_helper.rb
	app/views/aspects/_aspect_listings.haml
	app/views/aspects/toggle_contact_visibility.js.erb
	app/views/contacts/_aspect_listings.haml
	app/views/layouts/_header.html.haml
	app/views/shared/_footer.html.haml
	app/views/tags/_followed_tags_listings.haml
 2013-03-11 20:10:55 -03:00
Juan Manuel Azambuja
f429cacd7a [Sprites] add sprites for icon images 2013-03-11 19:26:11 -03:00
Alexander Wenzowski
57669017bd bundler should communicate with rubygems using ssl 2013-03-11 21:21:31 +01:00
Alexander Wenzowski
98207ed9ea roxml should be loaded from rubygems 2013-03-01 17:36:38 -05:00
Alexander Wenzowski
63f9a6f1ba bundler should communicate with rubygems using ssl 2013-02-28 19:05:39 -05:00
Jonne Haß
abaf7f9a27 bump selenium-webdriver 2013-02-21 16:54:26 +01:00
Jonne Haß
131fdd4b2f bump handlebars_assets 2013-02-17 12:48:31 +01:00
Jonne Haß
2ae4d10431 bump remotipart 2013-02-17 12:48:31 +01:00
Jonne Haß
34a89a2794 bump omniauth 2013-02-17 12:48:31 +01:00
Jonne Haß
3ae073a2dc bump mini_magick 2013-02-17 12:48:31 +01:00
Jonne Haß
f5df8a9c90 bump unicorn 2013-02-17 12:48:30 +01:00
Jonne Haß
a858ad83f6 bump faraday 2013-02-17 12:48:30 +01:00
Jonne Haß
90b3fdda8e bump activerecord-import 2013-02-17 12:48:30 +01:00
Fabián Rodríguez
8d7dd965d8 update handlebars_assets to 0.10.0 2013-02-17 12:48:30 +01:00
Fabián Rodríguez
ac866a321d remove fastercsv form Gemfile & Gemfile.lock 2013-02-17 12:48:29 +01:00
Jonne Haß
e723d9f3d1 bump foreigner 2013-02-17 12:48:29 +01:00
Jonne Haß
9a90a799e6 bump twitter 2013-02-17 12:48:28 +01:00
Jonne Haß
de7acb1579 bump guard 2013-02-17 12:48:28 +01:00
Jonne Haß
70804a2f77 bump timecop 2013-02-17 12:48:28 +01:00
Jonne Haß
cc3f470502 bump rails_admin and haml 2013-02-17 12:48:28 +01:00
Jonne Haß
8d7073a475 bump factory_girl_rails 2013-02-17 12:48:27 +01:00
Jonne Haß
7337dd7972 bump carrierwave 2013-02-17 12:48:27 +01:00
Jonne Haß
2bad517ceb bump selenium-webdriver 2013-02-17 12:48:27 +01:00
Jonne Haß
6366cf5a1d bump fog 2013-02-17 12:48:27 +01:00
Jonne Haß
c4b0709851 bump rack-ssl 2013-02-17 12:48:27 +01:00
Jonne Haß
ad4ba363a9 Merge branch 'hotfix/0.0.2.5' into develop 
Conflicts:
	Changelog.md
	Gemfile.lock
	config/defaults.yml
 2013-02-11 20:54:35 +01:00
Jonne Haß
f2ce9fa17f * Fix CVE-2013-0269 by updating the gems json to 1.7.7 and multi\_json to 1.5.1. [Read more](https://groups.google.com/forum/?fromgroups=#!topic/rubyonrails-security/4_YvCpLzL58) 
* Additionally ensure can't affect us by bumping Rails to 3.2.12. [Read more](https://groups.google.com/forum/?fromgroups=#!topic/rubyonrails-security/AFBKNY7VSH8)
* And exclude CVE-2013-0262 and CVE-2013-0263 by updating rack to 1.4.5.
 2013-02-11 20:51:02 +01:00
Jonne Haß
1b73817a5e bump and lock down rmagick 2013-02-04 00:39:41 +01:00
Jonne Haß
6ded1238c7 bump configurate 2013-01-29 12:54:35 +01:00
Jonne Haß
74613b0b15 Merge branch 'hotfix/0.0.2.3' into develop 
Conflicts:
	Changelog.md
	Gemfile.lock
 2013-01-28 20:41:25 +01:00
Jonne Haß
8a8ee42ebc Update Devise to 2.1.3 
http://blog.plataformatec.com.br/2013/01/security-announcement-devise-v2-2-3-v2-1-3-v2-0-5-and-v1-5-3-released/
 2013-01-28 20:38:30 +01:00
Jonne Haß
aadbd95215 Markerb got a release so we can get rid of another gem pulled from git \o/ 2013-01-25 13:26:19 +01:00
Jonne Haß
cf01b33b5f bump will_paginate 2013-01-17 02:00:20 +01:00
Jonne Haß
ac2fa74ac8 bump foreman 2013-01-17 02:00:20 +01:00
Jonne Haß
fe7a49226c bump asset_sync 2013-01-17 02:00:20 +01:00
Jonne Haß
2c9f619638 bump gon 2013-01-17 02:00:20 +01:00
Jonne Haß
9de76c10cd bump sass and sass-rails 2013-01-17 02:00:20 +01:00
Jonne Haß
e07bc6a548 bump nokogiri 2013-01-17 02:00:20 +01:00
Jonne Haß
7c76d42a4d bump rack-rewrite 2013-01-17 02:00:19 +01:00
Jonne Haß
d91e9517b8 bump selenium-webdriver 2013-01-17 02:00:19 +01:00
Jonne Haß
e0682daba8 bump unicorn 2013-01-17 02:00:19 +01:00
Jonne Haß
44da915489 bump mobile-fu 2013-01-17 02:00:19 +01:00
Jonne Haß
9535e894f3 bump ruby-oembed 2013-01-17 02:00:19 +01:00
Jonne Haß
fb8923232c bump jquery-rails 2013-01-17 02:00:19 +01:00
Jonne Haß
e1794d89de bump bootstrap-sass 2013-01-17 02:00:19 +01:00
Jonne Haß
6acbb169d8 bump handlebars_assets 2013-01-17 02:00:19 +01:00
Jonne Haß
df066c9b7a bump guard 2013-01-17 02:00:19 +01:00
Jonne Haß
d863510543 bump fixture_builder 2013-01-17 02:00:19 +01:00
Jonne Haß
64b86b27c1 bump rspec-rails and rspec 
fix two specs by not checking for object identity
 2013-01-17 02:00:03 +01:00
Jonne Haß
e45ed19c33 bump rails_admin 2013-01-17 01:03:51 +01:00
Jonne Haß
6757845398 bump rails-i18n 2013-01-17 01:02:36 +01:00
Jonne Haß
f57afa7d88 bump omniauth-twitter 2013-01-17 01:02:36 +01:00
Jonne Haß
0282782293 bump twitter 2013-01-17 01:02:36 +01:00
Jonne Haß
0c39e2521b bump timecop 2013-01-17 01:02:04 +01:00
Jonne Haß
1d9ecfd22e bump fog 2013-01-17 00:28:57 +01:00
Jonne Haß
a09a8cbffc Merge branch 'hotfix/0.0.2.2' into develop 
Conflicts:
	Changelog.md
	config/defaults.yml
 2013-01-09 00:11:29 +01:00
Florian Staudacher
b320e50236 bump Rails to 3.2.11 
see:
http://weblog.rubyonrails.org/2013/1/8/Rails-3-2-11-3-1-10-3-0-19-and-2-3-15-have-been-released/
 2013-01-09 00:09:07 +01:00
Jonne Haß
26139fc2dc Merge branch 'hotfix/0.0.2.1' into develop 
Conflicts:
	Changelog.md
	Gemfile
	Gemfile.lock
	config/defaults.yml
 2013-01-02 23:45:53 +01:00
Jonne Haß
11f82c794e Bump to Rails 3.2.10 as per CVE-2012-5664 
https://groups.google.com/group/rubyonrails-security/browse_thread/thread/c2353369fea8c53
 2013-01-02 23:40:46 +01:00
Florian Staudacher
ff173e233c add cucumber feature for taking screenshots of important pages 
- for before/after comparisons,
including rake tasks for easily generating the images from command line
 2012-12-17 20:25:34 +01:00
Jonne Haß
15b6b7c56e bump selenium-webdriver 2012-12-08 12:36:05 +01:00
Florian Staudacher
94760f4c04 update jasmine gem, removed useless spec, + changelog) 2012-12-07 21:21:27 +01:00
Tom Scott
e717eaac70 Remove debugger from the Gemfile. 
Developers are free to choose their own debugging agent, but unless
it causes problems, personal development gems are not to be
included in the project's Gemfile. This is so each developer can
maintain their own comfortable environment without having workflows
enforced upon them.

Conflicts:
	Gemfile.lock
 2012-12-07 14:21:09 -05:00
Jonne Haß
366768eac7 the day I decide to switch to seleniums prerelease 2.27 comes out. great. anyway, still two timeouts, any ideas? anyone? 2012-12-06 18:38:06 +01:00
Jonne Haß
613fbb6ffd lets see what travis has to say about the selenium prerelease 2012-12-06 10:37:11 +01:00
Jonne Haß
669dd87b11 extract configruation system to a gem 2012-11-30 13:35:59 +01:00
Jonne Haß
c5be6be377 bump rails to 3.2.9 2012-11-21 19:27:03 +01:00
Jonne Haß
71b5695b6e drop capistrano-ext, closes #3735 2012-11-21 19:18:43 +01:00
David McMullin
9678a1d4b2 add x-frame headers 2012-11-18 09:55:10 +00:00
Jonne Haß
70b0c9e2b7 add rb-fsevent to the Gemfile for our OS X devs 2012-11-14 19:57:52 +01:00
Jonne Haß
0b206534bd bump selenium-webdriver 2012-11-11 13:29:41 +01:00
Jonne Haß
f6d352bc7e bump gon 2012-11-11 13:29:40 +01:00
Jonne Haß
c4d5597fa4 bump faraday_middleware 2012-11-11 13:29:40 +01:00
Jonne Haß
4fc2cb1cba bump carrierwave 2012-11-11 13:29:40 +01:00
Jonne Haß
f2f741a518 bump capybara 2012-11-11 13:29:40 +01:00
Jonne Haß
f4d63c6d90 bump twitter 2012-11-11 13:26:19 +01:00
Jonne Haß
03f5cfcce5 bump rails-i18n 2012-11-11 13:26:18 +01:00
Jonne Haß
497b822d03 bump debugger 2012-11-11 13:25:20 +01:00
Jonne Haß
c447eba4d1 bump rails_admin 2012-11-11 13:25:15 +01:00
Jonne Haß
ec0483ccdb bump rack-rewrite 2012-11-11 13:23:25 +01:00
Jonne Haß
468781008a bump bootstrap-sass 2012-11-11 13:23:25 +01:00
Jonne Haß
91e6644bc2 bump rspec-rails 2012-11-11 13:23:24 +01:00
Jonne Haß
4a4f98c3ef bump unicorn 2012-11-11 13:23:24 +01:00
Jonne Haß
882f5affcf bump database_cleaner 2012-11-11 13:23:24 +01:00
Jonne Haß
9d18724191 bump redcarpet 2012-11-11 13:23:23 +01:00
Jonne Haß
18e8b076c7 bump guard 2012-11-11 13:23:23 +01:00
Jonne Haß
598875f2e3 bump resque 2012-11-11 13:23:22 +01:00
Jonne Haß
7f60cd62bf bump webmock 2012-11-11 13:23:22 +01:00
Jonne Haß
5aed18a53f bump client_side_validations 2012-11-11 13:23:22 +01:00
Jonne Haß
653dd80d43 remove bundler from Gemfile 2012-11-11 13:23:22 +01:00
Jonne Haß
5df3295954 bump handlebars_assets 2012-11-11 13:23:21 +01:00
Jonne Haß
002c3c27fc bump foreman 2012-11-11 13:23:21 +01:00
Jonne Haß
02635a7f64 bump fuubar 2012-11-11 13:23:21 +01:00
Jonne Haß
945aa12b5c bump timecop 2012-11-11 13:23:21 +01:00
Jonne Haß
5a70311fe7 update and fix services 2012-10-25 17:54:18 +02:00
Jonne Haß
f0ef4a764e refactor script/server and associated stuff 2012-10-19 12:25:15 +02:00
Jonne Haß
fdc5811e1e made hy available, temporarily switched to git release of rails-i18n to fix #3023 [ci skip] 2012-10-07 14:30:29 +02:00
Jonne Haß
5c7a9c1ce6 Release cleanup, closes #3620 
* remove un-/underused gems
* remove their associated files
* remove some parallel_tests leftovers
 2012-09-30 22:26:23 +02:00
Jonne Haß
4c8e08e608 bump omniauth-tumblr as tumblr made breaking api changes 2012-09-30 22:09:58 +02:00
Jonne Haß
e05c6e8897 drop heroku, heroku_san and associated rake tasks and files 2012-09-26 20:21:20 +02:00
Jonne Haß
2a4db54db9 New configuration system 
* Throw away old system
* Add new system
* Add new example files
* Replace all calls
* add the most important docs
* Add Specs
* rename disable_ssl_requirement to require_ssl
* cloudfiles isn't used/called in our code
* since community_spotlight.list is only used as enable flag replace it with such one and remove all legacy and irelevant codepaths around it
* die if session secret is unset and on heroku
* First basic infrastructure for version information
 2012-09-26 20:19:37 +02:00
Jonne Haß
ac59a3fa7a rails_admin version that is no longer conflicting with client_side_validations was released 2012-09-26 18:55:06 +02:00
Jonne Haß
7ba092ae0b bump jquery-rails 2012-09-26 18:55:06 +02:00
Jonne Haß
d5be4d6e2b bump asset_sync 2012-09-26 18:55:06 +02:00
Jonne Haß
254d4fd335 bump heroku and fog 2012-09-26 18:55:06 +02:00
Jonne Haß
0560cedab0 bump activerecord-import 2012-09-26 18:55:06 +02:00
Jonne Haß
db11b9d214 Merge branch 'update_gems' into develop 2012-09-20 14:37:34 +02:00
Jonne Haß
70eda77395 bump timecop 2012-09-17 21:25:39 +02:00
Jonne Haß
6d74926b9f bump foreman 2012-09-15 14:09:32 +02:00
Jonne Haß
5fdbbe03ee bump faraday and faraday_middleware 2012-09-15 14:06:04 +02:00
Steven Hancock
ca719893dc Update bootstrap-sass to 2.1.0.0 2012-09-15 01:42:27 -07:00
Jonne Haß
bedb7d1e22 bump activerecord-import 2012-09-13 18:08:13 +02:00
Jonne Haß
3dbbbbe979 bump jasmine and handlebars_assets, postfix all handlebars templates with _tpl to avoid name clashes 2012-09-12 21:22:34 +02:00
Jonne Haß
d9851b2368 bump yard 2012-09-12 17:19:28 +02:00
Jonne Haß
98ba8840c7 bump webmock 2012-09-12 17:14:06 +02:00
Jonne Haß
008651cb7e bump factory_girl_rails 2012-09-12 17:11:25 +02:00
Jonne Haß
76edd7bf7b bump acts_as_api 2012-09-12 17:10:27 +02:00
Jonne Haß
57c77fcd0a bump nokogiri 2012-09-12 16:11:30 +02:00
Jonne Haß
97e05b62ea lock gems for more safety 2012-09-12 15:24:09 +02:00
Jonne Haß
090d6022bd Merge pull request #3566 from MrZYX/cleanup_gemfile 
remove ruby-debug and all other MRI 1.8 related stuff from Gemfile
 2012-09-12 06:14:38 -07:00
Jonne Haß
358ed79f99 Merge branch 'update_devise' 
Conflicts:
	Gemfile.lock
 2012-09-12 15:11:34 +02:00
Jonne Haß
142e38e78b update devise 2012-09-12 13:29:57 +02:00
Jonne Haß
20a7e5570f remove ruby-debug and all other MRI 1.8 related stuff from Gemfile 2012-09-12 13:26:21 +02:00
Jonne Haß
58d1448085 update factory girl 2012-09-12 13:24:23 +02:00
Jonne Haß
8dab297d26 bump and convert back to gem release: acts-as-taggable-on 2012-09-11 00:46:37 +02:00
Jonne Haß
f22346a4ae bump pg 2012-09-11 00:46:37 +02:00
Jonne Haß
ab0143d18e bump gon 2012-09-11 00:46:36 +02:00
Jonne Haß
0d925c0fed bump haml 2012-09-11 00:46:36 +02:00
Jonne Haß
e7b1edbef7 bump database_cleaner 2012-09-11 00:46:36 +02:00
Jonne Haß
80153bf287 bump thin 2012-09-11 00:46:36 +02:00
Jonne Haß
39a5baa8c8 bump resque 2012-09-11 00:46:35 +02:00
Jonne Haß
29967d14e1 bump omniauth 2012-09-11 00:46:35 +02:00
Jonne Haß
d1987d62c4 bump heroku_san 2012-09-11 00:46:35 +02:00
Jonne Haß
72cfff77b9 bump fixture_builder 2012-09-11 00:46:32 +02:00
Jonne Haß
d5b4a76488 bump foreman 2012-09-10 23:55:52 +02:00
Jonne Haß
d9a9c5352a bump foreigner 2012-09-10 23:55:52 +02:00
Jonne Haß
d33bf10c56 bump selenium-webdriver 2012-09-07 02:35:17 +02:00
Jonne Haß
6780d83770 update to rails 3.2.6 2012-09-06 20:35:18 +02:00
Maxwell Salzberg
4cf27d4248 use a fork of rails admin due to default proc problem override use in rails admin 2012-08-28 00:23:11 -07:00
Maxwell Salzberg
67ee4b6a95 updating typhoeus as it seemed to break inter pod communication 2012-08-27 12:10:55 -07:00
Movilla
6782babafd update gem typhoeus 0.4.2 2012-08-14 17:24:36 +02:00
Steven Hancock
6344d43432 Update Cucumber and Selenium 
Attempting to appease the Travis Bot
 2012-06-18 16:30:13 -07:00
Steven Hancock
a2ccf685ca Update Rails to 3.2.6 2012-06-13 06:19:32 -07:00
Steven Hancock
dc2184724b Use https for git dependencies in the Gemfile 
This is useful if your development and/or production setup is behind
a firewall and you can't use `git://`. Followup to #3358
 2012-06-11 20:24:54 -07:00
wubwubwubcr3w
8e4e5545eb update heroku_san gem 2012-06-05 16:07:27 +02:00
Maxwell Salzberg
0975488964 possible rspec bug? 
updating from 2.9 ~> 2.10 causes
spec/controllers/publics_controller_spec.rb  to break.  Namely, it now
seems that the host_meta, and web finger actions now return successful
http codes, but have blank bodies. Running this code by hand shows that
the response bodies are indeed not  blank, as reported by rspec-rails
2.9.x
 2012-06-04 12:49:24 -07:00
Maxwell Salzberg
d62a2ffc78 according to rspec-rails docs, rspec-rails should be in both test and development groups. Also, remove some implied gems which are sucked in by rspec-rails 2012-06-03 23:45:49 -07:00
Maxwell Salzberg
89406b568e update a bunch of gems that DONT break the build 2012-06-03 23:34:10 -07:00
Maxwell Salzberg
80daa05817 update haml to get rid if weird escape_javascript bug 2012-05-31 23:10:34 -07:00
Maxwell Salzberg
4db207b3dd update to 3.2.5 2012-05-31 22:14:32 -07:00
Maxwell Salzberg
324e460cfb updating rails to 3.2.4 2012-05-31 15:34:26 -07:00
danielgrippi
72d2f619fc added GA back into rack; added mixpanel configuration options 2012-05-30 13:30:28 -07:00
Steven Hancock
c2bc7272fb Escape hashtags in emails 
Custom Redcarpet renderer to escape hashtags (but not legitimate headers)
in emails before Markdown processing. Prevents hashtags from being rendered
as H1 headers. This also leaves open the possibility of parsing hashtags
into clickable links in the future.

fixes #3325
 2012-05-28 21:31:27 -07:00
Maxwell Salzberg
9e80639ee8 remove some unused gems 2012-05-22 11:03:58 -07:00
Florian Staudacher
d815cf5d82 take acts-as-taggable-on gem from git, solve tag case-sensitivity 2012-05-21 17:20:04 +02:00
Maxwell Salzberg
d069865c42 upgrade carrierwave to 0.6.2 2012-05-17 18:51:12 -07:00
Maxwell Salzberg
af1109dcf7 remove a couple more stray files we dont use anymore, and remove rest-client 2012-05-17 18:23:39 -07:00
Florian Staudacher
fd5aedeb01 updated webmock, hopefully fix cucumber 2012-05-18 00:21:04 +02:00
Maxwell Salzberg
471ce309ea kill your darlings; remove diaspora_client with fire 2012-05-17 14:55:53 -07:00
Maxwell Salzberg
69d81951a5 wip 2012-05-17 14:55:22 -07:00
Maxwell Salzberg
b55c2ab956 update heroku san to be an official version 2012-05-17 14:27:51 -07:00
Maxwell Salzberg
b124d3e5a1 Revert "update factory girl" new version does not support 1.8.7 :( 
This reverts commit c52342b7cb.
 2012-05-16 17:43:56 -07:00
Maxwell Salzberg
c52342b7cb update factory girl 2012-05-16 17:17:14 -07:00
danielgrippi
ebbbf74489 add 1.9.3 back into the gemfile. LETS DO THIS [ci skip] 2012-05-15 17:19:28 -07:00
danielgrippi
fb0fa46613 whoops (gemfile) [ci skip] 2012-05-15 17:10:44 -07:00
danielgrippi
15eab43408 explicitly set ruby version in gemfile [ci skip] 2012-05-15 14:40:00 -07:00
danielgrippi
f9bc493581 remove 1.9.3 from heroku env [ci skip] 2012-05-15 14:26:42 -07:00
Maxwell Salzberg
e3ccbb3471 use a forked version of heroku_san until upstream updates; rake now freezes args which was causing probs 
'
 2012-05-15 13:13:23 -07:00
Maxwell Salzberg
89d72f7f1e most recent version of rails has a bug which causes conversations to break: see https://github.com/rails/rails/issues/6312 2012-05-14 21:53:36 -07:00
Maxwell Salzberg
ab2e740ca2 upgrade to Rails 3.2.3 2012-05-14 21:53:16 -07:00
Maxwell Salzberg
4d58940e51 update rails admin [ci skip] 2012-05-14 19:58:07 -07:00
Maxwell Salzberg
379df76118 Update to faraday-middleware, as faraday stack has been deprecated. 
Hopefully this will make REE happy in Travis
 2012-05-14 15:59:07 -07:00
Jonne Haß
f4d996d644 do not break non heroku setups/do not confront them with a useless cryptic error message/do not use bundler 1.2 features but lock 1.1 in the Gemfile 2012-05-13 17:03:33 +02:00
danielgrippi
bcadedc258 specify ruby 1.9.3 in bundler for heroku. this requires a Successfully installed bundler-1.2.0.pre 
1 gem installed
Installing ri documentation for bundler-1.2.0.pre...
Building YARD (yri) index for bundler-1.2.0.pre...
Installing RDoc documentation for bundler-1.2.0.pre... [ci skip]
 2012-05-12 23:49:25 -07:00
Steven Hancock
b16f309aca Upgrade Rails Admin to latest gem 
This gives us a clean fix for the Kaminari vs. Will Paginate
issues and fixes a few other little bugs in Rails Admin.

fixes #3210
 2012-05-11 03:32:05 -07:00
Steven Hancock
4c644c336b Actually only load rails admin in production mode 
This is what I think 28f8db51e7 was supposed to do.

With the initializer in an "unless Rails.env.production?" block
the entire initializer was being ignored in production mode and
loaded in all other environments, but Rails Admin was still
loading regardless of that. 😁

This only loads rails admin in production and excludes it from
all other environments. Also keeps non-admins out of /admin_panel
(without the initializer it was free-for-all) and temp fixes #3210
until a new gem is released.
 2012-05-09 11:46:18 -07:00
Helge Rausch
6b3ba24705 cleaning up in the debugger corner 2012-05-09 08:13:30 +02:00
Helge Rausch
b71f380f5d Merge branch 'master' into debugger 
Conflicts:
	Gemfile.lock
 2012-05-09 07:58:45 +02:00
Maxwell Salzberg
ab981d4339 Merge pull request #3225 from stevenh512/refactor-emails 
Use Markerb for emails
 2012-05-08 10:02:13 -07:00
Maxwell Salzberg
00123c0ab2 update unicorn [ci skip] 2012-05-08 00:05:09 -07:00
Steven Hancock
56db268613 Use markerb for emails 
* Add markerb to the Gemfile
* Update mailer classes to send multipart text+html emails
* Simplify all email templates and convert to Markdown+ERB

This required stripping the CSS and images from the emails. All
Markdown templates are based on the original HTML version except
for the inviter, where it was much easier to work with the text
version (and the i18n contains the whole message anyway).
 2012-05-07 19:41:30 -07:00
Maxwell Salzberg
4b363548a2 update selenium-webdriver for ff12 2012-05-07 18:25:05 -07:00
Helge Rausch
7b3d921ace adding 'debugger' gem to Gemfile 
It fixes a lot of the issues ruby-debug19 has.
 2012-05-05 11:50:25 +02:00
Dennis Collinson
6fcba2dd4b preload javascript vars using gon 2012-05-04 15:17:32 -07:00
danielgrippi
fe49579ff5 remove google-analytics middleware due to the fact that it doesn't support injection of custom variables before _trackPageView is called (this results in custom vars not getting tracked) 
i've submitted an issue to the gem.  hopefully we can put it back in later… for now i've copy and pasted its output into a helper method.
 2012-05-01 18:02:25 -07:00
Kaushik
c7433d3f67 Updated acts-as-taggable-on gem. 2012-04-29 00:23:48 +05:30
danielgrippi
9bdc3c7207 fix heroku_san dep in gemfile [ci skip] 2012-04-26 13:55:29 -07:00
Maxwell Salzberg
fc61df49ce heroku_san only for 1.9 
it uses 1.9 hash syntax which makes 1.8 sad
 2012-04-25 23:06:17 -07:00
Dennis Collinson
e55073fdd4 temp reverting to prove max wrong. 
Revert "killing rails admin to investigate if its what's causing boot and deploy to be so slow"

This reverts commit 78bcb1c321.
 2012-04-24 16:45:25 -07:00
Dennis Collinson
78bcb1c321 killing rails admin to investigate if its what's causing boot and deploy to be so slow 2012-04-24 16:30:31 -07:00
Dennis Collinson
8cc5f86298 reverting some test env munging 
max isn't a princess
learn2git
learn2bash
lulz
 2012-04-19 14:59:33 -07:00
Dennis Collinson
8386179f16 max, you're a princess, WIP 2012-04-19 11:15:59 -07:00
Maxwell Salzberg
672eb1674f use rails admin gem, not the smaller git repo. NOTE: I will delete diaspora/rails_admin_smaller in about a week to let people who pulled it get off of it 2012-04-17 10:20:52 -07:00
Maxwell Salzberg
a558f45f9d use shallow copy of rails_admin [ci skip] 2012-04-15 17:08:05 -07:00
Maxwell Salzberg
ecc1a84b42 rails_admin; i do what i want 2012-04-13 18:08:52 -07:00
Maxwell Salzberg
c4b36a179e Merge pull request #3138 from stevenh512/bootstrap-sass 
bootstrap-sass (w00t)
 2012-04-13 17:44:08 -07:00
Maxwell Salzberg
a1b4cae7b4 move jasmine back for now; dont want to deal with figuring it out 2012-04-13 10:13:48 -07:00
Maxwell Salzberg
d6f317af3d move debugger to proper group 2012-04-11 18:18:54 -07:00
danielgrippi
ffbc3aa241 update some gems [ci skip] 2012-04-11 12:48:50 -07:00
Steven Hancock
021cc99492 bootstrap-sass 
Upgrade our current Bootstrap 1 and 2 dependencies to use Bootstrap 2.0.2
from the bootstrap-sass gem.

I had to modify layouts/application to get the stream page to render properly,
looks like a slight conflict between Bootstrap and Blueprint grid systems, with
.span-24 instead of .row I was seeing the whole right bar dropped to the bottom
of the page below the left bar.

I also modified two other templates since Bootstrap 2.0.2 includes a "badge"
class that was making our navbar badges look funny. :)
 2012-04-11 06:16:01 -07:00
Maxwell Salzberg
37c3c3a860 update jasmine and move it to the test/development group 
move jasmine to development and test env, update it
 2012-04-10 19:34:13 -07:00
Steven Hancock
39b0c2de11 Only load Asset Sync when S3 is configured 
I consider this a hack, it needs review so I won't push it straight
to the main repo. I tried putting the same code in an initializer but
that appears to be too late to properly initialize the asset_sync
engine.

See diaspora/diaspora#3102
 2012-04-04 04:19:37 -07:00
Maxwell Salzberg
8ef49586c3 update foreman 2012-04-03 23:02:16 -07:00
Maxwell Salzberg
7b3e2d7680 update spork, rspec, cucumber, and selenium webdriver 2012-04-03 22:54:15 -07:00
Maxwell Salzberg
cf3776fde2 remove webmock from cucumber to try and fix the travis timeout errors :( 2012-04-03 22:16:51 -07:00
Maxwell Salzberg
b33ee8c688 add asset sync gem 2012-04-02 18:32:35 -07:00
Steven Hancock
4b41f8bf41 Add a comment about JS runtimes to Gemfile 
As mentioned in #3078 there may be some confusion about the asset
pipeline's dependency on an ExecJS compatible javascript runtime.

On OSX it should just work, Linux needs Node.js (recommended) or
TheRubyRacer.

This adds a comment to the :assets group to give people more
information.
 2012-04-02 01:26:18 -07:00
Maxwell Salzberg
adf85e1ec6 adding a bit to tubbo's spork branch 2012-03-31 01:22:46 -04:00
Maxwell Salzberg
402694e516 fixing cukes 2012-03-28 14:47:28 -07:00
Steven Hancock
b24a4a7213 Correctly enable the asset pipeline 
* Add the Rails 3.1+ Bundler.require statement to config/application.rb
  (properly enabling the :assets group)
* Move handlebars_assets gem into the :assets group where it belongs. :)
* Downgrade sass-rails to 3.1.4 since enabling the :assets group exposed
  a known bug in sass-rails ~> 3.1.5 [rails/sass-rails#78].
 2012-03-27 18:08:27 -07:00
Steven Hancock
95d5c9ca68 Fix Jasmine tests - first pass 
193 specs | 5 failing

The 5 failing specs appear (according to Firebug) to be due to missing
fixtures and/or missing routes in the Jasmine environment. Fixing these
last 5 failures is a task probably best left to a more experienced
Javascript/Jasmine developer.

This commit also moves validation.js and clear-form.js into
app/assets/javascripts and precompiles validation.js
 2012-03-27 18:08:27 -07:00
Steven Hancock
1aa0b15c8c Move Javascript to the asset pipeline 
* Move all Diaspora-specific javascripts to app/assets/javascripts
* Move all vendored javascripts to vendor/assets/javascripts
* Add the appropriate Sprockets require directives to make sure
  everything gets included in the right order
* Remove Jammit dependencies
* Fix all templates that were using Jammit's include_javascripts helper
* Add handlebars_assets gem for compiling Handlebars templates
* Move all Handlebars templates to app/assets/templates and rename
  from .handlebars to .jst.hbs (this is to keep them in the same
  global JST namespace that they were in under Jammit)
* Add public/assets to .gitignore since these files can and should
  be re-generated by Heroku or Capistrano during each deploy
* Fix a few Handlebars templates that were looking for images in the
  wrong location (I'm sure there are others, but it's late)
* Configure application.rb to precompile all javascript and css assets
  that were compiled by Jammit in the Rails 3.0 code
 2012-03-27 18:07:44 -07:00
danielgrippi
06936bcdce stylesheets are basically now being served from sprockets 2012-03-27 18:07:20 -07:00
Maxwell Salzberg
843c0d9c1a Merge pull request #3068 from diaspora/posting 
Merging the trumpeter
 2012-03-27 16:11:14 -07:00
Maxwell Salzberg
9d26643288 update heroku_san 2012-03-27 15:44:12 -07:00
Dennis Collinson
37bf5c5aee REMOTIPART WIP 2012-03-27 14:52:51 -07:00
Justin Thomas
22ac1d96a6 Add Resque.after_fork to correct problem with database connections and remove resque-ensure-connected 2012-03-25 14:39:42 -07:00
Maxwell Salzberg
835f808e5a more progress 2012-03-21 13:50:24 -07:00
Maxwell Salzberg
35a6f4f265 basic 3.1 upgrade... a few things are still broken. help me out and run the tests and fix them <3 2012-03-21 13:50:24 -07:00
Maxwell Salzberg
7bac633987 invite_link functionailty mostly works 2012-03-16 17:56:35 -07:00
Florian Staudacher
f1a0055a80 bump ruby-oembed version 2012-03-15 18:22:34 +01:00
Maxwell Salzberg
70cc9c5c96 travis does not seem to have bundler 1.1.1 yet 2012-03-14 18:02:45 -07:00
Maxwell Salzberg
ff03a0ca7f update bundler; again 2012-03-14 18:00:18 -07:00
Maxwell Salzberg
52a79d71b4 update em-sync so travis is happy 2012-03-14 17:09:13 -07:00
Maxwell Salzberg
319812fdcb downgrade bundler :( 2012-03-13 19:34:52 -07:00
Steven Hancock
f2922c943c Cross-Origin Resource Sharing 
Remove partial support for CORS on webfinger routes and replace
it with the Rack::Cors middleware. This provides more complete
CORS support and works around a caching issue with nginx on
Heroku and potentially other reverse proxies.

CORS headers are only added if the incoming request includes
an "Origin" header, which seems to be correct according to
the CORS spec.

closes #2216
 2012-03-10 23:49:56 -08:00
Maxwell Salzberg
5a34ef8592 update travis.yml for bundler 1.1 2012-03-09 18:33:47 -08:00
Maxwell Salzberg
ed62910286 this is dumb, but use RC bundler so travis does not barf 2012-03-09 18:19:16 -08:00
Maxwell Salzberg
332aede418 roll back heroku san 2012-03-09 18:03:40 -08:00
Maxwell Salzberg
123841147b update some gems, including bundler :) 2012-03-09 17:43:09 -08:00
danielgrippi
39d31d5888 Merge branch 'master' of github.com:diaspora/diaspora into profiles 2012-02-24 14:36:18 -08:00
Jonne Haß
0430d940f1 git urls are still better than http ones :P, close #2915 2012-02-22 12:29:15 +01:00
danielgrippi
ff875a5b3c DG MS; determine what template to use on the client from the server 2012-02-21 15:23:27 -08:00
Dennis Collinson
3991903b56 MS DG DC Participate stream that has things bubble to the top 2012-02-03 17:23:57 -08:00
danielgrippi
c301f80ca9 update unicorn [ci skip] 2012-02-03 15:12:44 -08:00
Maxwell Salzberg
48941fbae1 DG MS; add rack-rewrite to handle forwarding old urls [ci skip] 2012-01-26 16:32:46 -08:00
danielgrippi
da9e57b2c9 added oink in dev mode 2012-01-26 13:18:58 -08:00
Maxwell Salzberg
821c164809 update resque-ensure-connected 2012-01-24 16:48:28 -08:00
Maxwell Salzberg
e0186138f2 add rpm_contrib for instrumenting resque jobs 2012-01-24 14:58:36 -08:00
Maxwell Salzberg
ba010833c7 move newrelic and airbrake out of any group, as it is not loading at all 
if it is in any bundler group #confused
 2012-01-24 14:58:36 -08:00
danielgrippi
52438ffaf2 add unicorn back in. only use one worker process for now. also, move chrome_frame middleware into the correct load path in lib. [ci skip] 2012-01-24 14:56:55 -08:00
Maxwell Salzberg
41e6377ba5 move airbrake and newrelic to reporting bundler group 2012-01-24 11:55:59 -08:00
Maxwell Salzberg
c073cb078f update messagebus gem 2012-01-23 16:29:19 -08:00