Steffen van Bergerem
|
9cbadec659
|
Move 'XSS via name parameter' to mobile conversation specs
because the desktop view doesn't use the name parameter anymore
|
2016-11-13 20:08:59 +01:00 |
|
Steffen van Bergerem
|
2b6465ef25
|
Use !== instead of localeCompare when removing conversation recipients
|
2016-11-13 20:08:59 +01:00 |
|
Augier
|
f2fdaf1daf
|
Use typeahead on conversations
|
2016-11-13 20:08:59 +01:00 |
|
Steffen van Bergerem
|
766470dcd0
|
Merge branch 'next-minor' into develop
|
2016-11-12 21:39:17 +01:00 |
|
Steffen van Bergerem
|
5269a0d3c0
|
Fix aspect membership view spec syntax
Regression introduced in #7132
|
2016-11-12 21:37:48 +01:00 |
|
Dennis Schubert
|
2a927e66dc
|
Merge branch 'next-minor' into develop
|
2016-11-06 03:07:00 +01:00 |
|
Dennis Schubert
|
b3e5bfdafd
|
Set the hidden mention to transparent, not white.
|
2016-11-06 03:06:50 +01:00 |
|
Dennis Schubert
|
b04ce82c49
|
Merge branch 'next-minor' into develop
|
2016-11-06 02:44:00 +01:00 |
|
Dennis Schubert
|
fa329cc032
|
Add changelog note for custom changelog URL.
[ci skip]
|
2016-11-06 02:43:32 +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 |
|
Benjamin Neff
|
1c81c1e3ec
|
Refactor colors for better themeability
|
2016-11-06 02:33:43 +01:00 |
|
Dennis Schubert
|
260cc23357
|
updated 29 locale files [ci skip]
|
2016-11-06 02:31:20 +01:00 |
|
Benjamin Neff
|
0b3f10aef2
|
Merge branch 'next-minor' into develop
|
2016-11-03 22:50:08 +01:00 |
|
Steffen van Bergerem
|
a73e1baaed
|
Show spinner when loading comments
closes #7170
|
2016-11-03 22:50:03 +01:00 |
|
Steffen van Bergerem
|
951149dd24
|
Properly format JSON for reshares to hide 'reshare' button on already reshared posts
closes #7169
fixes #4816 and #6594
|
2016-11-03 22:44:12 +01:00 |
|
Benjamin Neff
|
694d4cbc0f
|
Merge branch 'next-minor' into develop
|
2016-11-02 23:03:36 +01:00 |
|
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
|
bf3461ee3a
|
Merge branch 'next-minor' into develop
|
2016-11-02 22:54:08 +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
|
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 |
|
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 |
|
Dennis Schubert
|
69ec1d6fe8
|
Merge branch 'next-minor' into develop
|
2016-10-28 00:36:22 +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
|
305958ff85
|
Merge branch 'next-minor' into develop
|
2016-10-27 02:30:37 +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 |
|
Benjamin Neff
|
4480f59e6e
|
Remove empty pod and make pod host NOT NULL
|
2016-10-27 02:25:40 +02:00 |
|
Dennis Schubert
|
1e6e20bbfe
|
Merge branch 'next-minor' into develop
|
2016-10-27 02:25:03 +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 |
|
Dennis Schubert
|
7cf63282af
|
Merge branch 'next-minor' into develop
|
2016-10-27 02:23:40 +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 |
|