Commit graph

899 commits

Author SHA1 Message Date
Jonne Haß
541d5580e0 Fix loading issues in rails_admin
Properly declare Admin module and explicitly list models to be
display in rails_admin
2014-08-26 02:57:47 +02:00
Jonne Haß
00de34ba38 Merge pull request #5129 from jaideng123/5106-scrolling_in_notifications
Increased the number of notifications shown in drop down bar to 15

Conflicts:
	Gemfile.lock
2014-08-26 02:06:55 +02:00
jaideng123
b70f306ff5 Integrated Perfect Scrollbar into notifications dropdown 2014-08-25 15:33:25 -05:00
Jonne Haß
ef214d7681 bump http_accept_language 2014-08-25 22:06:28 +02:00
Jonne Haß
5ffbafa56a bump rack-google-analytics 2014-08-25 21:49:46 +02:00
Jonne Haß
37f062c07f bump sinon-rails 2014-08-25 21:39:52 +02:00
Jonne Haß
b34fe4199b bump simple_captcha2 2014-08-25 19:20:50 +02:00
Jonne Haß
8de29bc28d bump faraday and faraday_middleware. closes #4950 2014-08-25 19:16:55 +02:00
Jonne Haß
ac998407b5 bump jasmine-core 2014-08-25 19:16:55 +02:00
Jonne Haß
328d53230d bump connection_pool 2014-08-25 19:16:54 +02:00
Jonne Haß
589794a438 bump omniauth-oauth2 2014-08-25 19:16:54 +02:00
Jonne Haß
66521a36f6 bump zip-zip 2014-08-25 19:16:54 +02:00
Jonne Haß
67331a7371 bump rails_autolink 2014-08-25 19:16:54 +02:00
Jonne Haß
4da21d02db bump will_paginate 2014-08-25 19:16:54 +02:00
Jonne Haß
4415d91aa6 bump uglifier 2014-08-25 19:16:51 +02:00
Jonne Haß
b3f18e1961 bump typhoeus 2014-08-25 19:16:22 +02:00
Jonne Haß
5fa8d7c44c bump test_after_commit 2014-08-25 19:15:30 +02:00
Jonne Haß
a974f281e8 bump ruby-oembed 2014-08-25 19:15:30 +02:00
Jonne Haß
02bb317df0 bump rspec-instafail 2014-08-25 19:15:29 +02:00
Jonne Haß
3fc8be03af bump rb-inotify 2014-08-25 19:15:29 +02:00
Jonne Haß
6c0ee4c78d bump rails_admin 2014-08-25 19:15:29 +02:00
Jonne Haß
9cd0100090 bump rack-piwik 2014-08-25 19:15:29 +02:00
Jonne Haß
047a05f74c bump mini_magick 2014-08-25 19:15:29 +02:00
Jonne Haß
59d1076e31 bump guard-rspec 2014-08-25 19:15:29 +02:00
Jonne Haß
ebf43c1956 bump gon 2014-08-25 19:15:29 +02:00
Jonne Haß
b0bf570cd9 bump fog 2014-08-25 19:15:29 +02:00
Jonne Haß
25f117f8d8 bump devise 2014-08-25 19:15:29 +02:00
Jonne Haß
168aa26306 bump asset_sync 2014-08-25 19:15:27 +02:00
Jonne Haß
d745d621f8 bump acts-as-taggable-on 2014-08-25 19:14:50 +02:00
Jonne Haß
42b08e8ab8 Update to Rails 4.1 2014-08-25 17:37:02 +02:00
Jonne Haß
e0c836c03d bump rails 2014-08-24 16:03:50 +02:00
Jonne Haß
2361b8e00f bump capybara and phantomjs 2014-08-24 01:57:49 +02:00
Jonne Haß
01c4fa18d3 fix and stablize some cukes 2014-08-24 01:02:35 +02:00
Jonne Haß
68affd5dd1 bump entypo-rails 2014-08-24 01:02:35 +02:00
Jonne Haß
3fadba0430 update rails and compass-rails after rebase 2014-08-23 16:47:57 +02:00
Jonne Haß
5068be90e8 reduce cuke failures
* Bump sass-rails (without effect)
* Bump mobile-fu (without effect)
* Cosmetically fix two cukes
* Refactor Taggable#tag_strings
* Rename default.css to default.css.scss (without effect)
* Fix receiving a conversation
* Pass aspect_ids instead of a relation to User#aspects_from_ids
2014-08-23 16:47:57 +02:00
Jonne Haß
38e5ae2b73 bump rails_admin 2014-08-23 16:47:57 +02:00
Jonne Haß
8d1b611f88 bump jasmine-jquery-rails 2014-08-23 16:47:57 +02:00
Jonne Haß
b671509184 bump jasmine 2014-08-23 16:47:57 +02:00
Jonne Haß
e9ab6dc1e6 bump rack-ssl 2014-08-23 16:47:57 +02:00
Jonne Haß
c856fb459a bump rails-i18n 2014-08-23 16:47:57 +02:00
Jonne Haß
c506276c73 bump activerecord-import 2014-08-23 16:47:57 +02:00
Jonne Haß
61c72b44e9 update rails to 4.0.5 2014-08-23 16:47:56 +02:00
Florian Staudacher
d4aca571ac add jasmine-jquery gem and use it, port some more specs 2014-08-23 16:46:08 +02:00
Jonne Haß
7fd2294111 switch to simple_captcha2 2014-08-23 16:38:50 +02:00
Jonne Haß
55f40a2b65 update to rails 4 2014-08-23 16:33:53 +02:00
Jonne Haß
58927d1a9d bump sidekiq to 2.17.7 2014-08-23 16:03:17 +02:00
Jonne Haß
ec877e3784 Merge pull request #4978 from jhass/bump_acts_as_taggable_on
Bump acts-as-taggable-on
2014-08-18 12:20:19 +02:00
Jonne Haß
e4246b6fdd Bump Rails to 3.2.19
Rails 3.2.19 fixes a possible SQL-Injection when using the PostgreSQL
adapter. However this is only exploitable when using the "bit" type,
which we don't.
2014-07-02 22:17:21 +02:00
Jonne Haß
ccae3a1c64 lock nokogiri to 1.6.1, closes #4996 2014-06-18 11:44:46 +02:00