Commit graph

18269 commits

Author SHA1 Message Date
Steffen van Bergerem
e3b3da404f Fetch comments, likes and reshares separately
Fixes #7165

closes #7167
2016-11-02 23:02:32 +01:00
Steffen van Bergerem
98b345305e Remove unused jasmine fixture 2016-11-02 22:59:25 +01:00
Steffen van Bergerem
2ec45317a3 Add new JSON endpoint for reshares 2016-11-02 22:59:25 +01:00
Dennis Schubert
636c69c0b0
Merge branch 'master' into next-minor 2016-11-02 22:54:00 +01:00
Dennis Schubert
b88f53a3d3
Merge branch 'release/0.6.1.0' 2016-11-02 22:53:06 +01: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
Benjamin Neff
be3b50295c
Use default visibility also for bookmarklet 2016-10-30 00:13:03 +02:00
Benjamin Neff
433d952eb5
Fix tag page when default aspect is "public" or a single aspect
fixes #7161
2016-10-30 00:12:12 +02:00
Benjamin Neff
9f38a424e7
Revert "Test token authentication; should allow it"
It shouldn't be allowed!

This reverts commit 46097ba8c8.

closes #7160
2016-10-28 00:36:18 +02:00
Benjamin Neff
d421e42ddb
Remove ability to authenticate with auth_token on the frontend
Remove devise-token_authenticatable gem and only generate a token to be
used by the chat.
2016-10-28 00:36:14 +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
Benjamin Neff
4f6018c74a
Bump secure_headers
closes #7151
2016-10-27 02:26:52 +02:00
Benjamin Neff
0dd98a5c13
Bump diaspora_federation
closes #7145
2016-10-27 02:26:11 +02:00
Benjamin Neff
4480f59e6e
Remove empty pod and make pod host NOT NULL 2016-10-27 02:25:40 +02:00
Steffen van Bergerem
f90812671c
Show error messages from server when aspect membership changes fail
closes #7132
2016-10-27 02:24:58 +02:00
Steffen van Bergerem
3bea40b248
Refactor conversations creation
closes #7131
2016-10-27 02:23:35 +02:00
Steffen van Bergerem
5c24714245
Fix mobile conversation alerts 2016-10-27 02:23:26 +02:00
Steffen van Bergerem
0c995eb629
Add JavaScript for mobile alerts 2016-10-27 02:23:26 +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
hilkoc
b7791e6c9d Add user setting for default post visibility
fixes #4319

closes #7118
2016-10-26 02:48:11 +02:00
Steffen van Bergerem
74fff52e51 Fix message modal on profile page
closes #7137

fixes #7136
2016-10-26 00:51:41 +02:00
Benjamin Neff
ac08e9351b
Hide "Follow #tag" button on tag page if not logged in
closes #7155
2016-10-24 00:25:27 +02:00
Benjamin Neff
1f05728033
Remove sinatra dependency
Not needed anymore with sidekiq 4.2

closes #7153
2016-10-23 23:03:27 +02:00
Steffen van Bergerem
52bb442ddd Bump will_paginate
closes #7149
2016-10-18 23:30:30 +02:00
Steffen van Bergerem
88c4d1a519 Bump uglifier 2016-10-18 23:30:20 +02:00
Steffen van Bergerem
1729aac5d2 Bump spring 2016-10-18 23:30:20 +02:00
Steffen van Bergerem
dd1d079673 Bump sidekiq-cron 2016-10-18 23:30:20 +02:00
Steffen van Bergerem
1bd60ec39c Bump sidekiq 2016-10-18 23:30:20 +02:00
Steffen van Bergerem
c79b862490 Bump rspec-rails 2016-10-18 23:30:20 +02:00
Steffen van Bergerem
bcc260664d Bump responders 2016-10-18 23:30:20 +02:00
Steffen van Bergerem
5920f8f190 Bump markdown-it-sanitizer 2016-10-18 23:30:20 +02:00
Steffen van Bergerem
e969dcd8af Bump markdown-it 2016-10-18 23:30:20 +02:00
Steffen van Bergerem
885ebec5d6 Bump highlightjs 2016-10-18 23:30:20 +02:00
Steffen van Bergerem
f4b02dc644 Bump pronto 2016-10-18 23:30:20 +02:00
Steffen van Bergerem
42f1bf2c2d Bump poltergeist 2016-10-18 23:30:20 +02:00
Steffen van Bergerem
ec564fbee1 Bump pg 2016-10-18 23:30:20 +02:00
Steffen van Bergerem
378a039860 Bump nokogiri 2016-10-18 23:30:20 +02:00
Steffen van Bergerem
de64a2e709 Bump addressable and json-schema 2016-10-18 23:30:20 +02:00
Steffen van Bergerem
9d1a093990 Bump jquery 2016-10-18 23:30:20 +02:00
Steffen van Bergerem
25020c2493 Bump jasmine 2016-10-18 23:30:20 +02:00
Steffen van Bergerem
29bd25f94a Bump hamlit 2016-10-18 23:30:20 +02:00
Steffen van Bergerem
f74a51e29c Bump haml_lint 2016-10-18 23:30:20 +02:00
Steffen van Bergerem
6ce117b915 Bump fuubar 2016-10-18 23:30:20 +02:00
Steffen van Bergerem
fcb9f0b34d Bump cucumber-rails 2016-10-18 23:30:20 +02:00
Steffen van Bergerem
1b043c35cc Bump capybara 2016-10-18 23:30:20 +02:00
Steffen van Bergerem
01b629f865 Bump autoprefixer-rails 2016-10-18 23:30:20 +02:00
Augier
8c90e5ac46
Search suggestion can be opened in a new tab + displays contact's hovercard
closes #7134
2016-10-18 15:37:23 +02:00
Benjamin Neff
0559932f5d
rename css classes for scss-lint
closes #7148
2016-10-18 15:05:28 +02:00