Benjamin Neff
189c223224
Fix notification factory
2017-07-02 23:55:59 +02:00
Benjamin Neff
49822a9af7
New namespace for InvalidRootNode
2017-07-02 23:55:59 +02:00
Benjamin Neff
5e3ea249a9
Replace additional_xml_elements with additional_data for relayables
2017-07-02 23:55:59 +02:00
Benjamin Neff
78c7156e72
Replace FactoryGirl with Fabricate for federation factories
2017-07-02 23:55:59 +02:00
Benjamin Neff
d79c2e511b
Bump diaspora_federation
2017-07-02 23:55:01 +02:00
Benjamin Neff
cb50681cea
Merge branch 'next-minor' into develop
2017-06-30 02:13:40 +02:00
Benjamin Neff
0d232f1d1b
Switch PercentLiteralDelimiters to new default
...
Let's change that to the new rubocop default, which is also the
suggestion in the ruby style guide.
See https://github.com/bbatsov/ruby-style-guide#percent-literal-braces
closes #7466
2017-06-30 02:13:31 +02:00
Benjamin Neff
05efe9b8fe
Merge branch 'next-minor' into develop
2017-05-29 03:21:59 +02:00
Benjamin Neff
1751e21a87
Merge branch 'master' into next-minor
2017-05-29 03:21:49 +02:00
Benjamin Neff
7aadadce44
Merge branch 'release/0.6.6.0'
2017-05-29 03:20:38 +02:00
Benjamin Neff
f59055860a
updated 70 locale files [ci skip]
2017-05-29 03:17:45 +02:00
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
01d1bb10ac
Merge branch 'next-minor' into develop
2017-05-21 12:08:16 +02:00
Benjamin Neff
0197cecaf8
Bump nokogiri
...
closes #7458
2017-05-21 12:08:12 +02:00
Dennis Schubert
7c37a62593
Merge branch 'next-minor' into develop
2017-05-21 12:07:14 +02:00
Benjamin Neff
65e8fc4012
Fix comment for environment.sidekiq.retry in diaspora.yml
...
fixes #7456
closes #7457
2017-05-21 12:07:10 +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
7934c1e969
Add NodeInfo 2.0 support
2017-05-21 12:05:54 +02:00
Dennis Schubert
010c1953f9
Merge branch 'next-minor' into develop
2017-05-21 12:05:22 +02:00
Benjamin Neff
c2eb53e827
Bump rubocop
...
Use old style for Style/PercentLiteralDelimiters for now. Maybe we can
change this in the future, because the ruby style guide suggests to use
`[]` (which is also the new default for rubocop).
closes #7443#
2017-05-21 12:05:17 +02:00
Benjamin Neff
153569e297
Bump pronto and all pronto-runners
...
Also add `require: false` everywhere.
2017-05-21 12:05:13 +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
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
