Commit graph

12689 commits

Author SHA1 Message Date
David McMullin
9678a1d4b2 add x-frame headers 2012-11-18 09:55:10 +00:00
Florian Staudacher
9723c4abc9 don't let the install script run as root user 2012-11-16 15:34:44 +01:00
Florian Staudacher
5066db9941 Merge pull request #3733 from marpo60/3682-fix-padlock-images
3682 fix padlock images
2012-11-15 14:07:53 -08:00
Fabián Rodríguez
f3134206e1 update changelog 2012-11-15 18:18:47 -02:00
Fabián Rodríguez
f590abb343 fix 3682, use correct image path for padlocks 2012-11-15 18:17:15 -02:00
Dennis Schubert
ae53254259 Really remove Devises timeoutable...
... and force it to really remember the session by a hidden field.
2012-11-14 20:32:15 +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ß
7517c29ed0 Merge pull request #3726 from movilla/css_people_inv
fix css error with intivation people block in search results
2012-11-11 06:51:33 -08:00
movilla
764aa579cd fix css error with intivation people block in search results 2012-11-11 15:38:03 +01:00
Jonne Haß
63f2d335a4 Merge branch 'notifications_count' of git://github.com/movilla/diaspora into develop 2012-11-11 15:00:46 +01:00
movilla
554fe40235 Web mobile notificacions count dont change to unread-read when click in link post 2012-11-11 14:45:07 +01:00
Jonne Haß
6056572b99 update changelog for gem updates [ci skip] 2012-11-11 14:32:39 +01:00
Jonne Haß
e7be5d2f80 Merge pull request #3612 from diaspora/update_gems
Update gems
2012-11-11 04:48:04 -08: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
movilla
10aea3ebce add test :unread => true 2012-11-10 23:23:08 +01:00
Jonne Haß
8b89a5ca00 Merge pull request #3679 from Raven24/grimreaper-develop
Remove non-portable bashisms from most of the scripts. ++
2012-11-10 09:06:23 -08:00