Dennis Schubert
cee30c36a0
Merge branch 'next-minor' into develop
2018-11-08 05:06:53 +01:00
Hank Grabowski
cab0e0100b
7841 Post Unlike sets status icon correctly
...
closes #7882
fixes #7841
2018-11-08 05:06:34 +01:00
Benjamin Neff
0c2cd2ef1b
Merge branch 'next-minor' into develop
2018-11-04 03:07:50 +01:00
Bennett Goble
935ff66c96
Sharpen small and medium thumbnails
...
closes #7924
2018-11-04 03:07:42 +01:00
flaburgan
470efd4ec5
Move comment timestamp next to author name, add permalink
...
closes #7905
2018-11-04 03:01:27 +01:00
Benjamin Neff
d3bb7ade78
Merge branch 'next-minor' into develop
2018-11-02 01:39:11 +01:00
flaburgan
65e0f90b86
Reword the web handler setting
...
fixes #7838
closes #7909
2018-11-02 01:35:44 +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
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
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
Benjamin Neff
08e108d3d8
Fix comment notification subject for posts without text
...
Fixes #7854
2018-09-05 03:17:58 +02:00
Benjamin Neff
2eb17e109b
Fix comment notification subject for posts without text
...
Fixes #7854
2018-09-05 01:32:36 +02:00
Benjamin Neff
9b3f90dc90
Merge branch 'next-minor' into develop
2018-07-20 11:07:18 +02:00
Benjamin Neff
79907b78b9
Use podname for web+diaspora:// protocol handler
...
closes #7839
2018-07-20 11:07:11 +02:00
Benjamin Neff
80bc90afa9
Fix preview with uploaded photos
2018-07-17 20:48:37 +02:00
Benjamin Neff
1289b3b541
Merge branch 'next-minor' into develop
2018-07-13 10:22:04 +02:00
Dennis Schubert
af500dabbc
Add section in the User's settings to register the protocol handler
...
closes #7833
2018-07-13 10:19:43 +02:00
Dennis Schubert
f8a4a2c510
Gracefully ignore exceptions when trying to register the ProtocolHandler
2018-07-13 10:18:48 +02:00
Dennis Schubert
8709c45d30
Move the protocol handler into a proper helper module
...
Previous file history in 80dfdcd6af
2018-07-13 10:18:48 +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
80dfdcd6af
Add web+diaspora:// links handler installation
2018-07-11 01:26:43 +02:00
cmrd Senya
6f812a5b8f
Add LinksController
...
LinksController redirects requests for provided diaspora:// links to
respective entities urls.
2018-07-11 01:24:28 +02:00
cmrd Senya
2e0b382699
Use 'post' prefix for status message route helpers
...
This is required to make url_for(StatusMessage.new) work
2018-07-11 01:24:28 +02:00
flaburgan
af02d01d41
Fix progress when uploading multiple photo at the same time
2018-07-09 17:48:30 +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
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
