Commit graph

933 commits

Author SHA1 Message Date
Florian Staudacher
c7b4b77ce8 Merge pull request #5209 from jhass/federation_improvements
Federation improvements
2014-09-27 16:18:37 +02:00
Jonne Haß
430d5bd2e9 bump configurate 2014-09-26 22:14:09 +02:00
Florian Staudacher
9a16560d8d * rename profile header view to make name more accurate
* include 'js-routes' for rails routes in javascript
  (TODO: config options?)
* add handlebars helper for rails routes
2014-09-15 01:37:23 +02:00
Jonne Haß
f964d3793b bump fog-softlayer 2014-09-12 23:55:21 +02:00
Jonne Haß
c555cd29dd bump rspec-core 2014-09-12 23:55:21 +02:00
Jonne Haß
52f3e8d01d bump test_after_commit 2014-09-12 23:55:21 +02:00
Jonne Haß
f3d980ba5d bump sidekiq 2014-09-12 23:55:21 +02:00
Jonne Haß
743fc70999 bump selenium-webdriver 2014-09-12 23:55:21 +02:00
Jonne Haß
ba70f2293e bump mini_magick 2014-09-12 21:57:00 +02:00
Jonne Haß
a6ad721b8e bump handlebars_assets 2014-09-12 21:52:43 +02:00
Jonne Haß
9f125058f7 bump rails 2014-09-12 21:49:09 +02:00
Jonne Haß
c225bb17ce add pry and pry-debundle to the Gemfile
If you now install pry-byebug and pry-stackexplorer,
you'll get a nice debugger
2014-09-06 23:13:53 +02:00
Jonne Haß
dac5bbbd96 bump fog-brightbox 2014-09-06 00:19:53 +02:00
Jonne Haß
0af37d5d0b bump celluloid 2014-09-06 00:18:20 +02:00
Jonne Haß
fb058609e3 bump test_after_commit 2014-09-06 00:17:36 +02:00
Jonne Haß
3a7b0db67b bump rails-i18n 2014-09-05 23:52:17 +02:00
Jonne Haß
ef501f755c bump jquery-rails 2014-09-05 23:51:33 +02:00
Jonne Haß
9870069c56 bump rspec 2014-09-05 23:46:56 +02:00
Jonne Haß
f3ad3c93a3 Merge pull request #5190 from jhass/bump_handlebars
bump handlebars_assets

Conflicts:
	Gemfile
2014-09-01 13:53:16 +02:00
Jonne Haß
7c6776c280 bump jquery-rails 2014-09-01 12:15:01 +02:00
Jonne Haß
5da86def06 bump handlebars_assets 2014-09-01 11:44:34 +02:00
Jonne Haß
1a5bcec394 bump omniauth 2014-09-01 11:11:06 +02:00
Jonne Haß
9d9472cc0b bump fog 2014-09-01 11:08:24 +02:00
Jonne Haß
ff0d158b6a bump coffee-script-source 2014-09-01 11:07:58 +02:00
Jonne Haß
7508300193 bump sidekiq 2014-09-01 11:03:53 +02:00
Jonne Haß
ef1cbda8c9 bump acts-as-taggable-on 2014-09-01 11:02:48 +02:00
Jonne Haß
2b2f4e44e5 bump sidekiq 2014-08-31 00:11:23 +02:00
Jonne Haß
462198799b Dynamic asset paths everywhere
* Use asset pipeline aware helpers in CSS files
* Add js_image_paths to push image asset names to the client side JS
2014-08-28 21:04:29 +02:00
Jonne Haß
0675337dab bump fog-core 2014-08-27 18:34:00 +02:00
Jonne Haß
bb51752d33 bump font-awesome-rails 2014-08-27 18:33:14 +02:00
Jonne Haß
6fef1cf990 bump gon 2014-08-27 18:32:50 +02:00
khall
087dbd4acf Bumping rspec to 3.0.2 2014-08-26 17:12:21 -07:00
khall
c42916df27 Two tests failing after rspec 2.99 => 3.0.0 2014-08-26 17:10:26 -07:00
khall
027bb9fcb0 Rspec version bump to 2.99 2014-08-26 17:00:21 -07:00
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