Benjamin Neff
58609e42d7
Merge branch 'next-minor' into develop
2017-07-05 02:10:24 +02:00
Benjamin Neff
58aa59fb8e
Start 0.6.8.0 cycle
2017-07-05 02:07:45 +02:00
Benjamin Neff
068acd93ce
Cleanup changelog (no bugfixes in this release)
2017-07-05 02:04:07 +02:00
Benjamin Neff
0e13a316f6
Cleanup some translations
...
closes #7465
2017-07-05 02:02:13 +02:00
flaburgan
ddda28102c
Clean up the footer links a bit
...
closes #7446
2017-07-05 01:59:18 +02:00
flaburgan
ea9e50085d
Add link to discourse in footer and left side bar
2017-07-05 01:57:17 +02:00
flaburgan
07d0ed916d
Fix design issues + pronto
...
closes #7295
2017-07-05 01:51:07 +02:00
flaburgan
427aa8794e
Add tests for mobile drawer
2017-07-05 01:50:16 +02:00
flaburgan
2782edc780
Refactor partials + pronto
2017-07-05 01:50:16 +02:00
flaburgan
a7d97b7fd3
Add mobile message confirmation on user invit action, Refactor admin responsive code to use bootstrap grid
...
Hide pod version alert only in the mobile version, not depending on screen size
2017-07-05 01:50:16 +02:00
flaburgan
7bdf33e1a8
Move invitation form under the user search in admin
...
Indicates when there is no report to review to avoid a weird empty page
2017-07-05 01:50:16 +02:00
SansPseudoFix
5cb4c6e5df
Refactor, more partials + No version check for mobile
2017-07-05 01:50:16 +02:00
SansPseudoFix
276b640418
Add admin views to mobile, use partials for common code with desktop
2017-07-05 01:50:10 +02:00
Benjamin Neff
d71aa6a54a
Merge branch 'next-minor' into develop
2017-07-03 03:46:54 +02:00
atulonruby
df1139234f
Warn user if he leaves profile editing page #6520
...
closes #7473
closes #6589
2017-07-03 03:45:57 +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
