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