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
6dc4493685
Add spec for post_page_title for reshares
2017-05-05 02:29:28 +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
d72eb59c07
Merge branch 'next-minor' into develop
2017-05-03 02:49:18 +02:00
Benjamin Neff
e7cfaa7e42
Bump diaspora_federation
...
The previous version logged the encrypted private messages of the new
protocol, which only makes the logfiles bigger without any benefit,
because it's encrypted anyway ...
closes #7435
2017-05-03 02:49:08 +02:00
Steffen van Bergerem
7f784cf2b1
Merge branch 'next-minor' into develop
2017-05-03 02:09:07 +02:00
Benjamin Neff
9e36f0201c
Initialize timeago only after language is set
...
closes #7419
2017-05-03 02:08:57 +02:00
cmrd Senya
87ed561d45
bump rails-timeago
...
Here we also set autoDispose to false. This is an option that was introduced
sometime after our last bump. Default is true and it disposes timeago object
if it is not in DOM. But that is the way we initialize timeago objects, therefore
if we have autoDispose=true then they will be disposed before they inserted in DOM.
So by using autoDispose=false we enforce previous behavior that worked fine for us.
2017-05-03 02:08:50 +02:00
cmrd Senya
a880de28a8
Add a cuke for mobile stream page post timestamps
2017-05-03 02:08:50 +02:00
cmrd Senya
4621c54421
fix a typo
2017-05-03 02:08:50 +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
Benjamin Neff
45c623c262
Merge branch 'next-minor' into develop
2017-04-19 00:52:49 +02:00
Benjamin Neff
78c9cc5754
Merge branch 'master' into next-minor
2017-04-19 00:52:38 +02:00
Benjamin Neff
91a9549c3d
Merge branch 'release/0.6.5.0'
2017-04-19 00:52:02 +02:00
Benjamin Neff
746cb8bfb8
updated 68 locale files [ci skip]
2017-04-19 00:38:49 +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
Steffen van Bergerem
bf105db297
Use setupAvatarFallback in tags and notification dropdown view
2017-04-08 00:00:12 +02:00
Steffen van Bergerem
bcb75e3082
Add avatar fallback for conversations view
...
Fixes #4991
2017-04-08 00:00:12 +02:00
Steffen van Bergerem
1c1af74e9f
Add avatar fallback for typeahead suggestions
2017-04-07 23:59:58 +02:00
Steffen van Bergerem
82629c5979
Merge branch 'next-minor' into develop
2017-04-06 14:10:31 +02:00
Steffen van Bergerem
791e74104e
Fix taggable path in text formatter comment [ci skip]
2017-04-06 14:10:12 +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
cmrd Senya
483f738a0f
Remove unused json_spec gem
2017-04-02 12:48:37 +02:00
Benjamin Neff
b639385c46
Merge pull request #7407 from svbergerem/statistics-json-500
...
Return 406 instead of 500 for statistics.json
2017-03-31 01:00:06 +02:00
Steffen van Bergerem
c94bac3cf9
Return 406 instead of 500 for statistics.json
...
Fixes #7406
2017-03-30 23:17:58 +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
2b32e9b592
Merge branch 'hotfix/0.6.4.1'
2017-03-29 22:29:56 +02:00
Dennis Schubert
610f39e991
Bump nokogiri for a security release
2017-03-29 22:29:05 +02:00
Benjamin Neff
6a5c34535d
Merge branch 'next-minor' into develop
2017-03-28 19:55:48 +02:00
flaburgan
6f14040e8e
Fix invitation from sidebar
...
closes #7404
2017-03-28 19:55:42 +02:00
flaburgan
577ead7768
Fix mobile delete original reshare test
...
closes #7403
2017-03-28 19:55:27 +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
Dennis Schubert
efdfa749a7
Merge branch 'next-minor' into develop
...
closes #7398
2017-03-28 01:48:35 +02:00
