Steffen van Bergerem
82629c5979
Merge branch 'next-minor' into develop
2017-04-06 14:10:31 +02:00
Steffen van Bergerem
791e74104e
Fix taggable path in text formatter comment [ci skip]
2017-04-06 14:10:12 +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
Steffen van Bergerem
a61031710c
Merge branch 'next-minor' into develop
2017-04-02 12:51:35 +02:00
cmrd Senya
f1c1091162
Remove unused cucumber step
...
"should see JSON"
closes #7410
2017-04-02 12:51:27 +02:00
cmrd Senya
483f738a0f
Remove unused json_spec gem
2017-04-02 12:48:37 +02:00
Benjamin Neff
b639385c46
Merge pull request #7407 from svbergerem/statistics-json-500
...
Return 406 instead of 500 for statistics.json
2017-03-31 01:00:06 +02:00
Steffen van Bergerem
c94bac3cf9
Return 406 instead of 500 for statistics.json
...
Fixes #7406
2017-03-30 23:17:58 +02:00
Dennis Schubert
9a76cf7d3b
Merge branch 'next-minor' into develop
2017-03-29 22:33:43 +02:00
Dennis Schubert
8e8af0bfa5
Merge branch 'master' into next-minor
2017-03-29 22:32:20 +02:00
Dennis Schubert
2b32e9b592
Merge branch 'hotfix/0.6.4.1'
2017-03-29 22:29:56 +02:00
Dennis Schubert
610f39e991
Bump nokogiri for a security release
2017-03-29 22:29:05 +02:00
Benjamin Neff
6a5c34535d
Merge branch 'next-minor' into develop
2017-03-28 19:55:48 +02:00
flaburgan
6f14040e8e
Fix invitation from sidebar
...
closes #7404
2017-03-28 19:55:42 +02:00
flaburgan
577ead7768
Fix mobile delete original reshare test
...
closes #7403
2017-03-28 19:55:27 +02:00
Dennis Schubert
ec6a6d5138
Merge branch 'next-minor' into develop
2017-03-28 06:42:53 +02:00
Waithamai
38450eacea
Added spacing between list items fixes #7400
...
closes #7401
2017-03-28 06:42:43 +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
5de83b881b
Merge pull request #7399 from svbergerem/remove-statistics-json
...
Remove statistics.json
2017-03-28 00:08:16 +02:00
Steffen van Bergerem
e8ee74ef87
Remove statistics.json
2017-03-27 15:54:34 +02:00
Benjamin Neff
d9b02418b6
Merge branch 'next-minor' into develop
2017-03-27 00:04:53 +02:00
Steffen van Bergerem
4a56c0465c
Remove outdated rtl styles
...
These lines might have been necessary some time ago but now they are making things worse.
closes #7374
2017-03-27 00:04:38 +02:00
Steffen van Bergerem
2c53c2941e
Remove unused rtl styles
2017-03-27 00:03:06 +02:00
Steffen van Bergerem
d59ede46df
Remove styles for removed elements
2017-03-27 00:03:06 +02:00
Steffen van Bergerem
4a944c5ab4
Use small avatar in the person json
...
closes #7376
2017-03-27 00:02:10 +02:00
Steffen van Bergerem
13a44be306
Reduce size of conversation recipients in conversation form
...
Fixes #7321 .
2017-03-27 00:01:29 +02:00
Steffen van Bergerem
6f3c61d8f2
Increase maximal height of large thumbnail
...
Fixes #6248 , supersedes #6244 .
closes #7383
2017-03-27 00:00:41 +02:00
Steffen van Bergerem
8a98cd4517
Refactor destroyModel function in base view
...
closes #7385
2017-03-26 23:53:37 +02:00
Steffen van Bergerem
3ce4bba383
Only remove post from stream after successful response
...
Pass destroyModel from post control view to post view
and don't listen to the remove event in the post view
anymore. The `remove` function will be called from the
base view.
Fixes #5445
2017-03-26 23:50:48 +02:00
Steffen van Bergerem
5b0b3d989b
Merge pull request #7394 from SuperTux88/mention-backport-on-receive
...
Only backport mention syntax when the author is local
2017-03-26 12:26:52 +02:00
Benjamin Neff
04e653bd69
Merge branch 'next-minor' into develop
2017-03-26 04:15:19 +02:00
Steffen van Bergerem
aa55a7a023
Remove custom jquery input event
...
closes #7371
2017-03-26 04:14:59 +02:00
Benjamin Neff
a07bd94ec6
Merge pull request #7389 from svbergerem/fix-comment-mentions-spacing
...
Fix comment mentions spacing
2017-03-26 04:06:34 +02:00
Benjamin Neff
d04a553ae2
Merge pull request #7380 from svbergerem/refactor-mentions-css
...
Refactor mentions-input-box css
2017-03-26 04:04:56 +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
Benjamin Neff
d0fcdc254e
Only backport mention syntax when the author is local
...
We don't need to change new to old syntax when we receive a post from a
newer pod, since we can handle the new syntax. This is only needed when
sending it to older pods.
related to #7392
2017-03-25 23:42:19 +01:00
Benjamin Neff
06b61b6480
Merge branch 'next-minor' into develop
2017-03-25 20:38:00 +01:00
Steffen van Bergerem
57b7debdb6
Refactor location stream view, remove unused function
...
closes #7364
2017-03-25 20:37:37 +01:00
Steffen van Bergerem
05e9798027
Fix sharing indicator on profile page for blocked users
...
closes #7382
2017-03-25 20:35:45 +01:00
Steffen van Bergerem
d3de97b244
Disable autocomplete for the conversation form recipient input
...
closes #7375
2017-03-25 20:34:13 +01:00
Steffen van Bergerem
a639951b20
Remove unused jquery.infinitescroll
...
closes #7370
2017-03-25 20:32:33 +01:00
Steffen van Bergerem
f5c937b9cf
Fix comment mentions spacing
2017-03-24 13:11:16 +01:00
Steffen van Bergerem
a1199ac219
Remove mentions-input-box
2017-03-24 01:14:01 +01:00
Steffen van Bergerem
d38eabf333
Refactor mentions-input-box css
2017-03-24 01:07:39 +01:00
Steffen van Bergerem
b0da14c383
Merge pull request #7386 from cmrd-senya/comment-mention-front-end
...
Comment mentions front-end
2017-03-24 00:20:37 +01:00
cmrd Senya
c2f352d837
Comment mentions front-end
2017-03-24 00:40:24 +02:00
