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 |
|