Benjamin Neff
7baa3c0e24
Merge pull request #7495 from codebearsteam/6559-ergonomy-suggestion
...
Issue #6559 : Changed default mail FROM header and tests
fixes #6559
2017-07-25 01:13:32 +02:00
Benjamin Neff
da904ac025
Merge pull request #7503 from SuperTux88/quickfix-multi-stream-ignore-users-with-tags
...
Exclude ignored people from followed tags when building stream-relation
2017-07-24 01:35:58 +02:00
Benjamin Neff
d8410e21b3
Merge pull request #7259 from Flaburgan/bump-ruby-2.4
...
Bump ruby to 2.4
2017-07-23 18:00:06 +02:00
flaburgan
33fa2e8a9e
Bump ruby to 2.4
2017-07-23 02:41:29 +02:00
Benjamin Neff
5d2ddfede1
Update changelog [ci skip]
2017-07-14 02:34:53 +02:00
Benjamin Neff
58609e42d7
Merge branch 'next-minor' into develop
2017-07-05 02:10:24 +02:00
Benjamin Neff
58aa59fb8e
Start 0.6.8.0 cycle
2017-07-05 02:07:45 +02:00
Benjamin Neff
068acd93ce
Cleanup changelog (no bugfixes in this release)
2017-07-05 02:04:07 +02:00
Benjamin Neff
0e13a316f6
Cleanup some translations
...
closes #7465
2017-07-05 02:02:13 +02:00
flaburgan
ddda28102c
Clean up the footer links a bit
...
closes #7446
2017-07-05 01:59:18 +02:00
flaburgan
07d0ed916d
Fix design issues + pronto
...
closes #7295
2017-07-05 01:51:07 +02:00
Benjamin Neff
d71aa6a54a
Merge branch 'next-minor' into develop
2017-07-03 03:46:54 +02:00
atulonruby
df1139234f
Warn user if he leaves profile editing page #6520
...
closes #7473
closes #6589
2017-07-03 03:45:57 +02:00
Benjamin Neff
44e10a9172
Merge branch 'next-minor' into develop
2017-05-26 01:51:37 +02:00
Mahonri Gibson
5739f67605
Save email without confirmation when podmail is disabled.
...
fixes #7195
closes #7455
2017-05-26 01:50:55 +02:00
Benjamin Neff
a7093c6f7d
Merge branch 'next-minor' into develop
2017-05-23 00:17:19 +02:00
Benjamin Neff
a6869197d8
Start 0.6.7.0 cycle
...
[ci skip]
2017-05-23 00:15:06 +02:00
Dennis Schubert
1e06fd786c
Merge branch 'next-minor' into develop
2017-05-21 12:06:41 +02:00
Benjamin Neff
e177706769
Add admin account username to NodeInfo metadata
...
Fixes #7421
closes #7447
2017-05-21 12:06:35 +02:00
Benjamin Neff
e463397122
Merge branch 'next-minor' into develop
2017-05-16 00:37:06 +02:00
cmrd Senya
6abd0509f9
Use guid instead of id at permalink and in SPV
...
This changes links from /posts/:id to /posts/:guid where the links are
not clicked very often. ID search is faster than guid search so we can't
change it everywhere, but these links are not very useful for clicking,
but can be used for easier guid look up.
closes #7453
2017-05-16 00:36:43 +02:00
Benjamin Neff
ee05cc8270
Merge branch 'next-minor' into develop
2017-05-13 02:09:25 +02:00
Mahonri Gibson
942e090b3a
Fix welcome message crashing server if podmin is set to invalid user.
...
Fixes #7363
closes #7452
2017-05-13 02:08:51 +02:00
Benjamin Neff
f4f0e724c6
Merge branch 'next-minor' into develop
2017-05-11 04:24:29 +02:00
Benjamin Neff
02b4d3f347
Don't raise when the public key of a person is "broken"
...
Breaking a public key of a person can be used to "block" receiving posts
from this person on the pod. So we should handle that case better and
not just trigger many retries for something that will fail again.
closes #7448
2017-05-11 04:24:13 +02:00
Benjamin Neff
7d9c6c85bd
Remove rails_admin
...
This is now broken since more than half a year, so I think we can just
remove it.
Podmins shouldn't use this anyway, because it does bad things, like
replacing NULL with an empty string when editing something. If we really
need an admin interface for something, we should add it to our own admin
panel at /admins/dashboard.
Fixes #7027 and #6413
closes #7440
2017-05-11 04:18:33 +02:00
Benjamin Neff
064fc3cc45
Merge branch 'next-minor' into develop
2017-05-05 02:30:56 +02:00
Steffen van Bergerem
23d3d9dc3f
Use post page title for atom feeds and add entry author
...
Fixes #7249
closes #7420
2017-05-05 02:30:46 +02:00
Steffen van Bergerem
fc28d6af35
Fix first comment in mobile view with french locale
...
Fixes #7438 . The regression has possibly been introduced by #7207 .
closes #7441
2017-05-05 02:26:22 +02:00
Benjamin Neff
caaea50cf6
Merge branch 'next-minor' into develop
2017-04-26 22:18:02 +02:00
pskosinski
afef279aff
Fix untranslatable photo upload button's hover text
...
closes #7429
fixes #7427
2017-04-26 22:17:44 +02:00
Dennis Schubert
3eeee4b5de
Merge branch 'next-minor' into develop
2017-04-12 01:29:50 +02:00
Dennis Schubert
69be912478
Start 0.6.6.0 cycle
...
[ci skip]
2017-04-12 01:28:18 +02:00
Benjamin Neff
e91a0a57a3
Merge branch 'next-minor' into develop
2017-04-08 00:00:56 +02:00
Steffen van Bergerem
3971a24d68
Add avatar fallback for avatar next to publisher
...
closes #7414
2017-04-08 00:00:45 +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
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
610f39e991
Bump nokogiri for a security release
2017-03-29 22:29:05 +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
Benjamin Neff
5de83b881b
Merge pull request #7399 from svbergerem/remove-statistics-json
...
Remove statistics.json
2017-03-28 00:08:16 +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
4a944c5ab4
Use small avatar in the person json
...
closes #7376
2017-03-27 00:02:10 +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
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
af0a5e32a1
Merge pull request #7369 from svbergerem/color-themes-i18n
...
i18n for color themes
2017-03-26 03:12:54 +02:00
Benjamin Neff
06b61b6480
Merge branch 'next-minor' into develop
2017-03-25 20:38:00 +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
b0da14c383
Merge pull request #7386 from cmrd-senya/comment-mention-front-end
...
Comment mentions front-end
2017-03-24 00:20:37 +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
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
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
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
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
8e4261100b
Create asterisk.png without digest after precompile
...
fixes #7317
closes #7322
2017-03-04 23:58:08 +01:00
Benjamin Neff
e1bf447aad
Merge branch 'next-minor' into develop
2017-03-04 21:08:18 +01:00
Steffen van Bergerem
12deda1429
Change regexp for hashtags
...
Fixes #5765 , fixes #5815 , supersedes #6099 .
closes #7350
2017-03-04 21:08:11 +01:00
Benjamin Neff
0488902b66
Merge branch 'next-minor' into develop
2017-02-19 21:56:19 +01:00
Steffen van Bergerem
bb2826842f
Only display invite link on contacts page if invitations are enabled
...
fixes #7340
closes #7342
2017-02-19 21:55:10 +01:00
Benjamin Neff
fa85b17890
Merge branch 'next-minor' into develop
2017-02-19 03:20:39 +01:00
Steffen van Bergerem
0627cdaf43
Use autosize in modals
...
Fixes #7338 and missing autosize in conversation forms on the profile page
and the contacts page. Regression from #6674 .
closes #7339
2017-02-19 03:20:26 +01:00
Benjamin Neff
ec2c4a8564
Merge branch 'next-minor' into develop
2017-02-18 23:00:59 +01:00
Steffen van Bergerem
e3c9e9c9f1
Improve comment service spec for limited post the user can't see
...
closes #7337
2017-02-18 23:00:49 +01:00
Benjamin Neff
f9cf844602
Merge pull request #7280 from svbergerem/remove-chartbeat-and-mixpanel
...
Remove chartbeat and mixpanel support
2017-02-17 22:22:30 +01:00
Benjamin Neff
f1f1d09944
Merge pull request #7302 from svbergerem/simplify-mentions-publisher
...
Simplify mentions in the publisher
2017-02-15 03:15:01 +01:00
Steffen van Bergerem
810e43787c
Merge branch 'next-minor' into develop
2017-02-14 10:37:05 +01:00
Benjamin Neff
d68ad916c8
Remove whitespace from author link
...
closes #7330
2017-02-14 10:36:58 +01:00
Benjamin Neff
8a409c815c
Merge branch 'next-minor' into develop
2017-02-14 00:30:53 +01:00
Steffen van Bergerem
5f8c838750
Change color of author-name on hover
...
closes #7326
2017-02-14 00:30:44 +01:00
Benjamin Neff
d984178685
Merge pull request #7327 from svbergerem/display-mentions-in-comment
...
Render mentions as links in comments
2017-02-13 23:58:28 +01:00
Steffen van Bergerem
339c25f333
Merge pull request #7324 from SuperTux88/at-before-mention-links
...
Display @ before mentions
2017-02-13 22:06:50 +01:00
Steffen van Bergerem
99351bd152
Merge branch 'next-minor' into develop
2017-02-13 14:21:29 +01:00
Benjamin Neff
e92431ba88
Remove some unused color-theme overrides
...
After #7318 $link-color is used by default, no need to override anymore.
closes #7325
2017-02-13 14:21:20 +01:00
Benjamin Neff
2f9a032b38
Merge branch 'next-minor' into develop
2017-02-12 21:01:36 +01:00
Steffen van Bergerem
9558e747e4
Increase time to wait before showing the hovercard
...
closes #7319
2017-02-12 21:01:21 +01:00
Benjamin Neff
cdb220be8d
Merge branch 'next-minor' into develop
2017-02-11 19:37:30 +01:00
Steffen van Bergerem
dc8d66520b
Use $link-color for text and $brand-primary for backgrounds/buttons
...
closes #7318
2017-02-11 19:37:07 +01:00
Steffen van Bergerem
f1510ba2d6
Merge branch 'next-minor' into develop
2017-02-08 12:58:27 +01:00
Benjamin Neff
d9a1297271
Refactor PublisherHelper and move publisher_open? method
...
closes #7311
2017-02-08 12:58:13 +01:00
Dennis Schubert
63077bfeaf
Merge branch 'next-minor' into develop
2017-02-05 10:34:48 +01:00
Steffen van Bergerem
690bbd9db3
Link to community guidelines from left navbar
...
closes #7298
2017-02-05 10:34:44 +01:00
Dennis Schubert
29e712dfc8
Merge pull request #7305 from SuperTux88/improve-mention-syntax
...
Improve mention syntax
2017-02-05 10:30:06 +01:00
