MirrorMirror
/
funkwhale
mirror of https://dev.funkwhale.audio/funkwhale/funkwhale.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
4,398 Commits 89 Branches 100 Tags 69 MiB
Commit Graph

4398 Commits

Author SHA1 Message Date
Eliot Berriot 7df97263e5
Merge branch 'develop' 2019-01-29 10:06:04 +01:00
Eliot Berriot 6813f972cc Merge branch '688-transcode-inplace' into 'develop' 
Resolve "In-place imports cannot be transcoded"

Closes #688

See merge request funkwhale/funkwhale!571
 2019-01-29 09:32:35 +01:00
Vierkantor 0efdb6d980 Resolve "In-place imports cannot be transcoded" 2019-01-29 09:32:35 +01:00
Eliot Berriot db8427f30c Merge branch 'patch-1' into 'develop' 
Document upgrading the Postgres database files.

See merge request funkwhale/funkwhale!570
 2019-01-28 09:48:06 +01:00
interfect 092d97efaa Document upgrading the Postgres database files. 2019-01-28 09:48:06 +01:00
Eliot Berriot 8d9f29268a Merge branch 'fixed-wrong-docker-proxy-template' into 'master' 
Fixed wrong URL in documentation for funkwhale_proxy.conf file when deploying using Docker

See merge request funkwhale/funkwhale!569
 2019-01-27 14:48:09 +01:00
Eliot Berriot b989ae0e60
Fixed wrong URL in documentation for funkwhale_proxy.conf file when deploying using Docker 2019-01-27 14:45:38 +01:00
Eliot Berriot 4bfb169114 Merge branch 'disable-makemigrations' into 'master' 
Fix #685: Disable makemigrations in production and misleading message when running migrate

See merge request funkwhale/funkwhale!568
 2019-01-26 22:04:28 +01:00
Eliot Berriot 78546232d0
Fix #685: Disable makemigrations in production and misleading message when running migrate 2019-01-26 22:01:47 +01:00
Eliot Berriot 264aa20db6 Merge branch 'upload-progress' into 'master' 
Display progress during file upload

See merge request funkwhale/funkwhale!567
 2019-01-26 20:48:40 +01:00
Eliot Berriot 3de9ae6936
Display progress during file upload 2019-01-26 20:45:14 +01:00
Eliot Berriot a28f4ca5f0 Merge branch '686-input-name' into 'master' 
Fix #686: Added name attributes on all inputs to improve UX, especially with password managers

See merge request funkwhale/funkwhale!566
 2019-01-26 18:08:53 +01:00
Eliot Berriot 4256d554e3
Fix #686: Added name attributes on all inputs to improve UX, especially with password managers 2019-01-26 18:06:19 +01:00
Eliot Berriot ca433fd90e Merge branch '676-notification-encoding' into 'master' 
Fix #676: overescaping issue in notifications and album page

See merge request funkwhale/funkwhale!564
 2019-01-26 13:16:30 +01:00
Eliot Berriot baa18bbdc7
Fix #676: overescaping issue in notifications and album page 2019-01-26 13:13:48 +01:00
Eliot Berriot 22a38260e6 Merge branch 'fix-celery-issues' into 'master' 
Fix celery issues

See merge request funkwhale/funkwhale!563
 2019-01-25 15:44:00 +01:00
Eliot Berriot 871db15908
Upgraded kombu to fix an incompatibility with redis>=3 2019-01-25 15:40:47 +01:00
Eliot Berriot 37ca06c370
Fixed celery worker defaulting to development settings instead of production 2019-01-25 15:39:48 +01:00
Eliot Berriot c4b8f85a2c Merge branch 'playlistarrow' into 'develop' 
Fix #681: hide Pagination component if only 1 page of content

See merge request funkwhale/funkwhale!562
 2019-01-25 13:41:38 +01:00
Eliot Berriot 0a7fd50d9a Fix #681: Hide pagination when there is only one page of results 2019-01-25 13:39:06 +01:00
Jo Vuit ad11a8d915 Replaced ... with ellipsis 2019-01-25 12:37:27 +01:00
Jo Vuit 247bfa0444 Added a v-if to disable the `<div>` if there is only one page of content 2019-01-25 12:34:50 +01:00
Eliot Berriot 293e526f2f Merge branch 'subsonic-all-playlists' into 'master' 
Fix #684: Include shared/public playlists in Subsonic API responses

See merge request funkwhale/funkwhale!561
 2019-01-25 12:14:49 +01:00
