Jonne Haß
baeff22451
Merge pull request #6095 from AugierLe42e/openid
...
OpenID Connect
2016-01-06 12:30:15 +01:00
Dennis Schubert
439ea693a0
Merge pull request #6617 from manuelVo/ignored-user-show-posts-on-profile
...
Show posts of ignored users on their profile page
2016-01-06 10:48:50 +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ß
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
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
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
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
Jonne Haß
21cb1f44cd
Merge branch 'stable' into develop
2015-12-08 17:30:32 +01:00
apsc92
fdb3ae5cb8
Fix_notifications_timestamp_issue #4826
...
closes #6573
2015-12-08 17:30:27 +01:00
Steffen van Bergerem
75e3085ca9
Merge branch 'stable' into develop
2015-11-27 12:46:46 +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ß
086931d745
Merge branch 'stable' into develop
2015-11-23 03:13:13 +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
Dennis Schubert
5081d69847
Merge branch 'stable' into develop
2015-11-22 02:52:37 +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
Jonne Haß
17d0ddab41
Merge branch 'stable' into develop
2015-11-18 03:37:34 +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ß
c6939361ee
Revert "Revert "Force flash message width to 80% of screen on small devices""
...
This reverts commit 53a7d36e44
2015-11-13 16:04:32 +01:00
Jonne Haß
f2091f3b73
Merge branch 'stable' into develop
2015-11-13 16:03:44 +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
Jonne Haß
5de0655e54
Merge branch 'stable' into develop
2015-11-13 14:31:10 +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
Jonne Haß
910e9e815c
Merge pull request #6543 from manuelVo/5485-mobile-empty-comment-handling
...
Do not disable submit button if comment is empty in mobile view
2015-11-13 03:56:36 +01:00
Steffen van Bergerem
3c43819bce
Merge pull request #6504 from sarithats/fix/login_button
...
Change login button color
2015-10-21 08:16:54 +02:00
Dennis Schubert
228f3852b2
Merge branch 'stable' into develop
2015-10-15 05:58:44 +02:00
Steffen van Bergerem
995ce18c37
Display publisher on user profile path
...
closes #6503
2015-10-15 05:58:38 +02:00
Jonne Haß
99d4e0b332
Merge branch 'stable' into develop
2015-10-14 22:33:14 +02:00
cmrd Senya
69b46df3d6
Notifications for comments on local posts by non-contacts
2015-10-14 22:32:19 +02:00
Jonne Haß
d9572ec337
Merge branch 'stable' into develop
2015-10-14 11:00:47 +02:00
Lincoln Stoll
6ac6dc1059
Don't set key for logfile on Heroku
...
This fixes the issue reported in #5947 . Sidekiq will only log to stdout when this key evals to false, so this can't be forced with an empty string. This change eliminates the key altogether when running on Heroku.
closes #6500
2015-10-14 11:00:42 +02:00
Jonne Haß
09f4eeac2a
Merge branch 'stable' into develop
2015-10-12 16:12:36 +02:00
Steffen van Bergerem
b68daaece3
Redirect to sign in on 401 ajax response
...
closes #6496
2015-10-12 16:12:30 +02:00
Dennis Schubert
2b2ce66126
Merge branch 'stable' into develop
2015-10-12 03:44:44 +02:00
Dennis Schubert
9df2cb7290
Prepare 0.5.5.0 release
...
[ci skip]
2015-10-12 03:41:38 +02:00
Jonne Haß
2aed793d19
Merge branch 'stable' into develop
2015-10-11 17:30:47 +02:00
Steffen van Bergerem
123e6d1dd4
Redirect logged out users to sign up page for limited posts
...
closes #6490
2015-10-11 17:29:01 +02:00
Jonne Haß
77295ffcfb
Merge pull request #6487 from svbergerem/move-reshare-count
...
Move reshare count
2015-10-10 20:51:27 +02:00
Steffen van Bergerem
bce7157b86
Merge pull request #6395 from AugierLe42e/drop-flash-messages-widget
...
Use backbone for flash messages
2015-10-10 17:17:52 +02:00
Dennis Schubert
aab21be09d
Merge branch 'stable' into develop
2015-10-10 06:45:15 +02:00
Steffen van Bergerem
230f6d6d62
Fix hovercard view console error
...
closes #6480
2015-10-10 06:45:09 +02:00
Steffen van Bergerem
1ad48d7ce3
Fix changelog for #6462 [ci skip]
2015-10-08 16:18:49 +02:00
Steffen van Bergerem
0dd6c71b6d
Fix changelog for #6462 [ci skip]
2015-10-08 16:14:13 +02:00
