Commit graph

16473 commits

Author SHA1 Message Date
augier
f917757b5b Use entypo icons on mobile posts 2015-08-06 15:56:58 +02:00
Jonne Haß
ed4b2a2c4b Merge branch 'stable' into develop 2015-08-03 03:12:37 +02:00
Jonne Haß
7c611ca509 rubocop: skip db/schema.rb [ci skip] 2015-08-03 03:11:43 +02:00
Steffen van Bergerem
b9db891fef Merge pull request #6283 from AugierLe42e/clean-images
Suppress useless images
2015-08-02 23:26:46 +02:00
augier
5087f47e44 Suppress useless images 2015-08-02 21:42:09 +02:00
Jonne Haß
b7864a9976 Merge branch 'stable' into develop 2015-08-02 16:58:07 +02:00
theworldbright
cae5f94af0 Refactor status messages controller
closes #6280
2015-08-02 16:58:01 +02:00
Dennis Schubert
db9c39b6eb Merge pull request #6277 from svbergerem/use-css-spinner
Use css spinner instead of gif
2015-08-01 21:30:14 +02:00
Jonne Haß
22a8997c47 Merge branch 'stable' into develop 2015-08-01 20:05:29 +02:00
theworldbright
b3242500b0 Disable ambiguous regex for step definitions
Signed-off-by: theworldbright <kent@kentshikama.com>

closes #6272
2015-08-01 20:05:24 +02:00
Steffen van Bergerem
8e99a240c9 Use css spinner instead of gif 2015-08-01 13:00:48 +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