Commit graph

1930 commits

Author SHA1 Message Date
Benjamin Neff
d5f5e1991b
Merge branch 'next-minor' into develop 2018-04-16 01:26:56 +02:00
Dennis Schubert
6918dbc761
Randomize start times of daily Sidekiq-Cron jobs
closes #7787
2018-04-16 01:26:48 +02:00
Benjamin Neff
66175f6908
Merge branch 'next-minor' into develop 2018-04-12 01:56:07 +02:00
Benjamin Neff
686310fb8e
Simplify /podmin redirect
Some podmins were confuse how they can disable this redirect and I think
the rule with two users can actually be a little confusing. I think the
main goal of this page to give the podmin a little start and I think
after they configured everything, the pod works and they found the link
to the wiki to make themself an admin, it is OK to remove the redirect.

Also it's bad for single-user pods where this page always stays active,
even if they are an admin, but have only one user. It's more useful for
single-user pods to have the login on the home page.

closes #7783
2018-04-12 01:55:46 +02:00
Steffen van Bergerem
4aec9fbb42
Fix mention syntax backport for two immediately consecutive mentions
Fixes #7695.

closes #7777
2018-04-12 01:44:44 +02:00
Steffen van Bergerem
01ae004518
Make public stream accessible for logged out users
Fixes #6564.

closes #7775
2018-04-12 01:42:17 +02:00
Benjamin Neff
7d6623d069
Remove contacts page on profiles
closes #7769
2018-04-12 01:40:49 +02:00
Benjamin Neff
89f7f97294
Merge branch 'next-minor' into develop 2018-04-10 01:58:07 +02:00
Benjamin Neff
9b83df9646
Merge branch 'master' into next-minor 2018-04-10 01:57:56 +02:00
Benjamin Neff
f4ea138a64
Don't return a SafeString after truncate 2018-04-10 01:54:29 +02:00
Dennis Schubert
ae17248b2e
Merge pull request #7734 from Fensterbank/client-side-picture-resize
Resize images on client-side before uploading
2018-04-02 10:38:51 +02:00
Benjamin Neff
c84411ea62
Merge branch 'next-minor' into develop 2018-03-25 08:37:11 +02:00
cmrd Senya
0080a2567f
StatusMessageController#create: respond 422 when aspect_ids are wrong
fixes #3862

closes #7742
2018-03-25 08:31:32 +02:00
cmrd Senya
f632f8a1f8
Include templates to main.js
This is needed to properly initialize Handlebars partials without
a document ready handler.

fixes #7739

closes #7740
2018-03-25 08:27:23 +02:00
Benjamin Neff
38d92cc84b
Merge branch 'next-minor' into develop 2018-03-22 23:17:15 +01:00
kas70
53b733f0cd
adds byebug history to gitignore
closes #7744
2018-03-22 23:15:38 +01:00
Benjamin Neff
12cb2be641
Merge branch 'next-minor' into develop 2018-03-13 00:02:52 +01:00
Benjamin Neff
4d54c85eee
Start 0.7.5.0 cycle 2018-03-12 23:59:31 +01:00
Dennis Schubert
29daea1b0a
Merge branch 'next-minor' into develop 2018-03-10 04:46:01 +01:00
Benjamin Neff
3bb6d6d677
Bump rails-i18n
fixes #7527

closes #7731
2018-03-10 04:45:54 +01:00
Benjamin Neff
b263cf7e6d
Merge branch 'next-minor' into develop 2018-03-07 00:39:52 +01:00
Dennis Schubert
3643612b1c
Back to Top: Make sure to re-check the visibility after the scrolling is done
If a user scrolls just below the 1000px threshold and clicks the back-to-top button within 250ms, we'll never hide the button as the scroll event gets throttled away. That's rather inconvenient.

