Jonne Haß
|
e25ebe2098
|
lets see if this fixes anything about the randomly failing comments cuke, still no clue about the recent timeouts
|
2012-11-22 21:14:26 +01:00 |
|
Jonne Haß
|
76bd782962
|
bump recommended ruby version to 1.9.3-p327 since it fixes a potential DoS attack
|
2012-11-22 20:17:00 +01:00 |
|
Jonne Haß
|
e38345bb1c
|
bump debugger-ruby_core_source
|
2012-11-22 20:11:11 +01:00 |
|
Jonne Haß
|
bbad82c5d2
|
this should restore compatibillity with ruby below 1.9.3-p125, not sure if we should hotfix this, if anyone wants to...
|
2012-11-22 20:04:19 +01:00 |
|
Jonne Haß
|
6ccdb40f6f
|
update changelog [ci skip]
|
2012-11-22 10:37:30 +01:00 |
|
Jonne Haß
|
c59bb35087
|
Merge pull request #3754 from marpo60/housekeeping
Housekeeping2
|
2012-11-22 01:06:30 -08:00 |
|
Jonne Haß
|
5f6e03cfe5
|
Merge pull request #3714 from marpo60/refactor
Housekeeping
|
2012-11-22 01:06:05 -08:00 |
|
Fabián Rodríguez
|
be2db47f02
|
remove unnecesary stuff from specs
|
2012-11-21 18:26:17 -02:00 |
|
Fabián Rodríguez
|
99abc22403
|
remove unused methods
|
2012-11-21 18:26:17 -02:00 |
|
Fabián Rodríguez
|
232539cdf9
|
remove unused helpers
|
2012-11-21 18:26:17 -02: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ß
|
60aa1ffe2e
|
post release version bump [ci skip]
|
2012-11-20 22:02:54 +01:00 |
|
Florian Staudacher
|
442008657e
|
changelog update before release
|
2012-11-20 19:12:42 +01:00 |
|
Florian Staudacher
|
742d320c0e
|
Merge pull request #3739 from davecocoa/feature/3534-add-x-frame-header
add x-frame headers
|
2012-11-20 09:59:08 -08:00 |
|
Jonne Haß
|
1af49a0477
|
updated 78 locale files [ci skip]
|
2012-11-20 18:54:27 +01:00 |
|
Sean Tilley
|
a5050273ca
|
Merge pull request #3727 from jaywink/feature/2321-fix-message-notifications
Fix notifications for private messages between local users, fixes #2321
|
2012-11-19 13:48:17 -08:00 |
|
Jonne Haß
|
e9bccb8afe
|
get rid of string concat of translatable strings in getting started
|
2012-11-18 17:24:43 +01:00 |
|
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 |
|
Jason Robinson
|
c437636131
|
Fix message_spec test and add tests for private message notification unread count. Update changelog
|
2012-11-12 22:00:13 +02:00 |
|
Jason Robinson
|
6cf6f1dd7d
|
Fix notifications for private messages between local users, fixes #2321
|
2012-11-11 23:35:19 +02: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 |
|