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
Benjamin Neff
78359d69d8
Merge branch 'next-minor' into develop
2017-03-12 04:32:47 +01:00
Benjamin Neff
3a6e5d5446
Merge branch 'master' into next-minor
2017-03-12 04:32:06 +01:00
Benjamin Neff
a9c282d986
Merge branch 'release/0.6.4.0'
2017-03-12 04:18:52 +01:00
Benjamin Neff
2c6101fbbd
updated 27 locale files [ci skip]
2017-03-12 04:17:45 +01:00
Benjamin Neff
13698bece5
Start 0.6.5.0 cycle
2017-03-05 01:56:50 +01:00
Benjamin Neff
ae687cf1d5
Merge branch 'next-minor' into develop
2017-03-05 00:01:11 +01:00
Benjamin Neff
8e4261100b
Create asterisk.png without digest after precompile
...
fixes #7317
closes #7322
2017-03-04 23:58:08 +01:00
Benjamin Neff
f9cf844602
Merge pull request #7280 from svbergerem/remove-chartbeat-and-mixpanel
...
Remove chartbeat and mixpanel support
2017-02-17 22:22:30 +01:00
Benjamin Neff
a025a23c71
Merge branch 'next-minor' into develop
2017-01-23 02:43:12 +01:00
Benjamin Neff
c130b78117
Merge branch 'master' into next-minor
2017-01-23 02:42:53 +01:00
Benjamin Neff
1702cc1c86
Merge branch 'release/0.6.3.0'
2017-01-23 02:39:54 +01:00
Benjamin Neff
3d992160c3
Enable locales: de-CH, gd, and oc
2017-01-23 02:35:14 +01:00
Benjamin Neff
46ef3e65c4
updated 86 locale files [ci skip]
2017-01-23 02:09:19 +01:00
Benjamin Neff
af00d7c5c0
Merge branch 'next-minor' into develop
2017-01-22 23:30:42 +01:00
flaburgan
1028632ac1
Add Liberapay button in the donate section
...
closes #7290
2017-01-22 23:29:57 +01:00
Benjamin Neff
a0bfe6ffbe
Merge branch 'next-minor' into develop
2017-01-16 01:17:35 +01:00
Steffen van Bergerem
b508b9f6ef
Update database config comments
...
closes #7282
2017-01-16 01:17:27 +01:00
Benjamin Neff
7b7fbeffdc
Merge branch 'next-minor' into develop
2017-01-15 23:45:56 +01:00
Steffen van Bergerem
941118d7af
Move formatting from locale to views
...
closes #7283
2017-01-15 23:42:03 +01:00
Steffen van Bergerem
bd0210a181
Remove chartbeat and mixpanel support
2017-01-15 13:30:54 +01:00
Benjamin Neff
66367cccd8
Start 0.6.4.0 cycle
2017-01-15 05:05:24 +01:00
Steffen van Bergerem
eb8d9809ff
Merge branch 'next-minor' into develop
2017-01-15 04:04:31 +01:00
SansPseudoFix
0f60b9fb94
Switch reason and message
...
unify
rename and show full post on reports
Fix XSS issue
Unification
Style
Fix pronto
closes #7180
2017-01-15 04:04:18 +01:00
Benjamin Neff
03f9147589
Merge branch 'next-minor' into develop
2017-01-15 02:19:10 +01:00
Steffen van Bergerem
b8d3323de0
Return error when unlike failed
2017-01-15 02:17:10 +01:00
cmrd Senya
1fb6040344
new PostController#mentionable_in_comment action
2017-01-13 04:47:50 +02:00
Benjamin Neff
ac136030c6
Merge branch 'next-minor' into develop
2017-01-11 02:43:41 +01:00
Steffen van Bergerem
c9d49c89a6
Always show mobile reaction counts
...
fixes #5829
2017-01-11 02:43:06 +01:00
Steffen van Bergerem
a11747a579
Merge branch 'next-minor' into develop
2017-01-07 03:05:13 +01:00
flaburgan
8e5d2f5c65
Add links to the aspects and followed tags page on mobile
...
closes #7265
2017-01-07 03:05:01 +01:00
Benjamin Neff
b632155772
Merge branch 'next-minor' into develop
2017-01-04 02:33:00 +01:00
flaburgan
03db9807d7
Remove Vines mention, fix #7262
...
closes #7264
2017-01-04 02:23:57 +01:00
Dennis Schubert
a1331aa3b1
Merge branch 'release/0.6.2.0' into next-minor
2016-12-13 18:51:33 +01:00
Dennis Schubert
ea35061feb
updated 121 locale files [ci skip]
2016-12-13 18:51:19 +01:00
Dennis Schubert
52b7d6ed9e
updated 121 locale files [ci skip]
2016-12-13 18:49:44 +01:00
Benjamin Neff
fca13efdf2
Merge branch 'next-minor' into develop
2016-12-08 03:19:45 +01:00
Benjamin Neff
7ce3982b6d
Merge branch 'release/0.6.2.0' into next-minor
2016-12-08 03:19:23 +01:00
Flaburgan
f785de7484
Reformulate CSRF e-mail
...
closes #7241
2016-12-08 03:16:19 +01:00
Dennis Schubert
991b047be7
Start 0.6.3.0 cycle
2016-12-04 20:12:00 +01:00
Dennis Schubert
2c68c1f142
Merge branch 'next-minor' into develop
2016-12-04 20:10:17 +01:00
Benjamin Neff
6c37171f9f
Change last sentence and fix specs
...
closes #7238
2016-12-04 20:10:13 +01:00
SansPseudoFix
61300dab59
CSRF mail
2016-12-04 20:09:45 +01:00
cmrd Senya
33ad411bbd
Mentions in comments backend changes
2016-11-28 15:56:56 +02:00
Benjamin Neff
34787043bb
Merge branch 'next-minor' into develop
2016-11-25 22:37:21 +01:00
Justin Ramos
3586fa6ae7
allowing for graceful unicorn restarts
...
closes #7217
2016-11-25 22:37:06 +01:00
Benjamin Neff
edd3ddef52
Merge branch 'next-minor' into develop
2016-11-23 01:53:12 +01:00
Steffen van Bergerem
8588844913
Remove unused photos.show.show_original_post translation
...
closes #7208
2016-11-23 01:52:23 +01:00
Benjamin Neff
99b7229d5a
Merge branch 'next-minor' into develop
2016-11-22 03:55:12 +01:00
Steffen van Bergerem
0051d6a0b8
Move comment, like and reshare creation error translations
...
closes #7202
2016-11-22 03:54:56 +01:00
Steffen van Bergerem
6c5c865b15
Use error message from the server when reshare failed
2016-11-22 03:53:01 +01:00
Steffen van Bergerem
8078c60cee
Refactor aspect membership error response handling with flash messages
2016-11-22 03:53:01 +01:00
Steffen van Bergerem
8cd26054c8
Merge branch 'next-minor' into develop
2016-11-18 15:29:00 +01:00
Augier
af331bfb30
Add collection to app.views.NotificationDropdown and app.views.Notifications
...
closes #6952
2016-11-18 15:27:37 +01:00
Dennis Schubert
8fb17f8e2c
Merge branch 'next-minor' into develop
2016-11-06 02:41:46 +01:00
Benjamin Neff
851c16d80c
Add setting for a custom changelog url.
...
fixes #7073
closes #7166
2016-11-06 02:41:42 +01:00
Dennis Schubert
48cb2aca1d
Merge branch 'next-minor' into develop
2016-11-06 02:41:12 +01:00
Benjamin Neff
704e5bd399
Remove unused /user/getting_started_completed route
...
The used one is /getting_started_completed
closes #7164
2016-11-06 02:41:08 +01:00
Dennis Schubert
ead2ba8edf
Merge branch 'next-minor' into develop
2016-11-06 02:40:11 +01:00
Benjamin Neff
57c0330535
Schedule a connection-check when receiving a message from an offline pod
...
closes #7158
2016-11-06 02:40:05 +01:00
Dennis Schubert
0c78fcaae7
Merge branch 'next-minor' into develop
2016-11-06 02:34:16 +01:00
Benjamin Neff
08282cea01
Add dark theme
...
Also renamed "Original Dark" to "Original Gray", because it isn't "dark".
closes #7152
2016-11-06 02:34:11 +01:00
Dennis Schubert
260cc23357
updated 29 locale files [ci skip]
2016-11-06 02:31:20 +01:00
Benjamin Neff
694d4cbc0f
Merge branch 'next-minor' into develop
2016-11-02 23:03:36 +01:00
Steffen van Bergerem
2ec45317a3
Add new JSON endpoint for reshares
2016-11-02 22:59:25 +01:00
Dennis Schubert
ad1b2793eb
Merge branch 'next-minor' into develop
2016-10-30 00:15:20 +02:00
Dennis Schubert
b78ef83c23
Merge branch 'release/0.6.1.0' into next-minor
2016-10-30 00:15:12 +02:00
Benjamin Neff
e18627f542
Suppress deprecation warning: disable csp in report-only mode
2016-10-30 00:14:23 +02:00
Dennis Schubert
69ec1d6fe8
Merge branch 'next-minor' into develop
2016-10-28 00:36:22 +02:00
Benjamin Neff
16cd4752cb
Move auth_token to users controller
...
This token is only used for the chat, it isn't an official API.
2016-10-28 00:36:14 +02:00
Dennis Schubert
368e6d9ef5
Start 0.6.2.0 cycle
...
[ci skip]
2016-10-27 02:29:14 +02:00
Dennis Schubert
402d87729c
Merge branch 'next-minor' into develop
2016-10-27 02:26:57 +02:00
Benjamin Neff
4f6018c74a
Bump secure_headers
...
closes #7151
2016-10-27 02:26:52 +02:00
Dennis Schubert
75aaf869c5
Merge branch 'next-minor' into develop
2016-10-27 02:26:15 +02:00
Benjamin Neff
0dd98a5c13
Bump diaspora_federation
...
closes #7145
2016-10-27 02:26:11 +02:00
Dennis Schubert
3025b028e7
Merge branch 'next-minor' into develop
2016-10-27 02:22:33 +02:00
cmrd Senya
a80806ca58
Fix ID token issuer field to match discovery data
...
OpenID Connect spec says:
"The issuer returned by discovery MUST exactly match the value of iss in the ID Token."
https://openid.net/specs/openid-connect-core-1_0.html#IssuerIdentifier
closes #7081
2016-10-27 02:22:27 +02:00
Benjamin Neff
2c0a2db848
Merge branch 'next-minor' into develop
2016-10-26 02:50:00 +02:00
hilkoc
b7791e6c9d
Add user setting for default post visibility
...
fixes #4319
closes #7118
2016-10-26 02:48:11 +02:00
Steffen van Bergerem
fa4f7ff2d8
Merge branch 'next-minor' into develop
2016-10-01 02:37:02 +02:00
Benjamin Neff
1c1c9d6794
Link to diaspora* admin dashboard
...
closes #7130
2016-10-01 02:36:55 +02:00
Dennis Schubert
c41fd52f1d
Merge branch 'next-minor' into develop
2016-09-30 02:11:36 +02:00
Benjamin Neff
ec8a49b338
Add settings for CSP to diaspora.yml
...
closes #7128
2016-09-30 02:11:32 +02:00
Benjamin Neff
caef670934
Configure CSP header for services from diaspora.yml
2016-09-30 02:10:37 +02:00
Benjamin Neff
edf6602099
Add frame-src but don't spam the log with DEPRECATION warnings.
...
This is an ugly hack, and it should be reverted once we stop supporting
old browsers.
2016-09-30 02:10:37 +02:00
Benjamin Neff
6ec0fd4b9f
Add nonce to javascript tags
2016-09-30 02:10:37 +02:00
Benjamin Neff
4da1c78bb7
Add secure_header gem to add some security related headers
...
basic config for Content Security Policies
2016-09-30 02:10:37 +02:00
Steffen van Bergerem
e08b775507
Merge branch 'next-minor' into develop
2016-09-30 00:33:16 +02:00
Steffen van Bergerem
2a697c5d1f
Remove inbox.js from precompiled assets
...
closes #7108
2016-09-30 00:33:12 +02:00
Augier
e424896822
Fully port conversations to Backbone and drop inbox.js
2016-09-30 00:32:46 +02:00
Steffen van Bergerem
3437c4d5cb
Merge branch 'next-minor' into develop
2016-09-28 22:00:10 +02:00
Benjamin Neff
be33b425ba
remove unused precompiled JS files
2016-09-28 21:59:08 +02:00
Benjamin Neff
fccabf9983
Extract mobile bookmarklet JS to file
2016-09-28 21:59:08 +02:00
Benjamin Neff
14304f3620
Extract profile photo uploader to file
2016-09-28 21:59:08 +02:00
Dennis Schubert
5437af74a3
Merge branch 'next-minor' into develop
2016-09-25 02:59:00 +02:00
Benjamin Neff
0e5141dd67
Fix mapbox API URL
...
closes #7066
2016-09-25 02:58:56 +02:00
Dennis Schubert
78083afe38
Undo accidential dev->next-minor merge
...
Turns out there is a difference between hg and git and I should not
switch that often.
2016-09-20 02:04:04 +02:00
Dennis Schubert
f6e5fa1d13
Merge branch 'svbergerem-fix-bundler-require' into next-minor
2016-09-20 01:47:12 +02:00
Dennis Schubert
bc9cf77e8d
Merge branch 'master' into next-minor
2016-09-20 01:46:45 +02:00
Steffen van Bergerem
f6870c1c4d
Require installed optional groups with Bundler
2016-09-20 01:42:59 +02:00
Dennis Schubert
c39a661861
Init 0.6.0.1 hotfix
2016-09-20 01:40:40 +02:00
