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
6a67bc6fac
Fix #171 : dedicated endpoint to list import jobs, updated front-end
2018-04-22 15:17:06 +02:00
74dcf51caf
Merge branch 'develop' of https://code.eliotberriot.com/hazmo/funkwhale into develop
2018-04-22 15:11:55 +02:00
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
66597a1874
Update views.py, typo on apache
2018-04-22 12:14:19 +00:00
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
140a78559b
Restrict sensitive build steps to only upstream repo
2018-04-22 14:06:13 +02:00
be7e8e1e7e
Update views.py to adapt headers based on REVERSE_PROXY_TYPE
2018-04-22 11:59:41 +00:00
0695cd85e1
Update common.py with future proof REVERSE_PROXY_TYPE setting
2018-04-22 11:54:35 +00:00
5879d2d655
Update views.py to modify headers depending on Nginx or Apache
2018-04-22 11:08:57 +00:00
43e7555b09
Update common.py to add USE_APACHE_HEADERS set to false
2018-04-22 11:00:35 +00:00
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
d54164219a
Fix #173 : sidebar tabs not showing under small resolution under Chrome
2018-04-22 12:19:33 +02:00
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
b602ed38e7
Fix #172 : broken login
2018-04-22 12:12:46 +02:00
93c57f08f9
Fixed broken youtube-dl import
2018-04-22 12:10:32 +02:00
3950d0a2c1
Bigger interval when going to next track because of error
2018-04-22 11:28:13 +02:00
84c3b531ad
Pinned oauthlib2 version to prevent when fetching youtube data
2018-04-22 11:27:26 +02:00
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
9a80f78e64
Added some documentation about nginx internal locations
2018-04-22 11:03:48 +02:00
a7101604ca
Merge branch 'i18n-components' into 'develop'
...
Translate root components
See merge request funkwhale/funkwhale!142
2018-04-22 08:59:02 +00:00
0f4108f0d8
Put in its place
2018-04-22 09:47:13 +01:00
28c067b43c
Merge branch 'develop' into i18n-components
2018-04-22 09:45:22 +01:00
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
dbbb11a2cb
Merge branch 'i18n-instance' into 'develop'
...
Translate instance activity
See merge request funkwhale/funkwhale!143
2018-04-22 08:39:25 +00:00
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
fb3361ce70
Fix #153 : changelog
2018-04-21 19:32:44 +02:00
70d3385aa3
Documentation update for the new in-place import
2018-04-21 19:30:55 +02:00
f4ac0b2d3f
Serve view can now serve in-place imported files
2018-04-21 18:21:15 +02:00
58fced2640
updated import_task to support in place import
2018-04-21 18:20:56 +02:00
de754b835e
Updated CLI to support in-place import
2018-04-21 18:16:43 +02:00
a8bf44a494
Added dedicated settings to manage in-place import
2018-04-21 18:15:29 +02:00
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
0d3eb96bec
Fixed failing tests
2018-04-21 16:33:15 +02:00
6395f48b2b
Fix #144 : changelog
2018-04-21 16:16:43 +02:00
3f3d6d88d6
Make music directory configurable in development
2018-04-21 16:16:43 +02:00
1672230f39
More verbose/robust import_files command, also skips existing files
2018-04-21 16:16:43 +02:00
d98c33e5ed
More efficient SQL query to compute import batch status
2018-04-21 16:02:11 +02:00
e29cfb7301
Smarted UUID validation on metadata
2018-04-21 16:01:42 +02:00
74e7aed2d4
Removed duplicated line
2018-04-20 19:49:56 +02:00
9e05d23aee
Merge branch 'broken-front' into 'develop'
...
Broken front - CI checks to avoid it again
Closes #169
See merge request funkwhale/funkwhale!148
2018-04-20 17:37:35 +00:00
84c4e5ebbb
Added CI check to catch build errors
2018-04-20 19:30:23 +02:00
083b7b8e2f
Added one basic unittest for component
2018-04-20 19:25:05 +02:00
a4ce093919
Fix lint errors
2018-04-20 19:25:05 +02:00
a210cfcb9b
Fix #169 : Fixed template syntax error
2018-04-20 18:46:42 +02:00
2f514da0fd
Merge branch '142-source-length' into 'develop'
...
Resolve "Upgrade TrackFile.source max_length from 200 to 500"
Closes #142
See merge request funkwhale/funkwhale!147
2018-04-19 20:28:36 +00:00
2be46b3320
Fix #142 : Increased max_length on TrackFile.source
2018-04-19 22:25:58 +02:00
b27312648c
Merge branch '124-logout' into 'develop'
...
Resolve "Improve logout and ensure we don't leak logged in state after logout"
Closes #124 and #155
See merge request funkwhale/funkwhale!146
2018-04-19 20:17:58 +00:00
de4b0f3022
Fix #124 and #155 : properly reset everything on logout
2018-04-19 22:15:13 +02:00
a48dcdb022
Merge branch '163-lock' into 'develop'
...
Resolve "Add a database lock when downloading remote file"
Closes #163
See merge request funkwhale/funkwhale!145
2018-04-19 19:21:54 +00:00
Eliot Berriot