Commit graph

16320 commits

Author SHA1 Message Date
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ß
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
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
f3e897ab43 Activate hovercards for logged out users
closes #6603
2015-12-29 13:07:03 +01:00
Steffen van Bergerem
40ff47f84b Update code of conduct to 1.3.0
closes #6602
2015-12-28 18:28:17 +01:00
Steffen van Bergerem
78df0f5158 Update highlightjs 2015-12-28 17:25:45 +01:00
Steffen van Bergerem
4cb2575474 Add media.ccc.de as trusted oEmbed endpoint 2015-12-28 16:42:34 +01:00
Besnik Bleta
680955ad8c Update for sq translation 2015-12-27 17:49:39 +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
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
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
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
apsc92
fdb3ae5cb8 Fix_notifications_timestamp_issue #4826
closes #6573
2015-12-08 17:30:27 +01:00
Stéphane Guillou
2f4b817c46 Fix missing word in locked account message
closes #6577
2015-12-04 06:55:10 +01:00
Manoj Mishra
ab21e6b134 Fix: Adding mention through paste user name from clipboard is not successfull
Input buffer wasn't getting updated with the user input when user did a
paste from clipboard, it caused search for the available contacts
to not trigger

closes #6510
2015-11-27 12:46:02 +01:00
Jonne Haß
91127ce95f Merge branch 'release/0.5.5.0' into stable 2015-11-24 00:43:22 +01:00
Jonne Haß
e195651592 bump nokogiri 2015-11-24 00:43:12 +01:00
Jonne Haß
29d10a42f8 start 0.5.6.0 cycle 2015-11-23 03:12:00 +01:00
Jonne Haß
5f2e0907b7 freeze 0.5.5.0 2015-11-23 03:10:46 +01:00
Jonne Haß
bbb348ea5b updated 32 locale files [ci skip] 2015-11-22 16:02:28 +01:00
Steffen van Bergerem
98eb103446 Update highlight.js
closes #6558
2015-11-22 15:47:56 +01:00
Steffen van Bergerem
b8756cb16f Update markdown-it-sanitizer 2015-11-22 15:44:32 +01:00
Steffen van Bergerem
c3a44dcce1 Update markdown-it 2015-11-22 15:44:32 +01:00
Jason Robinson
9a35a0d8dd Add participation to root.author on receiving reshare
When author of the root post receives a reshare to it, no participation is added to the root author on the reshare. This causes any comments on the reshare on remote pods not to be sent to the author. Adding a participation should subscribe to the reshare and thus bring added comments back to the author.

closes #6481
2015-11-22 02:50:38 +01:00
Jason Robinson
66925918b1 Send comment to reshare author when commenting on reshare
As posts are always delivered also to reshare root, comments should also be delivered to reshare root, for concistency.
2015-11-22 02:45:27 +01:00
Manuel Vögele
0925a26506 Do not add participation for comment if comment validation failed The same fix is also done for the other social actions
closes #6552
2015-11-18 03:16:54 +01:00
Jonne Haß
acb9547978 Update Rails to 4.2.5 2015-11-14 16:12:15 +01:00
Jonne Haß
53a7d36e44 Revert "Force flash message width to 80% of screen on small devices"
This reverts commit e731bb86c5.
2015-11-13 15:59:18 +01:00
Augier
e731bb86c5 Force flash message width to 80% of screen on small devices
closes #6529
2015-11-13 14:31:06 +01:00
theworldbright
a054a35863 Catch Diaspora::NotMine on post controller
closes #6533
2015-11-04 22:10:00 +01:00
Jonne Haß
bf42cc17f1 bump http
closes #6514
2015-10-29 04:25:11 +01:00
Jonne Haß
a189155773 bump valid 2015-10-29 04:21:07 +01:00
Jonne Haß
c7a5010b37 bump sass 2015-10-29 04:21:07 +01:00