Commit graph

17604 commits

Author SHA1 Message Date
Steffen van Bergerem
cec7fcd964
Bump hamlit 2016-06-16 02:39:45 +02:00
Steffen van Bergerem
02bd6c3c3e
Bump eye 2016-06-16 02:39:37 +02:00
Dennis Schubert
45063bf08d
Merge branch 'stable' into develop 2016-06-16 02:39:20 +02:00
Steffen van Bergerem
0d9fe532e7
Bump ruby-progressbar 2016-06-16 02:34:05 +02:00
Steffen van Bergerem
7defbf93a8
Bump parser 2016-06-16 02:34:04 +02:00
Steffen van Bergerem
5e9b32cc00
Bump mime-types 2016-06-16 02:34:04 +02:00
Steffen van Bergerem
5f340484a0
Bump font-awesome-rails 2016-06-16 02:34:04 +02:00
Steffen van Bergerem
156f9dfd25
Bump fog-core 2016-06-16 02:34:04 +02:00
Steffen van Bergerem
d397568f98
Bump cucumber 2016-06-16 02:34:04 +02:00
Steffen van Bergerem
0fb2f8cd70
Bump ast 2016-06-16 02:34:04 +02:00
Steffen van Bergerem
d6341c21c7
Bump webmock 2016-06-16 02:34:03 +02:00
Steffen van Bergerem
966166f057
Bump ruby-oembed 2016-06-16 02:34:03 +02:00
Steffen van Bergerem
8182dfb818
Drop rspec-instafail dependency 2016-06-16 02:34:03 +02:00
Steffen van Bergerem
1158b0a41c
Bump rails-assets-markdown-it 2016-06-16 02:34:03 +02:00
Steffen van Bergerem
47d427cf44
Bump rails-assets-higlightjs 2016-06-16 02:34:03 +02:00
Steffen van Bergerem
c33383c4aa
Bump pry-byebug 2016-06-16 02:34:02 +02:00
Steffen van Bergerem
df0c26da5c
Bump json-schema 2016-06-16 02:34:02 +02:00
Steffen van Bergerem
86aab68c8e
Bump js-routes 2016-06-16 02:34:02 +02:00
Steffen van Bergerem
f5d8ae68c1
Bump guard-rspec 2016-06-16 02:34:02 +02:00
Steffen van Bergerem
8af192d6bd
Bump guard 2016-06-16 02:34:02 +02:00
Steffen van Bergerem
86d8c5f239
Bump autoprefixer-rails 2016-06-16 02:01:06 +02:00
Jonne Haß
e0fdfdb0fa Merge pull request #6861 from svbergerem/status-message-creation-service-spec
Improve status message creation service spec
2016-06-12 12:10:39 +02:00
Steffen van Bergerem
b84eff62ea Improve status message creation service spec 2016-06-12 11:48:11 +02:00
Dennis Schubert
520d80cc1a
Merge branch 'stable' into develop 2016-06-09 03:19:35 +02:00
Steffen van Bergerem
a14c61300e
Remove the publisher from the photos page
closes #6851
2016-06-09 03:17:52 +02:00
Steffen van Bergerem
8c8368d813 Merge pull request #6848 from cmrd-senya/6841-likes-from-profile
Fix like and reshare from the profile page
2016-06-08 23:26:06 +02:00
Steffen van Bergerem
be1016168d Merge pull request #6854 from SansPseudoFix/6853-fix-overflow
6853 fix usernames overflow
2016-06-08 23:15:27 +02:00
Jonne Haß
1891b9c61e
Merge branch 'stable' into develop 2016-06-07 14:05:41 +02:00
Jonne Haß
4c750c8784
Merge branch 'master' into stable 2016-06-07 14:04:22 +02:00
Jonne Haß
0bc8e54afd
Update Nokogiri to 1.6.8
Which in turn updates libxml2 to 2.9.4 and libxslt to 1.1.29,  addressing
a range of security issues.
See https://groups.google.com/forum/#!topic/ruby-security-ann/RCHyF5K9Lbc
for more details.
2016-06-07 13:51:33 +02:00
Jonne Haß
9346fadefc
Merge branch 'stable' into develop 2016-06-07 13:11:52 +02:00
Jonne Haß
c8aa323d13
Set ca_file explicitly for the mail gem too 2016-06-07 13:11:32 +02:00
SansPseudoFix
5bac12d164 6853 fix usernames overflox 2016-06-07 13:02:44 +02:00
Jonne Haß
a5c9579c77
Merge branch 'stable' into develop 2016-06-07 12:30:40 +02:00
Jonne Haß
27569d4baa
OpenSSL verification modes other than none and peer make no sense for
TLS client connection, remove them from the examples.
2016-06-07 12:29:21 +02:00
cmrd Senya
3b8b04ada8
Fix like and reshare from the profile page
Fix class assignment in the mobile view of profile page. Add a
cuke testing the "liking from the profile view" feature.
2016-06-06 19:00:13 +03:00
Dennis Schubert
ac70d72190
Merge branch 'stable' into develop 2016-05-21 19:00:45 +02:00
Dennis Schubert
db5714d75f
updated 73 locale files [ci skip] 2016-05-21 19:00:35 +02:00
Dennis Schubert
aaf1f4741c
updated 73 locale files [ci skip] 2016-05-21 18:57:20 +02:00
Dennis Schubert
f6982aeca6
Merge branch 'stable' into develop 2016-05-17 03:09:20 +02:00
Dennis Schubert
95da98d0bf
Merge branch 'master' into stable 2016-05-17 03:08:54 +02:00
Dennis Schubert
a2864b9f40
Merge branch 'release/0.5.9.0' 2016-05-17 03:05:43 +02:00
Dennis Schubert
f285b1c459 Merge pull request #6831 from svbergerem/fix-conversations-message-content-overflow
Fix message content overflow in conversations
2016-05-13 04:54:44 +02:00
Steffen van Bergerem
1de7f8ea9e Fix message content overflow in conversations 2016-05-13 01:18:16 +02:00
Dennis Schubert
43601ce636
Bump rufus-scheduler 2016-05-12 13:40:24 +02:00
Dennis Schubert
85d509e9c8
Bump listen 2016-05-12 13:39:03 +02:00
Dennis Schubert
347f783052
Bump versionist 2016-05-12 13:38:15 +02:00
Dennis Schubert
cd7fad1f6d
Bump sidekiq 2016-05-12 13:37:57 +02:00
Dennis Schubert
b53fc46658
Bump rails-assets-blueimp-gallery 2016-05-12 13:37:34 +02:00
Dennis Schubert
19d6a94a9c
Bump openid_connect 2016-05-12 13:36:37 +02:00