Benjamin Neff
3d7061b240
Update configs for rails 5
...
Used `rails app:update`
2017-08-12 15:39:19 +02:00
flaburgan
c2e0feb38b
Include first/last name in invitation emails
2017-08-07 19:08:17 +02:00
Benjamin Neff
7f8108e4ac
Precompile bookmarklet to use in production
...
`Rails.application.assets` is only available when `config.assets.compile`
is true (which is false in production). So the old way with a separate
rake task doesn't work in production. But we can get the filename of the
precompiled file from `Rails.application.assets_manifest.assets`.
2017-07-31 22:43:28 +02:00
Benjamin Neff
a797f2d27b
Don't precompile all themes for tests
...
And sprockets 3 also caches files in tmp/cache/assets/sprockets
2017-07-30 05:57:19 +02:00
Benjamin Neff
7ee8bfbac4
Precompile poltergeist_disable_transition.css for tests
2017-07-30 05:01:39 +02:00
Benjamin Neff
29a7f151b6
Use config.assets.quiet instead of quiet_assets gem
...
The quiet_assets gem doesn't support rails 5, but sprockets 3 now has a
config.assets.quiet option, which deprecates the quiet_assets gem. But
the logging gem has a no-op silence method, that's why the quiet option
doesn't work out-of-the-box. I added a little hack to use the silence
method from ActiveSupport, which is also used from the original rails
logger.
2017-07-30 04:47:16 +02:00
Benjamin Neff
01ca08b86f
Merge pull request #7436 from SuperTux88/federation-update
...
Federation gem update
2017-07-14 01:31:32 +02:00
Benjamin Neff
d62d79bc29
Merge branch 'next-minor' into develop
2017-07-12 03:51:17 +02:00
Benjamin Neff
541dcbcd39
Merge branch 'master' into next-minor
2017-07-12 03:50:58 +02:00
Benjamin Neff
8bed8a84a3
Merge branch 'release/0.6.7.0'
2017-07-12 03:49:09 +02:00
Benjamin Neff
0e8bb71449
updated 126 locale files [ci skip]
2017-07-12 03:42:15 +02:00
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
0e13a316f6
Cleanup some translations
...
closes #7465
2017-07-05 02:02:13 +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
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
4f9e560ab3
Use RFC 7033 webfinger from diaspora_federation gem
2017-07-03 03:14:41 +02:00
Benjamin Neff
87d0778086
Remove guid and public_key from WebFinger
...
Related to diaspora/diaspora_federation#39
2017-07-02 23:56:00 +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
a6869197d8
Start 0.6.7.0 cycle
...
[ci skip]
2017-05-23 00:15:06 +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
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
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
69be912478
Start 0.6.6.0 cycle
...
[ci skip]
2017-04-12 01:28:18 +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
Dennis Schubert
2b32e9b592
Merge branch 'hotfix/0.6.4.1'
2017-03-29 22:29:56 +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
Steffen van Bergerem
7feed3545c
Create mention success flash message with JavaScript
2017-03-28 01:46:30 +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
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
cmrd Senya
c90cb3328e
jQuery 3 integration
2017-03-18 16:50:52 +02:00
Steffen van Bergerem
7eb3dabb44
i18n for color themes
2017-03-16 12:25:41 +01:00
goobertron
6657fd51fa
Capitalisation of colour themes
2017-03-16 12:03:53 +01:00
