CSammy
dae1717da8
Add docker setup for development
...
closes #7870
2018-10-28 22:09:06 +01:00
Dennis Schubert
a928e40d7f
Merge branch 'next-minor' into develop
2018-10-14 06:03:12 +02:00
Zachary Rabinovich
c4fed4bbcc
Add the ability to assign roles in the admin panel
...
closes #7868
2018-10-14 06:03:06 +02:00
Dennis Schubert
9bab794ea4
Merge branch 'next-minor' into develop
2018-10-08 02:50:36 +02:00
Dennis Schubert
89d9a865b6
Merge branch 'release/0.7.7.0' into next-minor
2018-10-08 02:50:29 +02:00
Benjamin Neff
fc6893d4fc
Remove facebook integration
...
Facebook removed the API and facebook integration is broken now, so lets
remove it.
closes #7874
2018-10-08 02:50:25 +02:00
Dennis Schubert
26212ba3e0
Merge branch 'next-minor' into develop
2018-10-08 02:43:11 +02:00
Dennis Schubert
3cd6f9abbb
Start 0.7.8.0 cycle
...
[ci skip]
2018-10-08 02:42:10 +02:00
Dennis Schubert
3ebe0e56a8
Merge branch 'next-minor' into develop
2018-10-04 04:37:06 +02:00
Luna Gloaming
45b7f0b119
Added quotation marks for postgresql parameters.
...
As a new, novice user, I ran into an issue where my postgresql
password contained special characters. After a brief conversation
with DenSchub on #diaspora, it was noted that while the example
database configuration had quotes added for mysql, but not for
postgresql, and it was suggested this be improved.
closes #7875
2018-10-04 04:36:57 +02:00
Dennis Schubert
883eb54ecf
Merge branch 'next-minor' into develop
2018-09-30 18:00:57 +02:00
Benjamin Neff
d765b34018
Make sure URLs are encoded before sending them to camo
...
Otherwise camo crashes with:
TypeError [ERR_UNESCAPED_CHARACTERS]: Request path contains unescaped characters
closes #7871
2018-09-30 18:00:49 +02:00
Dennis Schubert
24c7e472d4
Merge branch 'next-minor' into develop
2018-09-30 17:59:12 +02:00
Benjamin Neff
b6333e0b1b
Remove reference to statistics.json
...
and mention /statistics and NodeInfo
closes #7867
2018-09-30 17:58:55 +02:00
Dennis Schubert
026e63b961
Merge branch 'next-minor' into develop
2018-09-08 02:25:44 +02:00
Benjamin Neff
49b63693c9
Fix i18n fallbacks
...
Fallbacks are set in config/initializers/locale.rb and this settings
conflicts with the fallbacks set there.
Fixes #7860
closes #7861
2018-09-08 02:25:36 +02:00
Benjamin Neff
c9f65332de
Merge branch 'next-minor' into develop
2018-09-06 02:33:43 +02:00
Dennis Schubert
65a2b8da12
Include PostsHelper in NotifierHelper
...
Fixes #7852
closes #7853
2018-09-06 02:33:33 +02:00
Dennis Schubert
f66248c315
Merge branch 'next-minor' into develop
2018-09-05 03:19:44 +02:00
Benjamin Neff
08e108d3d8
Fix comment notification subject for posts without text
...
Fixes #7854
2018-09-05 03:17:58 +02:00
Benjamin Neff
ea15403d57
Merge pull request #7655 from Flaburgan/6721-fix-upload-progress-bar
...
Fix multiple photos upload progress bar
2018-07-11 01:37:02 +02:00
Benjamin Neff
dcbdb69e22
Merge branch 'next-minor' into develop
2018-07-11 01:35:50 +02:00
cmrd Senya
a7cc0645e0
Cuke for web+diaspora:// link handler
...
closes #7826
2018-07-11 01:28:53 +02:00
Benjamin Neff
9ff1646cbb
Merge branch 'next-minor' into develop
2018-06-30 23:27:39 +02:00
Benjamin Neff
ac868c9c06
Get processor count with ruby (on linux and mac)
...
closes #7830
2018-06-30 23:27:32 +02:00
Benjamin Neff
b94ef57bbc
Merge branch 'next-minor' into develop
2018-06-20 01:56:25 +02:00
Benjamin Neff
67d6d2ff25
Prepare 0.7.7.0 cycle
2018-06-20 01:38:17 +02:00
Benjamin Neff
f9a59f2ff0
Merge branch 'next-minor' into develop
2018-06-20 00:50:34 +02:00
HankG
5a8bdc1e71
Facebook plugin always appends (via D* post URL) to cross-posts
...
fixes #7770
closes #7774
2018-06-20 00:47:12 +02:00
Benjamin Neff
0b9ba559c7
Merge branch 'next-minor' into develop
2018-06-18 02:48:47 +02:00
flaburgan
3d83fbdbe5
Link to the pod in the emails footer
...
closes #7814
2018-06-18 02:47:56 +02:00
Benjamin Neff
299c04a24a
Merge pull request #7781 from SuperTux88/enable-csp-by-default
...
Enable Content-Security-Policy header by default
2018-06-16 21:21:07 +02:00
Benjamin Neff
f3d2a54050
Merge branch 'next-minor' into develop
2018-06-16 04:36:13 +02:00
cmrd Senya
87968284ba
Support fetching StatusMessage by Poll guid
...
When public fetch is requested with Poll guid, return parent
StatusMessage for it, which includes the Poll in its turn.
closes #7815
2018-06-16 04:36:05 +02:00
Benjamin Neff
212da3a2b7
Merge branch 'next-minor' into develop
2018-06-16 01:23:10 +02:00
Alex Tribble
1b03265c2e
Allow fonts to be served from asset host in CSP.
...
Closes #7796
closes #7825
2018-06-16 01:22:22 +02:00
Benjamin Neff
fa615533f6
Bump kostya-sigar
...
Fixes compatibility with newer glibc
closes #7828
2018-06-16 01:19:36 +02:00
Benjamin Neff
0cb212e6cb
Merge branch 'next-minor' into develop
2018-05-16 00:54:46 +02:00
cmrd Senya
a3378ae744
Account merging: handle duplicates for TagFollowing
...
I missed it in #7803
closes #7807
2018-05-16 00:54:16 +02:00
Benjamin Neff
2a60cb30a1
Merge branch 'next-minor' into develop
2018-05-03 21:33:10 +02:00
cmrd Senya
cb294fd3f4
Add completed_at to account_migrations
...
Use completed_at datetime field as an indication of a performed migration
closes #7805
2018-05-03 21:31:29 +02:00
cmrd Senya
e9f6dbdffd
Add unique index to poll participations on author_id and poll_id
...
Previously we had only a Rails validation which ensured poll participation
uniqueness but this adds uniqueness control to the database level, so that
uniqueness is guaranteed even when changing data with avoiding Rails
validations.
closes #7798
2018-05-03 21:28:38 +02:00
Benjamin Neff
22d1ad995c
Merge branch 'next-minor' into develop
2018-04-30 22:54:33 +02:00
Benjamin Neff
b7cd9d6238
Merge branch 'master' into next-minor
2018-04-30 22:54:03 +02:00
cmrd Senya
8680b24a2e
Account merging support
...
Adds support for merging accounts with account migration by eliminating
duplicate data in favor of the target user's data.
closes #7803
2018-04-30 22:06:34 +02:00
Dennis Schubert
360ea20367
Merge branch 'next-minor' into develop
2018-04-23 20:37:03 +02:00
Dennis Schubert
8d6c891ecb
Prepare 0.7.6.0 cycle
2018-04-23 20:35:18 +02:00
Dennis Schubert
74bac8c495
Merge branch 'next-minor' into develop
2018-04-23 20:33:20 +02:00
HankG
211e5cd1bc
Bugfix 7714 twitter char overflow
...
closes #7791
2018-04-23 20:33:07 +02:00
Benjamin Neff
c061425022
Add changelog entry for #7788 [ci skip]
2018-04-16 01:32:41 +02:00
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
