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

8440 Commits

Author SHA1 Message Date
Eliot Berriot 7e8972a3b0
Version bump and Changelog 2018-04-23 19:44:38 +02:00
Eliot Berriot bcc71280ce Merge branch '175-i18n-typos' into 'develop' 
Resolve "i18n typos"

Closes #175

See merge request funkwhale/funkwhale!161
 2018-04-23 17:36:05 +00:00
Eliot Berriot 912c98c71b
Fix #175: Typos/not showing text due to i18n work 2018-04-23 19:33:39 +02:00
Eliot Berriot 9124c7a9bf Merge branch '150-player-queue-tab' into 'develop' 
Resolve "Include player buttons on the queue tab"

Closes #150

See merge request funkwhale/funkwhale!160
 2018-04-23 17:08:13 +00:00
Eliot Berriot 1a34f44898
Fix #150: Player is back in Queue tab 2018-04-23 19:05:48 +02:00
Eliot Berriot 0ab62b8648 Merge branch '145-radio-delete-last-track' into 'develop' 
Resolve "Unexpected behavior with radios"

Closes #145

See merge request funkwhale/funkwhale!159
 2018-04-23 16:46:30 +00:00
Eliot Berriot 0e153c0f4d
Fix #145: Radio will now append new track if you delete the last track in queue 2018-04-23 18:43:46 +02:00
Eliot Berriot af883242cb Merge branch '151-queue-delete' into 'develop' 
Resolve "Reordering the queue do not honor currently playing track"

Closes #151

See merge request funkwhale/funkwhale!158
 2018-04-23 16:35:36 +00:00
Eliot Berriot 6ed6634f93
Fixed #151: queue reorder or track deletion restarting currently playing track 2018-04-23 18:32:27 +02:00
Eliot Berriot 48c9a8bd55 Merge branch 'apache-x-sendfile-header' into 'develop' 
Ensure we return correct paths when using Apache as a reverse proxy

See merge request funkwhale/funkwhale!157
 2018-04-22 14:49:26 +00:00
Eliot Berriot 300e24dbde
Ensure we return correct paths when using Apache as a reverse proxy 2018-04-22 16:34:07 +02:00
Eliot Berriot ad43d160bd Merge branch '171-import-jobs' into 'develop' 
Resolve "Dedicated API endpoint for import jobs"

Closes #171

See merge request funkwhale/funkwhale!156
 2018-04-22 13:20:07 +00:00
Eliot Berriot 5f6b1ae6e5 Merge branch 'develop' into 'develop' 
Adapt Headers for serving audio files

See merge request funkwhale/funkwhale!154
 2018-04-22 13:19:27 +00:00
Eliot Berriot 6a67bc6fac
Fix #171: dedicated endpoint to list import jobs, updated front-end 2018-04-22 15:17:06 +02:00
banana 74dcf51caf Merge branch 'develop' of https://code.eliotberriot.com/hazmo/funkwhale into develop 2018-04-22 15:11:55 +02:00
banana 0f7de68f0d Update common.py to add USE_APACHE_HEADERS set to false 
Update views.py to modify headers depending on Nginx or Apache
Update common.py with future proof REVERSE_PROXY_TYPE setting
Update views.py to adapt headers based on REVERSE_PROXY_TYPE
Update views.py, typo on apache
 2018-04-22 15:11:04 +02:00
Hazmo 66597a1874 Update views.py, typo on apache 2018-04-22 12:14:19 +00:00
Eliot Berriot 8f24d69998 Merge branch 'restrict-develop-build' into 'develop' 
Restrict sensitive build steps to only upstream repo

See merge request funkwhale/funkwhale!155
 2018-04-22 12:10:30 +00:00
Eliot Berriot 140a78559b
Restrict sensitive build steps to only upstream repo 2018-04-22 14:06:13 +02:00
Hazmo be7e8e1e7e Update views.py to adapt headers based on REVERSE_PROXY_TYPE 2018-04-22 11:59:41 +00:00
Hazmo 0695cd85e1 Update common.py with future proof REVERSE_PROXY_TYPE setting 2018-04-22 11:54:35 +00:00
Hazmo 5879d2d655 Update views.py to modify headers depending on Nginx or Apache 2018-04-22 11:08:57 +00:00
Hazmo 43e7555b09 Update common.py to add USE_APACHE_HEADERS set to false 2018-04-22 11:00:35 +00:00
Eliot Berriot 9e5a0f87e8 Merge branch '173-sidebar-chrome' into 'develop' 
Resolve "Sidebar not showing on small screen under Chrome"

