Benjamin Neff
|
b319e0caa2
|
Merge branch 'next-minor' into develop
|
2016-11-15 22:56:06 +01:00 |
|
Steffen van Bergerem
|
37b34237b9
|
Force jasmine fails on syntax errors
closes #7185
|
2016-11-15 22:50:17 +01:00 |
|
Steffen van Bergerem
|
cdce25374f
|
Reduce i18n.load side effects
closes #7184
|
2016-11-15 22:46:06 +01:00 |
|
Steffen van Bergerem
|
a951c40ba0
|
Only reload profile header when changing aspect memberships
closes #7183
fixes #7072
|
2016-11-15 22:37:39 +01:00 |
|
Steffen van Bergerem
|
3930069e67
|
Leave help view spec with the default locale
|
2016-11-15 22:36:06 +01:00 |
|
Steffen van Bergerem
|
1863137161
|
Use string-direction gem for rtl detection
closes #7181
|
2016-11-15 22:33:56 +01:00 |
|
Benjamin Neff
|
6562397f64
|
Merge branch 'next-minor' into develop
|
2016-11-14 03:28:09 +01:00 |
|
Steffen van Bergerem
|
457cf2aafb
|
Fix deprecation warnings in conversations controller spec
closes #7187
|
2016-11-14 03:27:55 +01:00 |
|
Steffen van Bergerem
|
7cd2232812
|
Only allow conversation creation in controller with mututal contacts
|
2016-11-14 03:27:15 +01:00 |
|
Benjamin Neff
|
13869aa75c
|
Merge branch 'next-minor' into develop
|
2016-11-13 20:11:38 +01:00 |
|
Steffen van Bergerem
|
117b17e25e
|
Remove unused conversations modal fixture
closes #7129
|
2016-11-13 20:11:34 +01:00 |
|
Steffen van Bergerem
|
8983554f94
|
Improve profile header jasmine test
* append html to spec.content() instead of body
* don't append the unused conversations modal fixture
* actually test that showModal has been called
|
2016-11-13 20:08:59 +01:00 |
|
Steffen van Bergerem
|
cbe3ca5cf6
|
Improve conversations form jasmine test
* test that tag element are removed when clicking the tag's remove button
|
2016-11-13 20:08:59 +01:00 |
|
Steffen van Bergerem
|
4c86b64532
|
Improve contacts page jasmine test
* append html to spec.content() instead of body
* don't append the unused conversations modal fixture
* actually test that showModal has been called
|
2016-11-13 20:08:59 +01:00 |
|
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 |
|