Commit graph

16563 commits

Author SHA1 Message Date
Lukas Matt
9a96836594 Load bower dependencies on jsxc initialization
We moved the libraries from jsxc.deb.js

Signed-off-by: Lukas Matt <lukas@zauberstuhl.de>
2015-07-30 22:40:19 +02:00
Jonne Haß
248fa9213b Merge pull request #6274 from svbergerem/mobile-getting-started-input-field
Add Bootstrap classes to mobile getting started input fields
2015-07-30 15:39:36 +02:00
Steffen van Bergerem
bc89f73179 Add Bootstrap classes to mobile getting started input fields 2015-07-30 14:44:14 +02:00
Jonne Haß
2a06d78d12 Merge branch 'stable' into develop 2015-07-30 12:04:50 +02:00
theworldbright
23bea8e3d3 Raise rubocop abc size metric from 15 to 20
closes #6271
2015-07-30 12:04:46 +02:00
Jonne Haß
4442616b0d Merge branch 'stable' into develop 2015-07-30 12:01:35 +02:00
Steffen van Bergerem
536d1fe0e7 Move nsfw-shield to status-message
closes #6270
2015-07-30 12:00:48 +02:00
Jonne Haß
cf13672148 Stabilize mobile/not_safe_for_work.feature 2015-07-30 11:39:40 +02:00
Jonne Haß
18413fe3c9 bump bootstrap-sass 2015-07-30 05:10:02 +02:00
Jonne Haß
1c62bab271 bump pg 2015-07-30 05:08:31 +02:00
Dennis Schubert
2a55578cf2 Merge branch 'stable' into develop 2015-07-30 05:07:47 +02:00
Jonne Haß
ed463750b1 bump font-awesome-rails 2015-07-30 05:03:08 +02:00
Jonne Haß
f506258324 bump timecop 2015-07-30 05:03:08 +02:00
Jonne Haß
3f39555223 bump gon 2015-07-30 05:03:08 +02:00
Jonne Haß
2280edaa85 bump devise_lastseenable 2015-07-30 05:03:08 +02:00
Jonne Haß
7f0d178092 bump selenium-webdriver 2015-07-30 05:02:54 +02:00
Jonne Haß
b6a83415b0 bump sass 2015-07-30 04:52:55 +02:00
Jonne Haß
3be5acef8c bump request_store 2015-07-30 04:51:59 +02:00
Jonne Haß
8f0ca722c8 bump omniauth-oauth2 2015-07-30 04:51:59 +02:00
Jonne Haß
a713cc6066 bump nio4r 2015-07-30 04:51:59 +02:00
Jonne Haß
452fcab554 bump raindrops 2015-07-30 04:51:59 +02:00
Jonne Haß
d17c1e3220 bump jwt 2015-07-30 04:51:58 +02:00
Jonne Haß
abb42ec2a1 bump guard 2015-07-30 04:51:58 +02:00
Jonne Haß
6042247766 bump sidekiq 2015-07-30 04:51:58 +02:00
Jonne Haß
2ceef872bd bump rubocop 2015-07-30 04:51:58 +02:00
Jonne Haß
f64f5ac72e bump rspec-rails 2015-07-30 04:49:58 +02:00
Jonne Haß
5fc465155b bump rails-assets-perfect-scrollbar 2015-07-30 04:49:58 +02:00
Jonne Haß
3506e92594 bump fog 2015-07-30 04:45:53 +02:00
Jonne Haß
41ef70202e bump faraday_middleware 2015-07-30 04:45:53 +02:00
Jonne Haß
dd1349f69b bump autoprefixer-rails 2015-07-30 04:45:53 +02:00
Jonne Haß
bcd3cf1c77 bump activerecord-import 2015-07-30 04:44:19 +02:00
Steffen van Bergerem
bdfbbdc3eb Merge branch 'stable' into develop 2015-07-30 04:20:26 +02:00
Mohammed Rashid
dd42635442 Issue #6235: Add hoverable class inside the a tag
closes #6267
2015-07-30 04:18:06 +02:00
Steffen van Bergerem
e402bbdd3d Merge pull request #6245 from AugierLe42e/fix-nsfw-author
Fix nsfw author
2015-07-30 00:28:15 +02:00
augier
9a23c92f8e Show author of NSFW post 2015-07-29 21:13:41 +02:00
Steffen van Bergerem
922d700d92 Merge pull request #6233 from Flaburgan/improve-mobile-drawer-transition
Rework mobile drawer transition
2015-07-29 17:34:47 +02:00
fla
4aef8de571 Improve mobile drawer 2015-07-29 14:22:19 +02:00
Dennis Schubert
23c83b9447 Merge branch 'stable' into develop 2015-07-29 12:10:36 +02:00
Steffen van Bergerem
d8505b2ae0 Fix conversations view with no contacts
closes #6266
2015-07-29 12:08:35 +02:00
Jonne Haß
4abc0c5988 Merge branch 'stable' into develop 2015-07-29 10:06:04 +02:00
Steffen van Bergerem
67653cf465 Update backbone.js
closes #6262
2015-07-29 10:04:18 +02:00
Jonne Haß
4094fb260d Merge pull request #6263 from svbergerem/remove-remaining-span
Remove remaining span-* and improve mobile photos page
2015-07-29 01:35:05 +02:00
Jonne Haß
99f7e2fc52 Merge pull request #6261 from svbergerem/remove-mbp-helper
Remove mbp helper and refactor mobile publisher js
2015-07-29 00:26:20 +02:00
Steffen van Bergerem
816092c477 Remove remaining span-* and improve mobile photos page 2015-07-28 23:36:47 +02:00
Steffen van Bergerem
a2349052f4 Use autosize for mobile publisher 2015-07-28 20:15:11 +02:00
Steffen van Bergerem
1c11b374bf Remove mbp-helper 2015-07-28 19:50:17 +02:00
Jonne Haß
602ad2d209 Merge branch 'stable' into develop 2015-07-28 18:35:18 +02:00
Mikica Ivosevic
c8b01cb62c application_controller.rb
refactor method after_sign_out_path_for

closes #6258
2015-07-28 18:35:13 +02:00
Jonne Haß
d62c4387f3 Merge branch 'stable' into develop 2015-07-28 18:24:19 +02:00
cmrd Senya
fa411c73a7 Remove unused minified js files mbp-respond.min.js and mbp-modernizr-custom.js (#5939).
closes #6257
2015-07-28 18:24:10 +02:00