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
Benjamin Neff
9f8e018422
add subscribe url to webfinger
2015-12-30 14:50:34 +01:00
Benjamin Neff
0e7bb6d756
define federation entity factories
2015-12-30 14:50:34 +01:00
Benjamin Neff
082e300a40
remove PublicsController completely
2015-12-30 14:50:34 +01:00
Benjamin Neff
05e4c8dc51
improve key specs in federation_callbacks_spec.rb
2015-12-30 14:50:34 +01:00
Benjamin Neff
5c8f0c1671
create queue callbacks and remove receive routes
2015-12-30 14:50:34 +01:00
Benjamin Neff
c036a6a4c3
bump diaspora_federation
2015-12-30 14:50:34 +01:00
Benjamin Neff
24f5244f76
move glue code back to the initializer
2015-12-30 14:48:38 +01:00
Steffen van Bergerem
64b7aa10a6
Merge pull request #6605 from Thor77/flash-message-clickthrough
...
fix flash mesage clickthrough on profile-page
2015-12-29 19:52:47 +01:00
Thor77
056b00fff4
fix flash mesage clickthrough on profile-page
2015-12-29 18:32:13 +01:00
Jonne Haß
434deaa75a
Merge branch 'stable' into develop
2015-12-29 13:07:08 +01:00
Steffen van Bergerem
f3e897ab43
Activate hovercards for logged out users
...
closes #6603
2015-12-29 13:07:03 +01:00
Jonne Haß
245698865f
Merge branch 'stable' into develop
2015-12-28 18:28:20 +01:00
Steffen van Bergerem
40ff47f84b
Update code of conduct to 1.3.0
...
closes #6602
2015-12-28 18:28:17 +01:00
Jonne Haß
20ba097918
Merge branch 'stable' into develop
2015-12-28 17:31:38 +01:00
Steffen van Bergerem
78df0f5158
Update highlightjs
2015-12-28 17:25:45 +01:00
Steffen van Bergerem
eb3cc24a4a
Merge branch 'stable' into develop
2015-12-28 16:42:43 +01:00
Steffen van Bergerem
4cb2575474
Add media.ccc.de as trusted oEmbed endpoint
2015-12-28 16:42:34 +01:00
Jonne Haß
505071336f
Merge branch 'stable' into develop
2015-12-27 17:51:33 +01:00
Besnik Bleta
680955ad8c
Update for sq translation
2015-12-27 17:49:39 +01:00
Steffen van Bergerem
29a5a35caf
Merge branch 'stable' into develop
2015-12-21 17:32:03 +01:00
Lukas Matt
cf49276aa8
bump jsxc to v0.1.4
...
Signed-off-by: Lukas Matt <lukas@zauberstuhl.de>
closes #6569
2015-12-21 17:29:42 +01:00
Steffen van Bergerem
7f146a8af9
Merge pull request #6570 from Zauberstuhl/bump_jsxc_develop
...
[develop] bump jsxc to v0.1.5.develop
2015-12-20 15:58:13 +01:00
Steffen van Bergerem
f6a409924b
Merge pull request #6567 from AugierLe42e/chat-height-fix
...
[Quickfix] Use BS variable to stick chat to header
2015-12-20 15:54:24 +01:00
Dennis Schubert
86fead30a4
Merge branch 'stable' into develop
2015-12-20 00:47:42 +01:00
Dennis Schubert
c238329cd8
Merge branch 'master' into stable
2015-12-20 00:41:49 +01:00
Dennis Schubert
9cb4b732c6
Merge branch 'hotfix/0.5.5.1'
2015-12-20 00:41:01 +01:00
Dennis Schubert
3028b283e4
Bump nokogiri
2015-12-20 00:27:11 +01:00
Steffen van Bergerem
e20f2ae566
Fix XSS in sharing message
2015-12-20 00:15:32 +01:00
Dennis Schubert
3ac340e03e
Prepeare 0.5.5.1 hotfix
2015-12-20 00:06:19 +01:00
Jonne Haß
179964fd15
Merge branch 'stable' into develop
2015-12-17 01:20:31 +01:00
Steffen van Bergerem
2025fae420
Disable hovercards for logged out users and prevent redirect to sign in page
...
closes #6587
2015-12-17 01:20:24 +01:00
Jonne Haß
13029235d0
Merge branch 'stable' into develop
2015-12-13 12:28:04 +01:00
cmrd Senya
f0fc62e94d
Fix a security issue that author_signature is not checked on the to-downstream receive of a federated relayable entity, allowing to forge relayables if you are an owner of the pod where a parent object is stored.
...
closes #6539
2015-12-13 12:26:59 +01:00
cmrd Senya
922d26f976
Implement integration tests for the federation messages receive feature
...
These are some initial tests, more to come.
It tests some features of Request, StatusMessage, Comment, Like,
Participation, Retraction, SignedRetraction, RelayableRetraction entities
receive process.
2015-12-13 12:24:52 +01:00
cmrd Senya
08b910bd88
bump diaspora_federation
2015-12-13 12:24:52 +01:00
cmrd Senya
4e41b8dc86
Allow Retraction to deal with Relayables
2015-12-13 12:23:51 +01:00
Jonne Haß
21cb1f44cd
Merge branch 'stable' into develop
2015-12-08 17:30:32 +01:00
