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

707 commits

Author SHA1 Message Date
Jonne Haß
3430e1f90b bump sass 2013-03-21 21:25:18 +01:00
Jonne Haß
6813434e91 bump excon 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ß
79d4751d73 bump ffi 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
Jonne Haß
d75ddbccab bump mutli_json 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ß
9fdd1d4119 bump crack 2013-02-17 12:48:29 +01:00
Jonne Haß
1749cfd628 bump kgio 2013-02-17 12:48:29 +01:00
Jonne Haß
9a90a799e6 bump twitter 2013-02-17 12:48:28 +01:00
Jonne Haß
5cac4ce5d7 bump gherkin 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ß
3023fbdee3 bump ffi 2013-01-17 02:00:20 +01:00
Jonne Haß
fe7a49226c bump asset_sync 2013-01-17 02:00:20 +01:00
Jonne Haß
32c5f25bd0 bump rack 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
Jonne Haß
4150a89eb8 fix Gemfile.lock 2012-12-07 22:41:06 +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ß
e38345bb1c bump debugger-ruby_core_source 2012-11-22 20:11:11 +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
Jonne Haß
f1aeecc00b force typhoeus (and thus curl) to use diaspora.yml's CA bundle 2012-11-21 17:28:39 +01: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ß
8e2d509f8d bump coffee-script-source 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ß
74ecdeb35d bump formatador 2012-11-11 13:29:40 +01:00
Jonne Haß
04aee6a6fe bump tzinfo 2012-11-11 13:29:39 +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ß
229c514251 bump childprocess 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ß
38a6768ad5 bump gherkin 2012-11-11 13:23:24 +01:00
Jonne Haß
fdc28ccdc1 bump treetop 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ß
574a96028a bump redis 2012-11-11 13:23:23 +01:00
Jonne Haß
a906835c0e bump raindrops 2012-11-11 13:23:23 +01:00
Jonne Haß
18e8b076c7 bump guard 2012-11-11 13:23:23 +01:00
Jonne Haß
89310637e5 bump excon 2012-11-11 13:23:23 +01:00
Jonne Haß
5fa13fbb25 bump rack-test 2012-11-11 13:23:22 +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ß
f30ce87d3e bump sass 2012-11-11 13:23:21 +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