Eliot Berriot cd36128769
Fix #684: Include shared/public playlists in Subsonic API responses 2019-01-25 12:12:00 +01:00
Eliot Berriot e4954f8bd5 Merge branch '670-momentjs-translation' into 'master' 
Fix #670: Use proper locale for date-related/duration strings

See merge request funkwhale/funkwhale!560
 2019-01-25 11:37:01 +01:00
Eliot Berriot 7d003282eb
Fix #670: Use proper locale for date-related/duration strings 2019-01-25 11:34:30 +01:00
Eliot Berriot fa1430d350 Merge branch 'notifmessagepending' into 'develop' 
Make distinction between pending and approved follow request in the notification area

Closes #675

See merge request funkwhale/funkwhale!558
 2019-01-25 10:35:19 +01:00
Eliot Berriot e4cb036a97 Merge branch '683-select-all-messages' into 'master' 
Fix #683: wrong number of affected elements in bulk action modal

See merge request funkwhale/funkwhale!559
 2019-01-25 10:34:19 +01:00
Eliot Berriot 702329b99f
Fix #683: wrong number of affected elements in bulk action modal 2019-01-25 10:31:53 +01:00
Jo Vuit 8568987201 Merge branch 'notifmessagepending' of dev.funkwhale.audio:jovuit/funkwhale into notifmessagepending 2019-01-24 15:30:52 +01:00
Jo Vuit fb495ee89c Now distinguishes whether the Follow request has been accepted yet or not, and adapts the message displayed in the NotificationData. 2019-01-24 15:27:54 +01:00
Jo Vuit 872182581a Now distinguishes whether the Follow request has been accepted yet or not, and adapts the message displayed in the NotificationData. 2019-01-24 15:18:20 +01:00
Eliot Berriot 02140c2376 Merge branch 'sourcestringmodif' into 'develop' 
Enhancements in frontend

See merge request funkwhale/funkwhale!557
 2019-01-24 14:32:36 +01:00
Eliot Berriot 32816a3425 Merge branch '666-admin-loading' into 'master' 
Resolve "Error 500 when loading /api/admin/music/track/99104/change/ (edit track  via django admin)"

See merge request funkwhale/funkwhale!556
 2019-01-24 14:03:18 +01:00
Jo Vuit 05cb98b3a0 Reformulate ('No notifications yet' is not appropriate if they are hidden because they are already read. 'No notification to show' is better') 2019-01-24 14:01:47 +01:00
Jo Vuit 2bf4d6d283 Missing spaces 2019-01-24 13:50:27 +01:00
Jo Vuit 94251087e6 Reformulate 2019-01-24 13:38:34 +01:00
Jo Vuit 27251e1318 Replaced 'Silence' with 'Mute' (verb) 2019-01-24 13:36:03 +01:00
Jo Vuit ed3faa6047 Replaced dot-dot-dot with ellipsis 2019-01-24 13:34:10 +01:00
Jo Vuit 4b585f3ee2 Replaced 'dot-dot-dot- by ellipsis 2019-01-24 13:28:32 +01:00
Jo Vuit 2af6f89545 Reformulated string 2019-01-24 13:16:57 +01:00
Jo Vuit 43e33294e5 Modified tooltip of PlayButton 2019-01-24 13:15:58 +01:00
Eliot Berriot fda6b60cfb Merge branch '667-update-apache-doc' into 'develop' 
add release notes for apache config

Closes #667

See merge request funkwhale/funkwhale!554
 2019-01-24 11:18:55 +01:00
Eliot Berriot 3b87580a69
Reduced number of SQL queries when loading /api/admin/music/tracks/ 2019-01-24 11:06:37 +01:00
Eliot Berriot 51dbd905e7
Fix #666: crashing Django admin when loading track detail page 2019-01-24 11:06:11 +01:00
Eliot Berriot 887373c006
Fixed a docker build issue with pip 19 2019-01-24 11:04:29 +01:00
Eliot Berriot 2290ad613a Merge branch 'readd-apache-websocket' into 'develop' 
readds websocket for apache

See merge request funkwhale/funkwhale!555
 2019-01-24 10:40:39 +01:00
Renon cfb458f407 readds websocket for apache 2019-01-24 10:34:50 +01:00
Renon 478b434858 add release notes for apache config 2019-01-24 10:21:34 +01:00
Eliot Berriot 81b6f703c1 Merge branch 'typo-changelog' into 'develop' 
Typo changelog 0.18

See merge request funkwhale/funkwhale!553
 2019-01-23 09:27:43 +01:00