Commit graph

17632 commits

Author SHA1 Message Date
Dennis Schubert
529ebe95e1
Bump font-awesome-rails 2016-05-12 12:54:27 +02:00
Dennis Schubert
0483dde36a
Bump domain_name 2016-05-12 12:54:27 +02:00
Dennis Schubert
6d59284968
Bump cucumber 2016-05-12 12:54:27 +02:00
Dennis Schubert
d505b669f1
Bump coderay 2016-05-12 12:54:27 +02:00
Dennis Schubert
91ce3bea24
Bump byebug 2016-05-12 12:54:27 +02:00
Dennis Schubert
d772848338
Bump unicorn 2016-05-12 12:53:39 +02:00
Dennis Schubert
a5533387be
Bump uglifier 2016-05-12 12:40:39 +02:00
Dennis Schubert
ca548ed034
Bump typhoeus 2016-05-12 12:40:39 +02:00
Dennis Schubert
d16f9ef4b4
Bump twitter-text 2016-05-12 12:40:39 +02:00
Dennis Schubert
ac5caadd3d
Bump timecop 2016-05-12 12:40:39 +02:00
Dennis Schubert
241f0d977a
Bump test_after_commit 2016-05-12 12:34:52 +02:00
Dennis Schubert
43d0946769
Bump spring 2016-05-12 12:32:39 +02:00
Dennis Schubert
81779a86e5
Bump rubyzip 2016-05-12 12:30:42 +02:00
Dennis Schubert
ee98a96594
Bump ruby-oembed 2016-05-12 12:28:33 +02:00
Dennis Schubert
04f2f0741a
Bump rspec-instafail 2016-05-12 12:26:57 +02:00
Dennis Schubert
87644862de
Bump responders 2016-05-12 12:26:57 +02:00
Dennis Schubert
bd705bd01f
Bump rails-assets-perfect-scrollbar 2016-05-12 12:26:57 +02:00
Dennis Schubert
a73a9fefa6
Bump rails-assets-highlightjs 2016-05-12 12:24:02 +02:00
Dennis Schubert
8d214e8952
Bump mysql2 2016-05-12 12:21:20 +02:00
Dennis Schubert
b8e3c6cfb1
Bump mini_magick 2016-05-12 12:19:10 +02:00
Dennis Schubert
bb88156592
Bump json-schema 2016-05-12 12:18:29 +02:00
Dennis Schubert
93afbb924c
Bump js-routes 2016-05-12 12:15:42 +02:00
Dennis Schubert
dbe598e194
Bump jquery-rails 2016-05-12 12:15:42 +02:00
Dennis Schubert
6411449567
Bump fog and adapters 2016-05-12 12:15:01 +02:00
Dennis Schubert
7c256018a7
Bump factory_girl_rails 2016-05-12 12:13:32 +02:00
Dennis Schubert
7e9da88601
Bump devise-token_authenticatable 2016-05-12 12:11:44 +02:00
Dennis Schubert
2b45ba67c6
Bump database_cleaner 2016-05-12 12:09:24 +02:00
Dennis Schubert
4c06540f22
Bump carrierwave 2016-05-12 12:09:24 +02:00
Dennis Schubert
b72fd03a31
Bump autoprefixer-rails 2016-05-12 12:06:36 +02:00
Dennis Schubert
02ea344636
Bump activerecord-import 2016-05-12 12:04:43 +02:00
Dennis Schubert
f725349f18
Bump active_model_serializers 2016-05-12 12:04:43 +02:00
Dennis Schubert
f95ccdf979
Bump rails 2016-05-12 12:04:43 +02:00
Dennis Schubert
db1dfbf698 Merge pull request #6829 from Zauberstuhl/bump_diaspora-prosody-config
bump diaspora-prosody-config to v0.0.5
2016-05-12 03:52:02 +02:00
Lukas Matt
1c5c4f10af
bump diaspora-prosody-config to v0.0.5
Signed-off-by: Lukas Matt <lukas@zauberstuhl.de>
2016-05-12 00:59:07 +02:00
Dennis Schubert
1fc60a9f82 Merge branch 'stable' into develop 2016-05-09 01:00:42 +02:00
Dennis Schubert
6bc1419cbe Prepere 0.5.10.0 cycle 2016-05-09 00:59:58 +02:00
Dennis Schubert
53808847a2 Merge branch 'stable' into develop 2016-05-07 18:52:34 +02:00
Ralin Chimev
1773e3e35d Do not change notification timestamp when making it read or unread.
Marking a notification as unread resets the timeago stamp causing
the times to look wrong. It can be reproduced by marking an old
notification as unread. Using the update_column instead of
update_attribute will not touch the updated_at attribute, and
thus will not affect the updated time ago in the view.

Fixes #6798.

closes #6821
2016-05-07 18:52:27 +02:00
Dennis Schubert
209cd783c8 Merge pull request #6816 from cmrd-senya/publisher-refactor
A minor refactor of the Publisher
2016-05-06 02:23:54 +02:00
Dennis Schubert
230ec02ad7 Merge branch 'stable' into develop 2016-05-06 02:20:38 +02:00
sjain1107
4cd2f1d9c1 Add inviter diaspora-ID to the invite email #6796
closes #6817
2016-05-06 02:20:31 +02:00
Dennis Schubert
2131e3425a Merge pull request #6792 from Zauberstuhl/unicorn_killer
Move unicorn_killer to Gemfile
2016-05-06 02:13:07 +02:00
Dennis Schubert
fc97b654ab Merge pull request #6779 from Zauberstuhl/prosody_integration
Configuration wrapper for Prosody
2016-05-06 02:03:48 +02:00
Steffen van Bergerem
2263abdc82 Merge branch 'stable' into develop 2016-05-05 17:59:51 +02:00
Senya
ce6b1a3c0c Clear unused regex in mention.rb
The REGEX is unused

closes #6810
2016-05-05 17:59:37 +02:00
Steffen van Bergerem
05d632dcf2 Merge pull request #6820 from ralinchimev/fix-typo-in-scss
Fix typo in _flash_messages.scss
2016-05-05 17:55:50 +02:00
Ralin Chimev
5dfd242eeb Fix typo in _flash_messages.scss
There is a missing s in „&.alert-success“.

Fixes #6797.
2016-05-04 17:24:55 +03:00
Steffen van Bergerem
87da8f96d9 Merge pull request #6670 from Flaburgan/fix-horizontal-scrolling-mobile
Fix horizontal scrolling on mobile profile
2016-05-04 01:24:56 +02:00
cmrd Senya
ab718dbbc6
A minor refactor of the Publisher
There was a minor copy-paste issue with publisher_public and
publisher_explain methods. Fix it and do a little refactoring
of the publisher's code.
2016-04-28 21:45:49 +03:00
Jonne Haß
32fdec4493
Merge branch 'stable' into develop 2016-04-27 11:56:12 +02:00