]>
git.parisson.com Git - telemeta.git/log
Thomas Fillon [Tue, 18 Jul 2017 08:06:02 +0000 (10:06 +0200)]
Migrating old meta API for models.core
see https://docs.djangoproject.com/en/1.8/ref/models/meta/#migrating-old-meta-api
Thomas Fillon [Wed, 5 Jul 2017 19:33:47 +0000 (21:33 +0200)]
Merge branch 'dev' into release/1.7
Conflicts:
Dockerfile
Thomas Fillon [Wed, 5 Jul 2017 19:31:16 +0000 (21:31 +0200)]
Docker: install plugins dependencies before Telemeta
This prevent Timeside requirements to overwrite Telemeta requirements
Thomas Fillon [Wed, 5 Jul 2017 16:13:08 +0000 (18:13 +0200)]
Update Dockerfile and requirements
mysql-client is now in the base docker image
Thomas Fillon [Wed, 5 Jul 2017 16:07:27 +0000 (18:07 +0200)]
Merge branch 'dev' into release/1.7
Thomas Fillon [Wed, 5 Jul 2017 07:44:59 +0000 (09:44 +0200)]
Test: restore deleted file
Thomas Fillon [Wed, 5 Jul 2017 07:32:47 +0000 (09:32 +0200)]
Fix pytest command in .travis.yml
Thomas Fillon [Wed, 5 Jul 2017 07:24:29 +0000 (09:24 +0200)]
Clean up settings and tests
Thomas Fillon [Wed, 5 Jul 2017 07:01:10 +0000 (09:01 +0200)]
Fix pytest configuration
Thomas Fillon [Tue, 4 Jul 2017 12:15:21 +0000 (14:15 +0200)]
Setup a basic unit tests framework
Fix #181
Thomas Fillon [Tue, 20 Jun 2017 15:56:57 +0000 (17:56 +0200)]
Remove Timeside server database
Thomas Fillon [Tue, 20 Jun 2017 15:55:56 +0000 (17:55 +0200)]
Update documentation for release 1.6.4
Thomas Fillon [Tue, 20 Jun 2017 14:04:15 +0000 (16:04 +0200)]
Fix path exclusion for `find`
prune `${media}import=/srv/media§/import` path and only select directory for which user is not www-data
Fix #176
Thomas Fillon [Fri, 16 Jun 2017 15:35:31 +0000 (17:35 +0200)]
Fix #177
Thomas Fillon [Thu, 15 Jun 2017 15:51:23 +0000 (17:51 +0200)]
Merge remote-tracking branch 'parisson/release/1.6.4' into release/1.7
Conflicts:
docker-compose.yml
setup.py
telemeta/views/core.py
Thomas Fillon [Thu, 8 Jun 2017 14:40:54 +0000 (16:40 +0200)]
Merge branch 'dev' into release/1.6.4
Conflicts:
lib/TimeSide
Thomas Fillon [Wed, 7 Jun 2017 13:42:20 +0000 (15:42 +0200)]
Update Timeside submodule to master
Guillaume Pellerin [Tue, 6 Jun 2017 12:30:03 +0000 (14:30 +0200)]
Merge branch 'dev' of github.com:Parisson/Telemeta into dev
Guillaume Pellerin [Tue, 6 Jun 2017 12:29:50 +0000 (14:29 +0200)]
Add log, static and bower files to local data
Thomas Fillon [Fri, 2 Jun 2017 21:21:09 +0000 (23:21 +0200)]
Update Timeside submodule to master
Thomas Fillon [Fri, 2 Jun 2017 21:20:00 +0000 (23:20 +0200)]
Remove timeside-diadems submodules
Thomas Fillon [Fri, 2 Jun 2017 13:56:27 +0000 (15:56 +0200)]
Update Timeside Submodule to master
Conflicts:
lib/TimeSide
Guillaume Pellerin [Fri, 2 Jun 2017 16:52:35 +0000 (18:52 +0200)]
Merge branch 'dev' of github.com:Parisson/Telemeta into dev
Guillaume Pellerin [Fri, 2 Jun 2017 16:51:58 +0000 (18:51 +0200)]
Update TimeSide
Thomas Fillon [Fri, 2 Jun 2017 16:38:10 +0000 (18:38 +0200)]
Merge branch 'dev' of github.com:Parisson/Telemeta into dev
Thomas Fillon [Fri, 2 Jun 2017 13:56:27 +0000 (15:56 +0200)]
Update Timeside Submodule to master
Thomas Fillon [Fri, 2 Jun 2017 13:56:27 +0000 (15:56 +0200)]
Update Timeside Submodule to master
Guillaume Pellerin [Fri, 2 Jun 2017 15:13:26 +0000 (17:13 +0200)]
Merge branch 'release/1.6.4' of github.com:Parisson/Telemeta into release/1.6.4
Guillaume Pellerin [Fri, 2 Jun 2017 15:12:05 +0000 (17:12 +0200)]
Fix chown path
Thomas Fillon [Fri, 2 Jun 2017 15:09:01 +0000 (17:09 +0200)]
Fix find script in app.sh
Thomas Fillon [Fri, 2 Jun 2017 13:56:27 +0000 (15:56 +0200)]
Update Timeside Submodule to master
Thomas Fillon [Fri, 2 Jun 2017 13:54:05 +0000 (15:54 +0200)]
Merge branch 'release/1.6.4' of github.com:Parisson/Telemeta into release/1.6.4
Conflicts:
app/scripts/app.sh
Thomas Fillon [Fri, 2 Jun 2017 13:47:08 +0000 (15:47 +0200)]
Fix #176 but keep import directory untouched
Guillaume Pellerin [Fri, 2 Jun 2017 13:32:06 +0000 (15:32 +0200)]
Merge branch 'dev' into release/1.6.4
Guillaume Pellerin [Fri, 2 Jun 2017 13:30:03 +0000 (15:30 +0200)]
Merge branch 'dev' of github.com:Parisson/Telemeta into dev
Guillaume Pellerin [Fri, 2 Jun 2017 13:29:48 +0000 (15:29 +0200)]
Use find to update the rightd of the media dirs except import (Fix #176)
Thomas Fillon [Fri, 2 Jun 2017 13:19:48 +0000 (15:19 +0200)]
Manage timeside and timeside-plugins install from lib/ directory
Thomas Fillon [Fri, 2 Jun 2017 13:18:09 +0000 (15:18 +0200)]
Fix #176
Thomas Fillon [Fri, 2 Jun 2017 12:35:47 +0000 (14:35 +0200)]
Update Timeside Submodule to master
Thomas Fillon [Fri, 2 Jun 2017 12:28:47 +0000 (14:28 +0200)]
Remove unused timeside.server import
Thomas Fillon [Tue, 18 Apr 2017 22:07:42 +0000 (00:07 +0200)]
Temporarily remove timeside.server app
Conflicts:
app/scripts/app.sh
Thomas Fillon [Tue, 18 Apr 2017 22:09:34 +0000 (00:09 +0200)]
Clean up timeside drop sql script
Thomas Fillon [Mon, 24 Apr 2017 10:33:36 +0000 (12:33 +0200)]
Add permissions for running analysis
Thomas Fillon [Thu, 20 Apr 2017 20:16:51 +0000 (22:16 +0200)]
Limit public access to graphers
Thomas Fillon [Fri, 2 Jun 2017 11:37:37 +0000 (13:37 +0200)]
Merge branch 'dev' of https://github.com/Parisson/Telemeta into dev
Thomas Fillon [Fri, 2 Jun 2017 11:36:45 +0000 (13:36 +0200)]
Fix and update some JavaScript packages version
Jquery 3.x was installed instead of 2.2.4
Guillaume Pellerin [Fri, 2 Jun 2017 11:36:44 +0000 (13:36 +0200)]
Goto 1.6.4
Guillaume Pellerin [Fri, 2 Jun 2017 11:22:27 +0000 (13:22 +0200)]
Merge branch 'feature/html5' into dev
Guillaume Pellerin [Fri, 2 Jun 2017 11:12:42 +0000 (13:12 +0200)]
Merge branch 'dev' into feature/html5
Thomas Fillon [Tue, 30 May 2017 15:31:13 +0000 (17:31 +0200)]
Fix HTML5 player polling interval
Thomas Fillon [Wed, 24 May 2017 22:35:55 +0000 (00:35 +0200)]
Fix nginx.conf
Thomas Fillon [Wed, 24 May 2017 22:35:55 +0000 (00:35 +0200)]
Fix nginx.conf
Thomas Fillon [Wed, 24 May 2017 22:24:30 +0000 (00:24 +0200)]
Merge branch 'release/1.7' of github.com:Parisson/telemeta into release/1.7
Thomas Fillon [Wed, 24 May 2017 22:22:28 +0000 (00:22 +0200)]
Differentiate media access protection through Nginx
Thomas Fillon [Wed, 24 May 2017 22:22:28 +0000 (00:22 +0200)]
Differentiate media access protection through Nginx
Thomas Fillon [Tue, 23 May 2017 16:12:33 +0000 (18:12 +0200)]
Add is_transcoded flag during initial transcoding
Thomas Fillon [Tue, 23 May 2017 15:38:15 +0000 (17:38 +0200)]
Remove unused code
Thomas Fillon [Tue, 23 May 2017 14:22:24 +0000 (16:22 +0200)]
Remove file serving during transcoding
Guillaume Pellerin [Wed, 3 May 2017 17:15:10 +0000 (19:15 +0200)]
Merge branch 'release/1.7' of github.com:Parisson/Telemeta into release/1.7
Guillaume Pellerin [Wed, 3 May 2017 17:14:06 +0000 (19:14 +0200)]
Goto 1.7, fix HTML5 player polling interval
Thomas Fillon [Wed, 3 May 2017 13:37:31 +0000 (15:37 +0200)]
Update Timeside submodule to master
Thomas Fillon [Mon, 24 Apr 2017 10:33:36 +0000 (12:33 +0200)]
Add permissions for running analysis
Thomas Fillon [Thu, 20 Apr 2017 20:16:51 +0000 (22:16 +0200)]
Limit public access to graphers
Thomas Fillon [Thu, 20 Apr 2017 09:09:57 +0000 (11:09 +0200)]
Update project urls.py
Change mimetype to content_type
Guillaume Pellerin [Wed, 19 Apr 2017 16:23:13 +0000 (18:23 +0200)]
Merge branch 'dev' into release/1.7
Thomas Fillon [Tue, 18 Apr 2017 22:22:43 +0000 (00:22 +0200)]
Add sql script to fix contenttypes
see http://stackoverflow.com/questions/
32657064 /runtimeerror-error-creating-new-content-types
Thomas Fillon [Tue, 18 Apr 2017 22:09:34 +0000 (00:09 +0200)]
Clean up timeside drop sql script
Thomas Fillon [Tue, 18 Apr 2017 22:07:42 +0000 (00:07 +0200)]
Temporarily remove timeside.server app
Guillaume Pellerin [Tue, 18 Apr 2017 15:41:40 +0000 (17:41 +0200)]
Add sql script to drop Timeside server tables
Guillaume Pellerin [Tue, 18 Apr 2017 15:29:54 +0000 (17:29 +0200)]
Update Dockerfile
Thomas Fillon [Fri, 14 Apr 2017 11:56:41 +0000 (13:56 +0200)]
Serve images through Nginx
Thomas Fillon [Fri, 14 Apr 2017 11:56:20 +0000 (13:56 +0200)]
Add bower_install command in app.sh
Thomas Fillon [Fri, 14 Apr 2017 09:48:11 +0000 (11:48 +0200)]
Fix .dockerignore
Thomas Fillon [Fri, 14 Apr 2017 09:30:51 +0000 (11:30 +0200)]
Manage timeside and timeside-diadems from lib/ directory
Thomas Fillon [Fri, 14 Apr 2017 09:03:35 +0000 (11:03 +0200)]
Update Timeside submodule
Thomas Fillon [Tue, 11 Apr 2017 14:20:04 +0000 (16:20 +0200)]
Merge branch 'feature/html5' into feature/dj1.8
Conflicts:
telemeta/views/core.py
telemeta/views/item.py
Thomas Fillon [Tue, 11 Apr 2017 10:28:05 +0000 (12:28 +0200)]
Fix Geographic Country Item view
Fix #163
Thomas Fillon [Tue, 11 Apr 2017 09:15:00 +0000 (11:15 +0200)]
Fix permission in media subdirectories
Thomas Fillon [Tue, 11 Apr 2017 09:12:30 +0000 (11:12 +0200)]
Fix item view
Thomas Fillon [Wed, 5 Apr 2017 16:21:03 +0000 (18:21 +0200)]
Serve audio media through nginx. Remove streaming capability
Thomas Fillon [Tue, 4 Apr 2017 23:02:57 +0000 (01:02 +0200)]
Temporarily comment out unused import
Thomas Fillon [Tue, 4 Apr 2017 22:49:18 +0000 (00:49 +0200)]
Remove unused code
If needed File could be send with Django FileResponse https://docs.djangoproject.com/fr/1.10/ref/request-response/#fileresponse-objects rather than StreamingHttpResponse
Thomas Fillon [Tue, 4 Apr 2017 22:44:58 +0000 (00:44 +0200)]
Merge branch 'feature/html5' of github.com:Parisson/telemeta into feature/html5
Thomas Fillon [Tue, 4 Apr 2017 22:44:35 +0000 (00:44 +0200)]
Serve media file through nginx
Thomas Fillon [Mon, 3 Apr 2017 21:45:43 +0000 (23:45 +0200)]
Player: make SoudManager prefering HTML5 over Flash
Thomas Fillon [Sat, 25 Mar 2017 21:23:35 +0000 (22:23 +0100)]
Merge branch 'feature/html5' of github.com:Parisson/Telemeta into feature/html5
Thomas Fillon [Sat, 25 Mar 2017 21:00:54 +0000 (22:00 +0100)]
Serve media with Nginx through Django authorization
Thomas Fillon [Thu, 23 Mar 2017 17:02:19 +0000 (18:02 +0100)]
Travis: remove docker-compose custom and obsolete install, fix port binding in test
Thomas Fillon [Thu, 23 Mar 2017 17:02:19 +0000 (18:02 +0100)]
Travis: remove docker-compose custom and obsolete install, fix port binding in test
Thomas Fillon [Thu, 23 Mar 2017 17:02:19 +0000 (18:02 +0100)]
Travis: remove docker-compose custom and obsolete install, fix port binding in test
Thomas Fillon [Thu, 23 Mar 2017 15:30:07 +0000 (16:30 +0100)]
Fix new UPN logo width in templates
Thomas Fillon [Thu, 23 Mar 2017 15:30:07 +0000 (16:30 +0100)]
Fix new UPN logo width in templates
Thomas Fillon [Thu, 23 Mar 2017 15:30:07 +0000 (16:30 +0100)]
Fix new UPN logo width in templates
Thomas Fillon [Thu, 23 Mar 2017 14:51:33 +0000 (15:51 +0100)]
Merge branch 'dev' into feature/dj1.8
Thomas Fillon [Thu, 23 Mar 2017 14:44:44 +0000 (15:44 +0100)]
Merge branch 'master' into dev
Thomas Fillon [Thu, 23 Mar 2017 14:19:00 +0000 (15:19 +0100)]
Update UPN logo
Thomas Fillon [Wed, 22 Mar 2017 16:51:05 +0000 (17:51 +0100)]
The mimetype argument has been deprecated in HttpResponse in favor of content_type
Thomas Fillon [Mon, 6 Mar 2017 11:42:28 +0000 (12:42 +0100)]
Update Nginx configuration to protect static files in media dedicated directory
Thomas Fillon [Fri, 27 Jan 2017 22:40:22 +0000 (23:40 +0100)]
Fix OAI and prepare class based view in home.py
Thomas Fillon [Thu, 26 Jan 2017 16:20:50 +0000 (17:20 +0100)]
Fix Nginx issue: app needs access to /var/log/uwsgi - mount volume in ./data