]>
git.parisson.com Git - telemeta.git/log
Guillaume Pellerin [Tue, 6 Jun 2017 12:29:50 +0000 (14:29 +0200)]
Add log, static and bower files to local data
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
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: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
Thomas Fillon [Wed, 3 May 2017 13:37:31 +0000 (15:37 +0200)]
Update Timeside submodule to master
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 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: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 [Mon, 6 Mar 2017 11:42:28 +0000 (12:42 +0100)]
Update Nginx configuration to protect static files in media dedicated directory
Guillaume Pellerin [Tue, 22 Nov 2016 16:26:07 +0000 (17:26 +0100)]
Add domain arg for import
Guillaume Pellerin [Tue, 22 Nov 2016 16:03:24 +0000 (17:03 +0100)]
Fix CREM import with existing codes
Guillaume Pellerin [Tue, 22 Nov 2016 16:26:07 +0000 (17:26 +0100)]
Add domain arg for import
Guillaume Pellerin [Tue, 22 Nov 2016 16:03:57 +0000 (17:03 +0100)]
Merge branch 'dev' of github.com:Parisson/Telemeta into dev
Guillaume Pellerin [Tue, 22 Nov 2016 16:03:24 +0000 (17:03 +0100)]
Fix CREM import with existing codes
Guillaume Pellerin [Tue, 15 Nov 2016 16:20:01 +0000 (17:20 +0100)]
Specify docker versions
Thomas Fillon [Wed, 24 Aug 2016 13:20:23 +0000 (15:20 +0200)]
Add missing migration
Guillaume Pellerin [Mon, 25 Jul 2016 23:33:15 +0000 (01:33 +0200)]
Merge pull request #136 from Parisson/maths28-patch-2
Fix process() error
Guillaume Pellerin [Mon, 25 Jul 2016 23:33:05 +0000 (01:33 +0200)]
Merge pull request #133 from maths28/dev
Optimization of RealTimeCustomSignal + Fix redirect language
Guillaume Pellerin [Mon, 25 Jul 2016 23:32:37 +0000 (01:32 +0200)]
Merge pull request #130 from lesaec/dev
Ajout lecture des sons dans telemeta/templates/telemeta/inc/mediaitem…
Mathieu Boyé [Mon, 25 Jul 2016 12:39:32 +0000 (14:39 +0200)]
Fix process() error
Set version of sqlparse to 0.1.19
Used for debug_toolbar. Debug_toolbar with last version of debug_toolbar V1.3.2 doesn't work because of update sqlparse recently
mathieu [Mon, 11 Jul 2016 09:33:57 +0000 (11:33 +0200)]
Add next input for redirect to current url when change language
mathieu [Mon, 11 Jul 2016 09:31:54 +0000 (11:31 +0200)]
Optimization of RealTimeCustomSIgnal
Modify methods of Signal
Add routers
Guillaume Pellerin [Tue, 28 Jun 2016 10:40:38 +0000 (12:40 +0200)]
fix file upload permissions
Guillaume Pellerin [Tue, 28 Jun 2016 10:31:45 +0000 (12:31 +0200)]
bugfix
Guillaume Pellerin [Tue, 28 Jun 2016 10:29:53 +0000 (12:29 +0200)]
fix duplicate test collection
Guillaume Pellerin [Mon, 20 Jun 2016 21:43:43 +0000 (23:43 +0200)]
ue default ES conf, try to fix lang menu against BIDI
lesaec [Mon, 20 Jun 2016 15:48:24 +0000 (17:48 +0200)]
Ajout lecture des sons dans telemeta/templates/telemeta/inc/mediaitem_list.html
Guillaume Pellerin [Tue, 14 Jun 2016 13:07:25 +0000 (15:07 +0200)]
fix duplicate method
Guillaume Pellerin [Tue, 14 Jun 2016 11:37:20 +0000 (13:37 +0200)]
Merge pull request #126 from maths28/dev
Improve loading resource for playlist player (ajax request)
mathieu [Tue, 14 Jun 2016 10:30:38 +0000 (12:30 +0200)]
Remove log
mathieu [Tue, 14 Jun 2016 10:14:08 +0000 (12:14 +0200)]
Improve loading resource for playlist player
Use resource element public_id instead of resource public_id
Add wait image when loading resource
Load file path with ajax
Guillaume Pellerin [Tue, 14 Jun 2016 09:10:29 +0000 (11:10 +0200)]
Merge branch 'dev'
Guillaume Pellerin [Mon, 13 Jun 2016 14:38:19 +0000 (16:38 +0200)]
use public_id
Guillaume Pellerin [Mon, 13 Jun 2016 14:33:01 +0000 (16:33 +0200)]
add jsonrpc get_item_export_url method, cleanup
Guillaume Pellerin [Mon, 13 Jun 2016 13:06:17 +0000 (15:06 +0200)]
re-add file url but can be overloading for big lists
Guillaume Pellerin [Mon, 13 Jun 2016 13:04:50 +0000 (15:04 +0200)]
no player for collections
Guillaume Pellerin [Fri, 10 Jun 2016 16:19:42 +0000 (18:19 +0200)]
Merge branch 'dev' of github.com:Parisson/Telemeta into dev
Guillaume Pellerin [Fri, 10 Jun 2016 16:19:32 +0000 (18:19 +0200)]
Merge pull request #124 from maths28/dev
Enable toolbar when debug is True
mathieu [Fri, 10 Jun 2016 16:14:08 +0000 (18:14 +0200)]
Enable toolbar when debug is True
Guillaume Pellerin [Fri, 10 Jun 2016 15:55:25 +0000 (17:55 +0200)]
increase waiting time for DB up
Guillaume Pellerin [Fri, 10 Jun 2016 15:32:42 +0000 (17:32 +0200)]
play button for item only
Guillaume Pellerin [Fri, 10 Jun 2016 15:18:38 +0000 (17:18 +0200)]
Merge pull request #123 from maths28/dev
Fix enable debug toolbar in dev
mathieu [Fri, 10 Jun 2016 14:54:36 +0000 (16:54 +0200)]
Fix enable debug toolbar in dev
Guillaume Pellerin [Fri, 10 Jun 2016 14:23:28 +0000 (16:23 +0200)]
Merge pull request #122 from maths28/dev
Fixs from master (bower + dockerignore)
mathieu [Fri, 10 Jun 2016 14:05:17 +0000 (16:05 +0200)]
Fixs from master
mathieu [Fri, 10 Jun 2016 13:46:35 +0000 (15:46 +0200)]
Merge remote-tracking branch 'upstream/dev' into dev
mathieu [Fri, 10 Jun 2016 13:07:43 +0000 (15:07 +0200)]
Update pages
mathieu [Fri, 10 Jun 2016 13:07:14 +0000 (15:07 +0200)]
Add data in gitignore
Guillaume Pellerin [Fri, 10 Jun 2016 12:46:15 +0000 (14:46 +0200)]
fix bower component
Guillaume Pellerin [Fri, 10 Jun 2016 12:44:15 +0000 (14:44 +0200)]
bugfix
Guillaume Pellerin [Fri, 10 Jun 2016 12:42:53 +0000 (14:42 +0200)]
pin more bower components
Guillaume Pellerin [Fri, 10 Jun 2016 10:50:02 +0000 (12:50 +0200)]
fix dockerignore againt data
Guillaume Pellerin [Fri, 10 Jun 2016 09:18:08 +0000 (11:18 +0200)]
Merge branch 'dev'
Guillaume Pellerin [Fri, 10 Jun 2016 09:05:45 +0000 (11:05 +0200)]
back to original haystack.signals.RealtimeSignalProcessor, fix auto_code for item copy
Guillaume Pellerin [Thu, 9 Jun 2016 11:18:24 +0000 (13:18 +0200)]
Merge branch 'dev' of github.com:Parisson/Telemeta into dev
Guillaume Pellerin [Thu, 9 Jun 2016 11:17:58 +0000 (13:17 +0200)]
add timeside modules to volumes
Guillaume Pellerin [Thu, 9 Jun 2016 11:15:02 +0000 (13:15 +0200)]
add TimeSide as a submodule