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
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
Benjamin Neff
22d1ad995c
Merge branch 'next-minor' into develop
2018-04-30 22:54:33 +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
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
d5f5e1991b
Merge branch 'next-minor' into develop
2018-04-16 01:26:56 +02:00
Steffen van Bergerem
53d58a8bcb
Remove fileuploader.css
...
closes #7778
2018-04-16 01:24:38 +02:00
Benjamin Neff
c1ebc4d338
Merge branch 'next-minor' into develop
2018-04-12 02:49:11 +02:00
Benjamin Neff
9a661177f1
Replace rails-assets-perfect-scrollbar with rails-assets-utatti-perfect-scrollbar
...
closes #7772
2018-04-12 02:44:43 +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
Benjamin Neff
e31ca1fd3b
Fix link to "Make yourself an admin"
2018-04-12 01:45:56 +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
4fa92c1823
Remove flag for contacts visible to each other
...
This feature only worked on the same pod and was more confusing than
useful.
2018-04-12 01:39:11 +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
e0e40f73c3
Spec for post creation bad aspects_ids issue
2018-03-25 08:28:59 +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
40fc175d6e
only include mutual sharing contacts in conversations form on contacts page
...
fixes #7377
2018-03-22 23:15:24 +01:00
Frédéric Bolvin
6d55b15604
Resize images on client-side before uploading
2018-03-11 11:20:16 +01:00
Benjamin Neff
f14547b2ea
Merge branch 'next-minor' into develop
2018-03-10 00:01:36 +01:00
cmrd Senya
0ae19071ad
Set video click handler at app.views.ExpandedComment
...
fixes #7736
closes #7737
2018-03-10 00:01:13 +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
8e88f4b183
Add the back-to-top button to all views
...
fixes #7727
2018-03-07 00:39:26 +01:00
Dennis Schubert
c4839613ea
Merge branch 'next-minor' into develop
2018-02-27 00:48:47 +01:00
Benjamin Neff
4e5ee36675
Keep order of profile tags
...
closes #7724
2018-02-27 00:48:42 +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
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
c89b2ad809
Prevent duplicate mention notifications when the post is received twice
...
closes #7721
2018-02-22 00:49:21 +01:00
cmrd Senya
b32c844314
Support for embedding HTML5 media links
...
Use markdown-it-html5-embed plugin so user can embed audio and
video using the markdown link syntax []() in the HTML5 way.
2018-02-17 19:21:10 +01:00
Frédéric Bolvin
d7abaaced0
implemented new profile photo upload with cropping function
2018-02-16 19:43:32 +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
b9787cc632
Start sending the blocking flag
2018-02-01 23:35:35 +01:00
Benjamin Neff
815cf121ab
Remove participants limit for conversations
...
The limit was added in 2012 to prevent spam, but since the participants
need to be a mutual contact with the author nowadays, I don't think it's
a spam problem anymore.
2018-02-01 23:35:35 +01:00
