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
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
Steffen van Bergerem
b076a1a1ff
Merge branch 'next-minor' into develop
2017-03-23 13:55:23 +01:00
flaburgan
30c2d5d9ac
Close popovers before submitting the publisher to avoid random failures
...
closes #7384
2017-03-23 13:55:14 +01:00
flaburgan
ce15f41a04
Check the publisher is closed when submitted, test it is expanded when filled
2017-03-23 13:55:08 +01:00
Benjamin Neff
8ccc39e296
Merge branch 'next-minor' into develop
2017-03-23 03:42:31 +01:00
Dennis Schubert
bfad786ef5
Add Discourse, remove Loomio, remove mailinglists [ci skip]
...
closes #7387
2017-03-23 03:42:23 +01:00
Steffen van Bergerem
55fee86a95
Merge branch 'next-minor' into develop
2017-03-21 16:29:25 +01:00
flaburgan
3ba84475f2
Check for modal invitation title
...
closes #7381
2017-03-21 16:29:19 +01:00
Steffen van Bergerem
a2ca68b523
Merge branch 'next-minor' into develop
2017-03-21 13:34:59 +01:00
flaburgan
ad7d4d777b
Add links to liked and commented pages within My activity
...
closes #5502
2017-03-21 13:34:47 +01:00
Steffen van Bergerem
80b53adcf0
Merge branch 'next-minor' into develop
2017-03-21 13:08:52 +01:00
flaburgan
b3e3de08b8
Fix block user failing feature
...
closes #7379
2017-03-21 13:08:44 +01:00
Steffen van Bergerem
b2d0feb00d
Merge pull request #7303 from cmrd-senya/jquery3
...
Use jQuery 3
2017-03-18 16:06:05 +01:00
cmrd Senya
71e0bdc411
app_spec fixes
2017-03-18 16:50:55 +02:00
cmrd Senya
c90cb3328e
jQuery 3 integration
2017-03-18 16:50:52 +02:00
Steffen van Bergerem
ca6ce912d3
Merge branch 'next-minor' into develop
2017-03-17 11:34:56 +01:00
cmrd Senya
526ebcfa13
In jQuery 3 "#" is disallowed as a selector
...
here is a somewhat hacky way to force use an empty selector where "#"
was used as a selector before
closes #7372
2017-03-17 11:34:45 +01:00
Benjamin Neff
78359d69d8
Merge branch 'next-minor' into develop
2017-03-12 04:32:47 +01:00
Benjamin Neff
3a6e5d5446
Merge branch 'master' into next-minor
2017-03-12 04:32:06 +01:00
Benjamin Neff
a9c282d986
Merge branch 'release/0.6.4.0'
2017-03-12 04:18:52 +01:00
Benjamin Neff
2c6101fbbd
updated 27 locale files [ci skip]
2017-03-12 04:17:45 +01:00
Steffen van Bergerem
1b9ab16039
Merge branch 'next-minor' into develop
2017-03-06 21:11:54 +01:00
cmrd Senya
2739259fb6
some more replacements for deprecated jquery methods
...
closes #7356
2017-03-06 21:11:47 +01:00
cmrd Senya
f36a4cd1f5
don't use the deprecated ".selector" method
2017-03-06 21:11:13 +01:00
cmrd Senya
a479db1c96
a missing spy
2017-03-06 21:11:12 +01:00
Steffen van Bergerem
0aefc76aaa
Merge branch 'next-minor' into develop
2017-03-06 21:10:31 +01:00
Senya
0e28cfadb2
remove unused setPreload function
...
closes #7354
2017-03-06 21:10:25 +01:00
Steffen van Bergerem
6fce2810e5
Merge pull request #7331 from SuperTux88/fix-mentioned-in-comments-notifications
...
Fix mentioned in comments notifications
2017-03-05 20:07:25 +01:00
Benjamin Neff
509f429cc8
Move 'distinct' to 'allowed_to_be_mentioned_in_a_comment_to'
2017-03-05 17:59:28 +01:00
Benjamin Neff
ce739ef5ad
Merge branch 'next-minor' into develop
2017-03-05 16:29:35 +01:00
Steffen van Bergerem
e82005c517
Disable Rails/HttpPositionalArguments cop
...
See http://rubocop.readthedocs.io/en/latest/cops_rails/#railshttppositionalarguments .
It only applies to Rails >= 5
closes #7353
2017-03-05 16:27:48 +01:00
Benjamin Neff
351b4d28bf
Merge branch 'next-minor' into develop
2017-03-05 01:58:24 +01:00
Benjamin Neff
13698bece5
Start 0.6.5.0 cycle
2017-03-05 01:56:50 +01:00
Benjamin Neff
ae687cf1d5
Merge branch 'next-minor' into develop
2017-03-05 00:01:11 +01:00
Benjamin Neff
10935d623b
Pin thor to prevent accidental upgrades
...
Thor was upgraded again in #7345 , but there are still "warnings" looking
like errors when using "db:migrate" for example. So lets pin it until it is
safe to upgrade.
closes #7351
2017-03-05 00:00:13 +01:00
Benjamin Neff
8e4261100b
Create asterisk.png without digest after precompile
...
fixes #7317
closes #7322
2017-03-04 23:58:08 +01:00
Benjamin Neff
e82ac2199f
Merge branch 'next-minor' into develop
2017-03-04 22:11:22 +01:00
Steffen van Bergerem
612455d41f
Bump faraday and twitter
...
closes #7348
2017-03-04 22:10:23 +01:00
Steffen van Bergerem
c485aa3294
Fix order of gems in Gemfile for pronto
2017-03-04 22:09:54 +01:00
Steffen van Bergerem
af4f98f4ba
Bump haml_lint
2017-03-04 22:09:54 +01:00
Benjamin Neff
13f549b2ba
Bump rubocop
...
And update config for new/updated cops.
2017-03-04 22:09:54 +01:00
Steffen van Bergerem
8330e5ef72
Bump faraday_middleware
2017-03-04 22:09:54 +01:00
Steffen van Bergerem
f1ecb8e121
Bump open_graph_reader
2017-03-04 22:09:54 +01:00