closes #7729
2018-03-07 00:39:36 +01:00
Dennis Schubert
f1d71eb592
Merge branch 'next-minor' into develop 2018-02-27 00:47:37 +01:00
Benjamin Neff
f883c6ede2
Add /camo/ to robots.txt
Camo only proxies images hosted somewhere else, so it doesn't make sense
to add the proxied versions to search engines. It only creates traffic
for camo when /camo/* urls are in search results.

closes #7726
2018-02-27 00:47:32 +01:00
Dennis Schubert
ab903af80b
Merge branch 'next-minor' into develop 2018-02-25 04:35:53 +01:00
Benjamin Neff
beeb073dbe
Fix followed tags posts in stream for posts with multiple tags
When there were posts with many followed tags they were returned
multiple times, resulting in less than 15 unique posts. That resulted in
some posts to be missed in the stream.

Fixes #4503

closes #7715
2018-02-25 04:35:49 +01:00
Dennis Schubert
5d23c6bfcf
Merge branch 'next-minor' into develop 2018-02-25 04:34:08 +01:00
Benjamin Neff
f0aca56c8f
Don't retry for PublicKeyNotFound
We only return `nil` when we know the person, but don't know the key or
the key is invalid, so it doesn't make sense to retry in this case. When
the person isn't known and can't be fetched we raise a DiscoveryError
which will be retried.

Also the errors were moved to the `Signable` module in the last release.

closes #7717
2018-02-25 04:34:04 +01:00
Dennis Schubert
3bc0fc16a2
Merge branch 'next-minor' into develop 2018-02-25 04:33:07 +01:00
Benjamin Neff
602a1dcd55
Store edited_at for relayables in additional_data
closes #7718
2018-02-25 04:33:03 +01:00
Dennis Schubert
1903bfd307
Merge pull request #7581 from Fensterbank/improved-profile-picture-editor
Profile photo upload with cropping function
2018-02-25 04:17:44 +01:00
Benjamin Neff
0cb2a8f4d7
Merge branch 'next-minor' into develop 2018-02-22 00:49:32 +01:00
Benjamin Neff
c89b2ad809
Prevent duplicate mention notifications when the post is received twice
closes #7721
2018-02-22 00:49:21 +01:00
Brad Koehn
b80eb01f34
piped bin/bundle commands to suppress warnings when run on readonly filesystems
closes #7719
2018-02-22 00:45:45 +01:00
Benjamin Neff
0b921c6657
Merge branch 'next-minor' into develop 2018-02-17 19:26:15 +01:00
cmrd Senya
3e31b91b11
Add @nophantomjs tag to default cucumber profile
Use this tag for tests which can't work with PhantomJS, but which we
can run with Selenium using some other profile (not implemented here).

closes #6418
2018-02-17 19:24:39 +01:00
Dennis Schubert
049db8626d
Merge branch 'next-minor' into develop 2018-02-10 16:13:44 +01:00
Saverio Miroddi
1ebb5dd72d
Don't print a warning when starting the server outside a Git repo
Currently, git checks are performed on server start, even when outside a git
repository.

This commit verify the presence of a git repository (via `git status` exit
code), and perform checks only if it exists.

closes #7712
2018-02-10 16:13:38 +01:00
Dennis Schubert
948e31b10c
Merge branch 'next-minor' into develop 2018-02-09 03:15:38 +01:00
Dennis Schubert
f8ce276ddc
Merge branch 'master' into next-minor 2018-02-09 03:15:18 +01:00
Dennis Schubert
b23696bb88
Merge branch 'hotfix/0.7.3.1' 2018-02-09 03:13:51 +01:00
Benjamin Neff
fc2397c062
Merge branch 'next-minor' into develop 2018-02-08 22:55:43 +01:00
Benjamin Neff
a8fcbb3365
Merge branch 'master' into next-minor 2018-02-08 22:55:30 +01:00
Benjamin Neff
e0687e8de3
Upgrade Nokogiri to fix a disclosed vulnerability in libxml2 2018-02-08 22:44:11 +01:00
Dennis Schubert
3121de7954
Merge branch 'next-minor' into develop 2018-02-01 23:49:55 +01:00
Dennis Schubert
7abb0518e9
Start 0.7.4.0 cycle
[ci skip]
2018-02-01 23:48:04 +01:00
Dennis Schubert
f6e359a669
Merge branch 'next-minor' into develop 2018-02-01 23:42:04 +01:00
Benjamin Neff
5e157dc9c3
Send participation after receiving a public post
This is to let the author of the post know, that this pod is interested
in updates about this post.

The sending user is only used to verify that the participation was sent
from this pod, but lets use an admin/podmin account if available.

closes #7708
2018-02-01 23:40:51 +01:00
Benjamin Neff
6c5b8b73af
Fix post_message for posts without text
fixes #7700
closes #7706
2018-02-01 23:39:18 +01:00
Benjamin Neff
a32cac06ab
Retry Contact messages 20 time (about two weeks)
closes #7705
2018-02-01 23:37:53 +01:00
Benjamin Neff
746ff52256
Fix mention in #newhere message when invited by another person
fixes #7701
closes #7702
2018-02-01 23:35:04 +01:00
Benjamin Neff
f23966ef87
Make mobile bookmarklet work the same way as with desktop UI
This fixes that it fails when you call it without notes parameter.

closes #7698
2018-02-01 23:33:36 +01:00
Benjamin Neff
750481497f
Merge branch 'next-minor' into develop 2018-01-31 22:17:07 +01:00
Fla
a72feee812
Changelog misspelling [ci skip]
closes #7710
2018-01-31 22:15:27 +01:00
Benjamin Neff
1d683295e1
Merge branch 'next-minor' into develop 2018-01-21 21:30:59 +01:00
flaburgan
b156c2f1a3
Use current-password and new-password for password autocomplete
closes #7642
fixes #7633
2018-01-21 21:29:06 +01:00
Dennis Schubert
9ec07911de
Merge branch 'next-minor' into develop 2018-01-12 17:56:17 +01:00
Dennis Schubert
5a6bd47000
Merge branch 'master' into next-minor 2018-01-12 17:56:01 +01:00
Benjamin Neff
5bc4473e11
Fix notifications when people remove their birthday date
Some people may remove their birthday date after the notification was
sent, which then breaks the notification page for other users. Let's
just display the date when the notification was created, and not display
the users updated birthday date. When users update from date A to B it
always looks weird anyway, when we display the same new date B twice on
different days, or display two different dates for the same user.

We could remove notifications when users change or remove their
birthday, but that would be way more complex and also we usually don't
remove notifications (not even for deleted posts).

Fixes #7689

closes #7691
2018-01-12 17:52:57 +01:00
Benjamin Neff
b3d3445a7e
Merge branch 'next-minor' into develop 2018-01-09 00:06:44 +01:00
Brad Koehn
1a3c16eb6e
update to support 280 character Twitter
closes #7694
closes #7662
fixes #7661
2018-01-09 00:05:33 +01:00
Dennis Schubert
13d24cc611
Merge branch 'next-minor' into develop 2018-01-08 21:15:49 +01:00
Janakas
0347507b20
Delete archive files when closing an account
closes #7684
2018-01-08 21:15:41 +01:00
Benjamin Neff
e059b8ad48
Merge branch 'next-minor' into develop 2018-01-05 03:46:06 +01:00
Janakas
d150a6b2af
Fix invite link on /contacts
closes #7690
2018-01-05 03:45:54 +01:00
Benjamin Neff
d3632e116a
Merge branch 'next-minor' into develop 2018-01-05 01:50:27 +01:00
Benjamin Neff
c135ace407
Fix notifications when people remove their birthday date
Some people may remove their birthday date after the notification was
sent, which then breaks the notification page for other users. Let's
just display the date when the notification was created, and not display
the users updated birthday date. When users update from date A to B it
always looks weird anyway, when we display the same new date B twice on
different days, or display two different dates for the same user.

We could remove notifications when users change or remove their
birthday, but that would be way more complex and also we usually don't
remove notifications (not even for deleted posts).

Fixes #7689

closes #7691
2018-01-05 01:50:11 +01:00
Benjamin Neff
a2ca74265c
Merge branch 'next-minor' into develop 2017-12-30 15:41:04 +01:00
Janakas
2e3b7dee1e
Check for a running redis in script/server
Fixes #5267

closes #7685
2017-12-30 15:40:30 +01:00
Benjamin Neff
151a169791
Merge branch 'next-minor' into develop 2017-12-25 20:55:27 +01:00
Benjamin Neff
ba85f35ae9
Merge branch 'release/0.7.2.0' into next-minor 2017-12-25 20:55:22 +01:00
Benjamin Neff
e0eb76eb2a
Remove aspect_ids parameter from publisher
closes #7683
2017-12-25 20:54:10 +01:00
Benjamin Neff
c3c0059734
Merge branch 'next-minor' into develop 2017-12-18 04:57:11 +01:00
Benjamin Neff
c5536395c0
Start 0.7.3.0 cycle 2017-12-18 04:55:45 +01:00
Benjamin Neff
d42801a737
Merge branch 'next-minor' into develop 2017-12-18 04:41:49 +01:00
flaburgan
53603917eb
Fix deformed hovercards avatar
closes #7656

fixes #6039
2017-12-18 04:40:13 +01:00
Rete2
fc33a2ac5d
Create birthday notification and mailer
closes #7624

fixes #1649
2017-12-18 04:34:35 +01:00
Benjamin Neff
21980681b1
Merge branch 'next-minor' into develop 2017-11-01 00:50:23 +01:00
Benjamin Neff
89eeec72d3
Merge branch 'master' into next-minor 2017-11-01 00:50:17 +01:00
Benjamin Neff
7c4648030f
Run rake directly without xvfb on travis
closes #7654
2017-11-01 00:46:36 +01:00
Benjamin Neff
6351399197
Merge branch 'next-minor' into develop 2017-10-27 02:27:11 +02:00
Benjamin Neff
70410d1691
Ignore invalid diaspora:// links
Fixes #7651

closes #7652
2017-10-27 02:26:52 +02:00
Benjamin Neff
30a940f483
Merge branch 'next-minor' into develop 2017-10-20 02:56:20 +02:00
Benjamin Neff
4bf0a74382
Merge branch 'release/0.7.1.0' into next-minor 2017-10-20 02:56:16 +02:00
Benjamin Neff
0f688b9d73
Group notifications by updated_at
The notifications need to be grouped by the same date as they are
sorted, otherwise the date used for the group doesn't match all
timestamps in the group and also the groups are sorted by the wrong
date.

This fixes #7647, a regression of #7568.

closes #7648
2017-10-20 02:56:06 +02:00
Benjamin Neff
66095e3f03
Merge branch 'next-minor' into develop 2017-10-18 01:08:48 +02:00
Benjamin Neff
31559ce483
Merge branch 'release/0.7.1.0' into next-minor 2017-10-18 01:08:35 +02:00
Benjamin Neff
9673f45ff9
Cleanup empty signatures
Some relayables from redmatrix and hubzilla have empty signatures. They
are invalid and break therefore the user data export.

closes #7644
2017-10-18 01:08:26 +02:00
Benjamin Neff
d6bec055e7
Merge branch 'next-minor' into develop 2017-10-17 01:39:46 +02:00
Benjamin Neff
1ac0dfbbbc
Merge branch 'release/0.7.1.0' into next-minor 2017-10-17 01:39:39 +02:00
cmrd Senya
2e9c6f46dc
Clean up invalid contacts from the DB
Cleans invalid contacts where the referenced user was deleted from the DB or where
the referenced person owner was deleted from the DB.

closes #7632
2017-10-17 01:39:22 +02:00
Benjamin Neff
a36d22d72b
Handle duplicate account migrations
closes #7641
2017-10-17 01:36:25 +02:00
Benjamin Neff
2bd9c663c5
Add rake task to rerun failed account deletions
closes #7639
2017-10-17 01:33:43 +02:00
flaburgan
faff140a3f
Avoid page to jump to top after a post deletion, fixes #7628
closes #7638
2017-10-17 01:30:12 +02:00
Benjamin Neff
2711b9dc83
Cleanup relayables where the signature is missing
When we should have the signature but don't have it, the user data
export fails. There are a few comments from back in 2011 where the
signature is missing.

Also some podmins maybe messed with signatures in their database, which
would also break the exports now.

closes #7637
2017-10-17 01:27:00 +02:00
Benjamin Neff
32067246df
Delete people with invalid diaspora IDs (friendica with path)
closes #7630
2017-10-17 01:23:47 +02:00
Benjamin Neff
4bbb25fedf
Merge branch 'next-minor' into develop 2017-09-28 23:39:56 +02:00
Benjamin Neff
1b6ffa2528
Start 0.7.2.0 cycle 2017-09-28 23:38:57 +02:00
Benjamin Neff
0029f2c1da
Merge branch 'next-minor' into develop 2017-09-28 23:11:56 +02:00
Benjamin Neff
fd36517dee
Limit the number of parallel exports that are allowed to run
closes #7629
2017-09-28 23:11:46 +02:00
Benjamin Neff
b8fb4b6251
Delete invalid oEmbed caches with binary titles
There are a few old oEmbed caches which have the title saved in binary
(because they contain Chinese characters). This fails with
`ActionView::Template::Error ("å" from ASCII-8BIT to UTF-8)`. Since I
found only very old OEmbed caches with this problem (newest from 2012),
I think we can just remove these. When I create a new oEmbed cache for
the same URL it creates it without `!binary`.

closes #7620
2017-09-28 23:10:07 +02:00
Benjamin Neff
3fafcd9307
The diaspora ID validator now validates if it is lowercase
Relaying relayables will fail with non-lowercase authors.

closes #7625
2017-09-28 23:08:41 +02:00
Benjamin Neff
829882cf58
Merge branch 'next-minor' into develop 2017-09-28 03:28:30 +02:00
Benjamin Neff
95fbd3fc66
Don't change the filename of the export everytime the user is touched
closes #7622
2017-09-28 03:28:15 +02:00
Benjamin Neff
ac39e920c8
Add camo to NodeInfo
closes #7617
2017-09-28 03:20:31 +02:00
Benjamin Neff
760b928902
Merge branch 'next-minor' into develop 2017-09-26 04:07:43 +02:00
cmrd Senya
c6ed850a85
Memory usage optimization for archive export
- Removed posts and non contacts from other's data
- Collections are exported in batches to lower memory footprint
- In base exporters create User object instead of keeping instance because it caches all associations

closes #7627
2017-09-26 04:07:18 +02:00
cmrd Senya
9ee9dbe969
Fix local migration run without old private key
It was possible to run migration locally without providing old private
key. This way migration was performed but not dispatched, which obviously
leads to desynchronization of the federation state so let's validate sender
before performing any actual actions.

closes #7558
2017-09-26 04:06:16 +02:00
Benjamin Neff
d410b62323
Merge branch 'next-minor' into develop 2017-09-19 20:28:36 +02:00
Benjamin Neff
c8340f7d28
Merge branch 'master' into next-minor 2017-09-19 20:26:57 +02:00
Benjamin Neff
13d6c23713
Bump nokogiri for a security release 2017-09-19 20:20:57 +02:00
Benjamin Neff
9f18d5ba82
Merge branch 'next-minor' into develop 2017-09-18 03:25:02 +02:00
Benjamin Neff
655fe2a912
Cleanup invalid polls without status message
closes #7614
2017-09-18 03:24:52 +02:00
Benjamin Neff
26a9e50ef9
Merge branch 'next-minor' into develop 2017-09-17 19:36:00 +02:00
Benjamin Neff
4c967903fe
Remove rails_admin_histories table
This was a leftover from rails_admin which was removed in #7440.

closes #7597
2017-09-17 19:35:50 +02:00
Benjamin Neff
84d553555e
Remove unneeded .freeze
closes #7595
2017-09-17 19:32:45 +02:00
Steffen van Bergerem
f9029dbdaf
Merge branch 'next-minor' into develop 2017-08-29 12:55:17 +02:00
Benjamin Neff
e31c5ff4dc
Handle unauthenticated users for likes/comments of private posts
closes #7583
2017-08-29 12:55:03 +02:00
Benjamin Neff
295bb15f73
Merge branch 'next-minor' into develop 2017-08-29 02:17:47 +02:00
Steffen van Bergerem
d130697ce2
Use Bootstrap 3 progress-bar for polls
closes #7600
2017-08-29 02:17:32 +02:00
Steffen van Bergerem
02d9d350d9
Move person extension for prefills to conversations form view
closes #7599
2017-08-29 02:13:57 +02:00
flaburgan
a358bf7b66
Move the notification to be the first icon on the left
closes #7592
2017-08-29 02:09:51 +02:00
Steffen van Bergerem
98cccda6ea
Remove auto detection of languages with highlightjs
Fixes #7476

closes #7591
2017-08-29 02:07:57 +02:00
Steffen van Bergerem
cd09c75c50
Prevent users from zooming in IE Mobile
Fixes #7499

According to https://msdn.microsoft.com/en-us/library/dn629259(v=vs.85).aspx,
“the minimum-scale, maximum-scale, and initial-scale properties are currently
unsupported for Internet Explorer for Windows Phone“.

For further information on the viewport properties see
https://drafts.csswg.org/css-device-adapt/#viewport-meta

closes #7589
2017-08-29 02:04:00 +02:00
goobertron
e7cac2e466
Replace <b> with <strong> in translations
closes #7585
2017-08-29 02:00:34 +02:00
Benjamin Neff
e7a1fe6e78
Merge branch 'next-minor' into develop 2017-08-26 03:16:23 +02:00
Rete2
b556ad5211
show users vote in poll
closes #7550
2017-08-26 03:16:05 +02:00
Benjamin Neff
e08440d7ba
Merge migrations from before 0.6.0.0 to 0000_create_schema.rb
closes #7580
2017-08-26 03:13:05 +02:00
Benjamin Neff
b040f85790
Remove root_guid from reshares when post is deleted
And cleanup old reshares with deleted root posts

closes #7578
2017-08-26 03:08:37 +02:00
Manuel Vögele
0f771dbb10
Remove tiff support from photos
closes #7576
2017-08-26 03:02:51 +02:00
Steffen van Bergerem
ce40ec128f
Fix mixed username and timestamp with LTR/RTL scripts
Fixes #7424

closes #7575
2017-08-26 02:59:24 +02:00
Steffen van Bergerem
c91c19b633
Order notifications by updated_at instead of created_at
closes #7568
2017-08-26 02:57:16 +02:00
Benjamin Neff
5ea7b8ee13
Set fog_provider and load carrierwave/storage/fog if S3 is enabled
Fixes #7563

closes #7566
2017-08-26 02:50:18 +02:00
Steffen van Bergerem
95ac7d0123
Merge branch 'next-minor' into develop 2017-08-25 01:51:47 +02:00
Deus Figendi
e547a89246
fixes #7573 long poll answers
closes #7579
2017-08-25 01:51:31 +02:00
Steffen van Bergerem
974fbd4d03
Merge branch 'next-minor' into develop 2017-08-24 14:57:59 +02:00
Benjamin Neff
9240605ad5
Remove internet explorer version check
This was in all stack traces, which confused people ...

We currently only support IE11, so the version check was already old
again ...

When we break old browser versions, we don't check that for other
browsers. So older IE browser just break, like very other older browser
too.

closes #7557
2017-08-24 14:57:43 +02:00
Steffen van Bergerem
680894d121
Merge branch 'next-minor' into develop 2017-08-19 12:39:42 +02:00
Batyr Nuryyev
951a258a3d
no title upon hover on button
closes #7551
2017-08-19 12:39:35 +02:00
Steffen van Bergerem
9ffbf2f788
Merge branch 'next-minor' into develop 2017-08-19 12:31:31 +02:00
ivan sebastian
3016280ef1
add jquery are you sure to comment form
closes #7530
2017-08-19 12:31:24 +02:00
Benjamin Neff
11372035b8
Start 0.8.0.0 cycle 2017-08-15 01:49:51 +02:00
Benjamin Neff
0c1dd195da
Start 0.7.1.0 cycle 2017-08-15 01:45:45 +02:00
Benjamin Neff
ecd4601bac
Remove 0.6.8.0 from Changelog 2017-08-15 01:40:01 +02:00
Benjamin Neff
cbc3900d59
Merge pull request #6750 from cmrd-senya/account_migration_message
Account migration model/message
2017-08-15 01:13:43 +02:00
Benjamin Neff
d6225daaf3
Merge pull request #7534 from oneturkmen/enable-mobile-web-app-capable-meta
added tag for supporting apps prior to Chrome M39
2017-08-15 00:56:43 +02:00
Benjamin Neff
1bd630d8a1
Merge pull request #7536 from SuperTux88/refactor-publisher-preview
Remove avatar, name, timestamp and interactions from publisher preview
2017-08-14 04:07:56 +02:00
Benjamin Neff
7a21c227f7
Merge pull request #7535 from SuperTux88/unstuck-export
Reset stuck exports and handle errors
2017-08-14 04:05:25 +02:00
Benjamin Neff
9adcca2679
Merge pull request #7533 from SuperTux88/add-indexes
Add missing indexes from #7234
2017-08-13 20:57:39 +02:00
Benjamin Neff
4b1c5685a9
Merge pull request #7529 from SuperTux88/actionview-loglevel
Disable rendering logging in production
2017-08-13 13:12:14 +02:00
Benjamin Neff
138b706259
Merge pull request #7528 from Flaburgan/update-help
Update help
2017-08-13 04:56:03 +02:00
Benjamin Neff
ce5e42c471
Merge pull request #7182 from svbergerem/spv-load-initial-interactions
Single post view interaction refactorings
2017-08-12 19:16:00 +02:00
Benjamin Neff
dc92633dab
Merge pull request #7514 from SuperTux88/rails5
Upgrade to rails 5.1
2017-08-12 15:43:15 +02:00
Steffen van Bergerem
7624854495
Merge pull request #7235 from AugierLe42e/md-editor-mobile-view
Markdown editor final chapter: add editor on publisher, comments and conversation of mobile view
2017-08-12 11:56:57 +02:00
Steffen van Bergerem
a6fb85d10f
Merge pull request #7524 from ivantedja/7273-cmd-enter-submit
support cmd+enter for post submission
2017-08-12 11:55:23 +02:00
Benjamin Neff
280a9e2023
Merge pull request #7523 from svbergerem/improve-adding-posts-to-stream
Improve adding posts to stream
2017-08-11 03:21:48 +02:00
flaburgan
ae73294f41 Improved responsive header 2017-08-10 17:51:01 +02:00
Benjamin Neff
9d2d20e854
Merge pull request #6726 from cmrd-senya/archive-schema
Update the user data export archive format.
2017-08-10 10:54:02 +02:00
Benjamin Neff
eefa6701a8
Merge pull request #7520 from svbergerem/increase-mobile-post-action-size
Include count in mobile post action link and increase reshare counter after reshare
2017-08-10 01:30:39 +02:00
Benjamin Neff
05a4bf262a
Merge pull request #7518 from svbergerem/fix-7245
Prevent publisher from closing in preview mode
2017-08-10 01:27:55 +02:00
Benjamin Neff
c06af05e19
Merge pull request #7516 from Flaburgan/back-to-top-position
Move back to top to the right to avoid misclicks
2017-08-10 01:26:28 +02:00
Steffen van Bergerem
32233ccb99
Merge pull request #7482 from cmrd-senya/markdown-editor-conversations-comments
Add markdown editor on conversations and comments
2017-08-09 21:50:35 +02:00
flaburgan
1eea034844 Add a test 2017-08-07 20:21:51 +02:00
Benjamin Neff
d0896c7823
Merge pull request #7512 from SuperTux88/well-known
Cleanup .gitignore and add note about .well-known to the changelog
2017-08-04 03:08:03 +02:00
Benjamin Neff
c6a0fbe8d4
Cleanup .gitignore and add note about .well-known to the changelog
[ci skip]
2017-08-04 00:54:51 +02:00
Benjamin Neff
20822d3333
Merge pull request #7508 from svbergerem/mobile-comment-link
Direct links to mobile comments
2017-07-31 03:23:13 +02:00
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