Benjamin Neff
44e10a9172
Merge branch 'next-minor' into develop
2017-05-26 01:51:37 +02:00
Mahonri Gibson
5739f67605
Save email without confirmation when podmail is disabled.
...
fixes #7195
closes #7455
2017-05-26 01:50:55 +02:00
Benjamin Neff
a7093c6f7d
Merge branch 'next-minor' into develop
2017-05-23 00:17:19 +02:00
Benjamin Neff
a6869197d8
Start 0.6.7.0 cycle
...
[ci skip]
2017-05-23 00:15:06 +02:00
Dennis Schubert
1e06fd786c
Merge branch 'next-minor' into develop
2017-05-21 12:06:41 +02:00
Benjamin Neff
e177706769
Add admin account username to NodeInfo metadata
...
Fixes #7421
closes #7447
2017-05-21 12:06:35 +02:00
Benjamin Neff
e463397122
Merge branch 'next-minor' into develop
2017-05-16 00:37:06 +02:00
cmrd Senya
6abd0509f9
Use guid instead of id at permalink and in SPV
...
This changes links from /posts/:id to /posts/:guid where the links are
not clicked very often. ID search is faster than guid search so we can't
change it everywhere, but these links are not very useful for clicking,
but can be used for easier guid look up.
closes #7453
2017-05-16 00:36:43 +02:00
Benjamin Neff
ee05cc8270
Merge branch 'next-minor' into develop
2017-05-13 02:09:25 +02:00
Mahonri Gibson
942e090b3a
Fix welcome message crashing server if podmin is set to invalid user.
...
Fixes #7363
closes #7452
2017-05-13 02:08:51 +02:00
Benjamin Neff
f4f0e724c6
Merge branch 'next-minor' into develop
2017-05-11 04:24:29 +02:00
Benjamin Neff
02b4d3f347
Don't raise when the public key of a person is "broken"
...
Breaking a public key of a person can be used to "block" receiving posts
from this person on the pod. So we should handle that case better and
not just trigger many retries for something that will fail again.
closes #7448
2017-05-11 04:24:13 +02:00
Benjamin Neff
7d9c6c85bd
Remove rails_admin
...
This is now broken since more than half a year, so I think we can just
remove it.
Podmins shouldn't use this anyway, because it does bad things, like
replacing NULL with an empty string when editing something. If we really
need an admin interface for something, we should add it to our own admin
panel at /admins/dashboard.
Fixes #7027 and #6413
closes #7440
2017-05-11 04:18:33 +02:00
Benjamin Neff
064fc3cc45
Merge branch 'next-minor' into develop
2017-05-05 02:30:56 +02:00
Steffen van Bergerem
23d3d9dc3f
Use post page title for atom feeds and add entry author
...
Fixes #7249
closes #7420
2017-05-05 02:30:46 +02:00
Steffen van Bergerem
fc28d6af35
Fix first comment in mobile view with french locale
...
Fixes #7438 . The regression has possibly been introduced by #7207 .
closes #7441
2017-05-05 02:26:22 +02:00
Benjamin Neff
caaea50cf6
Merge branch 'next-minor' into develop
2017-04-26 22:18:02 +02:00
pskosinski
afef279aff
Fix untranslatable photo upload button's hover text
...
closes #7429
fixes #7427
2017-04-26 22:17:44 +02:00
Dennis Schubert
3eeee4b5de
Merge branch 'next-minor' into develop
2017-04-12 01:29:50 +02:00
Dennis Schubert
69be912478
Start 0.6.6.0 cycle
...
[ci skip]
2017-04-12 01:28:18 +02:00
Benjamin Neff
e91a0a57a3
Merge branch 'next-minor' into develop
2017-04-08 00:00:56 +02:00
Steffen van Bergerem
3971a24d68
Add avatar fallback for avatar next to publisher
...
closes #7414
2017-04-08 00:00:45 +02:00
Benjamin Neff
24b40a4c01
Merge branch 'next-minor' into develop
2017-04-06 01:02:26 +02:00
Amadren
30fad8279b
Improve csp for a better cloudflare support
...
closes #7367
2017-04-06 01:01:50 +02:00
Steffen van Bergerem
a61031710c
Merge branch 'next-minor' into develop
2017-04-02 12:51:35 +02:00
cmrd Senya
f1c1091162
Remove unused cucumber step
...
"should see JSON"
closes #7410
2017-04-02 12:51:27 +02:00
Dennis Schubert
9a76cf7d3b
Merge branch 'next-minor' into develop
2017-03-29 22:33:43 +02:00
Dennis Schubert
8e8af0bfa5
Merge branch 'master' into next-minor
2017-03-29 22:32:20 +02:00
Dennis Schubert
610f39e991
Bump nokogiri for a security release
2017-03-29 22:29:05 +02:00
Dennis Schubert
ec6a6d5138
Merge branch 'next-minor' into develop
2017-03-28 06:42:53 +02:00
Waithamai
38450eacea
Added spacing between list items fixes #7400
...
closes #7401
2017-03-28 06:42:43 +02:00
Dennis Schubert
10bf1c0925
Merge branch 'next-minor' into develop
2017-03-28 01:57:02 +02:00
Benjamin Neff
35f4d61d11
Disable rack session cookie for sidekiq
...
Since 4.2.3 sidekiq allows to disable its own session cookie for the
case where the app provides a session already.
closes #7395
2017-03-28 01:56:52 +02:00
Benjamin Neff
5de83b881b
Merge pull request #7399 from svbergerem/remove-statistics-json
...
Remove statistics.json
2017-03-28 00:08:16 +02:00
Benjamin Neff
d9b02418b6
Merge branch 'next-minor' into develop
2017-03-27 00:04:53 +02:00
Steffen van Bergerem
4a56c0465c
Remove outdated rtl styles
...
These lines might have been necessary some time ago but now they are making things worse.
closes #7374
2017-03-27 00:04:38 +02:00
Steffen van Bergerem
4a944c5ab4
Use small avatar in the person json
...
closes #7376
2017-03-27 00:02:10 +02:00
Steffen van Bergerem
6f3c61d8f2
Increase maximal height of large thumbnail
...
Fixes #6248 , supersedes #6244 .
closes #7383
2017-03-27 00:00:41 +02:00
Steffen van Bergerem
8a98cd4517
Refactor destroyModel function in base view
...
closes #7385
2017-03-26 23:53:37 +02:00
Steffen van Bergerem
5b0b3d989b
Merge pull request #7394 from SuperTux88/mention-backport-on-receive
...
Only backport mention syntax when the author is local
2017-03-26 12:26:52 +02:00
Benjamin Neff
af0a5e32a1
Merge pull request #7369 from svbergerem/color-themes-i18n
...
i18n for color themes
2017-03-26 03:12:54 +02:00
Benjamin Neff
06b61b6480
Merge branch 'next-minor' into develop
2017-03-25 20:38:00 +01:00
Steffen van Bergerem
05e9798027
Fix sharing indicator on profile page for blocked users
...
closes #7382
2017-03-25 20:35:45 +01:00
Steffen van Bergerem
d3de97b244
Disable autocomplete for the conversation form recipient input
...
closes #7375
2017-03-25 20:34:13 +01:00
Steffen van Bergerem
b0da14c383
Merge pull request #7386 from cmrd-senya/comment-mention-front-end
...
Comment mentions front-end
2017-03-24 00:20:37 +01:00
Steffen van Bergerem
a2ca68b523
Merge branch 'next-minor' into develop
2017-03-21 13:34:59 +01:00
flaburgan
ad7d4d777b
Add links to liked and commented pages within My activity
...
closes #5502
2017-03-21 13:34:47 +01:00
Steffen van Bergerem
80b53adcf0
Merge branch 'next-minor' into develop
2017-03-21 13:08:52 +01:00
flaburgan
b3e3de08b8
Fix block user failing feature
...
closes #7379
2017-03-21 13:08:44 +01:00
Steffen van Bergerem
b2d0feb00d
Merge pull request #7303 from cmrd-senya/jquery3
...
Use jQuery 3
2017-03-18 16:06:05 +01:00
