Dennis Schubert
40e780abcf
Merge branch 'stable' into develop
2016-01-06 00:49:15 +01:00
Benjamin Neff
812510b44a
refactoring tests again
...
closes #6595
2016-01-06 00:47:55 +01:00
cmrd Senya
b6c7f004e4
Further receive tests development
2016-01-06 00:47:42 +01:00
cmrd Senya
2aaf45166b
bump diaspora_federation
2016-01-06 00:47:42 +01:00
cmrd Senya
56f022f28c
Fix a few issues with public receiver which include:
...
* Make Retraction be allowed to be received publicly (probably just never used before anywhere)
* Since public receiver bypasses @object.receive in some cases add the author signature verification for relayables to protect from relayables forgery
* xml_author was wrong in some cases for RelayableRetraction
2016-01-06 00:46:14 +01:00
cmrd Senya
e54f87b7a6
Add rspec persistance file
2016-01-06 00:46:14 +01:00
Jonne Haß
764a3fec1d
Merge branch 'stable' into develop
2016-01-05 21:34:11 +01:00
Jonne Haß
d025cc38d3
Drop another plurals hack at aspects
...
It doesn't look used anymore either
2016-01-05 21:33:41 +01:00
Steffen van Bergerem
079d5ab298
Merge branch 'stable' into develop
2016-01-04 14:19:53 +01:00
Steffen van Bergerem
09e2c1af2e
Mention media.ccc.de in the changelog [ci skip]
2016-01-04 14:19:44 +01:00
Jonne Haß
2af02db0d6
Merge branch 'stable' into develop
2016-01-04 00:17:54 +01:00
Manuel Vögele
a4257a70e5
Wait for spinner to disappear before checking for posts in the stream
...
closes #6615
2016-01-04 00:17:47 +01:00
Dennis Schubert
642de6909e
Remove duplicate Gems from Lockfile
...
this commit could also be named "Remove user error", but that would look
like I am too stupid to use bundler.
2015-12-31 16:30:11 +01:00
Jonne Haß
80c18a32c6
bump bootstrap-sass
2015-12-31 16:26:40 +01:00
Jonne Haß
e3f86492ed
bump pg
2015-12-31 16:24:54 +01:00
Jonne Haß
39e445cc38
bump pronto
2015-12-31 16:21:58 +01:00
Dennis Schubert
9dca1785c2
Merge branch 'stable' into develop
2015-12-31 16:17:35 +01:00
Jonne Haß
b1f7a452f9
bump spring
2015-12-31 16:09:11 +01:00
Jonne Haß
733e61ee1a
bump responders
2015-12-31 16:09:11 +01:00
Jonne Haß
7c1600d1b1
bump redcarpet
2015-12-31 16:09:11 +01:00
Jonne Haß
65685695d2
bump omniauth
2015-12-31 16:09:11 +01:00
Jonne Haß
69b4492148
bump js-routes
2015-12-31 16:07:23 +01:00
Jonne Haß
9aa7b2bd78
bump ruby-oembed
2015-12-31 16:05:57 +01:00
Jonne Haß
d62f3c8668
bump jasmine
2015-12-31 16:02:26 +01:00
Jonne Haß
1223d6887c
bump handlebars_assets
2015-12-31 15:59:38 +01:00
Jonne Haß
4b67b1cc3a
bump webmock
2015-12-31 15:50:12 +01:00
Jonne Haß
27f79e16ee
bump unicorn
2015-12-31 15:40:03 +01:00
Jonne Haß
0deb16adcc
bump test_after_commit
2015-12-31 15:40:03 +01:00
Jonne Haß
44bc55337d
bump spring
2015-12-31 15:35:45 +01:00
Jonne Haß
75c8d0c4ed
bump simplecov
2015-12-31 15:35:45 +01:00
Jonne Haß
19141239dc
bump shoulda-matchers
2015-12-31 15:35:45 +01:00
Jonne Haß
670c5fed4f
bump rails_admin
2015-12-31 15:34:08 +01:00
Jonne Haß
226b3b3663
bump rails-i18n
2015-12-31 15:32:17 +01:00
Jonne Haß
256e0fadfa
bump rails-assets-perfect-scrollbar
2015-12-31 15:31:36 +01:00
Jonne Haß
560f2df089
bump rails-assets-jquery-placeholder
2015-12-31 15:27:51 +01:00
Jonne Haß
5e6f01a956
bump pry-byebug
2015-12-31 15:27:51 +01:00
Jonne Haß
b886ece423
bump pronto
2015-12-31 15:22:20 +01:00
Jonne Haß
8948298310
bump pg
2015-12-31 15:18:49 +01:00
Jonne Haß
f4e6aefd57
bump omniauth-tumblr
2015-12-31 15:17:41 +01:00
Jonne Haß
a6e3d587b6
bump omniauth-facebook
2015-12-31 15:17:41 +01:00
Jonne Haß
3a0da0564a
bump json-schema
2015-12-31 15:17:41 +01:00
Jonne Haß
fbc64743f0
bump fog
2015-12-31 15:17:07 +01:00
Jonne Haß
ff0e5c0563
bump devise
2015-12-31 15:17:07 +01:00
Jonne Haß
152505511b
bump autoprefixer-rails
2015-12-31 15:17:07 +01:00
Jonne Haß
1ed904449d
Merge branch 'stable' into develop
2015-12-31 14:21:10 +01:00
Jonne Haß
237445d41b
Drop plurals hack at the contacts key
...
as it's not even used anymore and confuses WTI
2015-12-31 14:20:10 +01:00
Steffen van Bergerem
99289491ef
Merge pull request #6607 from jhass/link_profile_in_user_menu
...
Link user menu button to the users profile
2015-12-30 18:37:16 +01:00
Jonne Haß
f70cefb983
Link user menu button to the users profile
2015-12-30 15:14:29 +01:00
Dennis Schubert
d4fbbd86b3
Merge branch 'stable' into develop
2015-12-30 14:51:05 +01:00
Benjamin Neff
5392c6e6a9
refactoring for federation tests
2015-12-30 14:50:34 +01:00