Closes #173

See merge request funkwhale/funkwhale!153
 2018-04-22 10:22:17 +00:00
Eliot Berriot d54164219a
Fix #173: sidebar tabs not showing under small resolution under Chrome 2018-04-22 12:19:33 +02:00
Eliot Berriot 4f2a325fef Merge branch 'bugfixes-swarm' into 'develop' 
Bugfixes swarm

Closes #172

See merge request funkwhale/funkwhale!152
 2018-04-22 10:15:31 +00:00
Eliot Berriot b602ed38e7
Fix #172: broken login 2018-04-22 12:12:46 +02:00
Eliot Berriot 93c57f08f9
Fixed broken youtube-dl import 2018-04-22 12:10:32 +02:00
Eliot Berriot 3950d0a2c1
Bigger interval when going to next track because of error 2018-04-22 11:28:13 +02:00
Eliot Berriot 84c3b531ad
Pinned oauthlib2 version to prevent when fetching youtube data 2018-04-22 11:27:26 +02:00
Eliot Berriot f4dbe1ea68 Merge branch 'docs-nginx-internal' into 'develop' 
Added some documentation about nginx internal locations

See merge request funkwhale/funkwhale!151
 2018-04-22 09:05:57 +00:00
Eliot Berriot 9a80f78e64
Added some documentation about nginx internal locations 2018-04-22 11:03:48 +02:00
Baptiste Gelez a7101604ca Merge branch 'i18n-components' into 'develop' 
Translate root components

See merge request funkwhale/funkwhale!142
 2018-04-22 08:59:02 +00:00
Bat 0f4108f0d8 Put in its place 2018-04-22 09:47:13 +01:00
Bat 28c067b43c Merge branch 'develop' into i18n-components 2018-04-22 09:45:22 +01:00
Baptiste Gelez e4e9715397 Merge branch 'i18n-federation-views' into 'develop' 
i18n: federation views

See merge request funkwhale/funkwhale!144
 2018-04-22 08:39:35 +00:00
Baptiste Gelez dbbb11a2cb Merge branch 'i18n-instance' into 'develop' 
Translate instance activity

See merge request funkwhale/funkwhale!143
 2018-04-22 08:39:25 +00:00
Eliot Berriot 21d235a630 Merge branch '153-in-place-import' into 'develop' 
Resolve "Allow in-place import"

Closes #153

See merge request funkwhale/funkwhale!150
 2018-04-21 17:37:03 +00:00
Eliot Berriot fb3361ce70
Fix #153: changelog 2018-04-21 19:32:44 +02:00
Eliot Berriot 70d3385aa3
Documentation update for the new in-place import 2018-04-21 19:30:55 +02:00
Eliot Berriot f4ac0b2d3f
Serve view can now serve in-place imported files 2018-04-21 18:21:15 +02:00
Eliot Berriot 58fced2640
updated import_task to support in place import 2018-04-21 18:20:56 +02:00
Eliot Berriot de754b835e
Updated CLI to support in-place import 2018-04-21 18:16:43 +02:00
Eliot Berriot a8bf44a494
Added dedicated settings to manage in-place import 2018-04-21 18:15:29 +02:00
Eliot Berriot 3d6c12437e Merge branch '144-import-perf' into 'develop' 
Resolve "Make the transaction logic less dumb in file importer"

Closes #144

See merge request funkwhale/funkwhale!149
 2018-04-21 14:37:00 +00:00
Eliot Berriot 0d3eb96bec
Fixed failing tests 2018-04-21 16:33:15 +02:00
Eliot Berriot 6395f48b2b
Fix #144: changelog 2018-04-21 16:16:43 +02:00
Eliot Berriot 3f3d6d88d6
Make music directory configurable in development 2018-04-21 16:16:43 +02:00
Eliot Berriot 1672230f39
More verbose/robust import_files command, also skips existing files 2018-04-21 16:16:43 +02:00
Eliot Berriot d98c33e5ed
More efficient SQL query to compute import batch status 2018-04-21 16:02:11 +02:00