]> git.parisson.com Git - telemeta.git/log
telemeta.git
9 years agoRemove file serving during transcoding
Thomas Fillon [Tue, 23 May 2017 14:22:24 +0000 (16:22 +0200)]
Remove file serving during transcoding

9 years agoUpdate Timeside submodule to master
Thomas Fillon [Wed, 3 May 2017 13:37:31 +0000 (15:37 +0200)]
Update Timeside submodule to master

9 years agoFix Geographic Country Item view
Thomas Fillon [Tue, 11 Apr 2017 10:28:05 +0000 (12:28 +0200)]
Fix Geographic Country Item view

Fix #163

9 years agoFix permission in media subdirectories
Thomas Fillon [Tue, 11 Apr 2017 09:15:00 +0000 (11:15 +0200)]
Fix permission in media subdirectories

9 years agoFix item view
Thomas Fillon [Tue, 11 Apr 2017 09:12:30 +0000 (11:12 +0200)]
Fix item view

9 years agoServe audio media through nginx. Remove streaming capability
Thomas Fillon [Wed, 5 Apr 2017 16:21:03 +0000 (18:21 +0200)]
Serve audio media through nginx. Remove streaming capability

9 years agoTemporarily comment out unused import
Thomas Fillon [Tue, 4 Apr 2017 23:02:57 +0000 (01:02 +0200)]
Temporarily comment out unused import

9 years agoRemove unused code
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

9 years agoMerge branch 'feature/html5' of github.com:Parisson/telemeta into feature/html5
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

9 years agoServe media file through nginx
Thomas Fillon [Tue, 4 Apr 2017 22:44:35 +0000 (00:44 +0200)]
Serve media file through nginx

9 years agoPlayer: make SoudManager prefering HTML5 over Flash
Thomas Fillon [Mon, 3 Apr 2017 21:45:43 +0000 (23:45 +0200)]
Player: make SoudManager prefering HTML5 over Flash

9 years agoMerge branch 'feature/html5' of github.com:Parisson/Telemeta into feature/html5
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

9 years agoServe media with Nginx through Django authorization
Thomas Fillon [Sat, 25 Mar 2017 21:00:54 +0000 (22:00 +0100)]
Serve media with Nginx through Django authorization

9 years agoTravis: 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

9 years agoFix 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

9 years agoMerge branch 'master' into dev
Thomas Fillon [Thu, 23 Mar 2017 14:44:44 +0000 (15:44 +0100)]
Merge branch 'master' into dev

9 years agoUpdate UPN logo
Thomas Fillon [Thu, 23 Mar 2017 14:19:00 +0000 (15:19 +0100)]
Update UPN logo

9 years agoUpdate Nginx configuration to protect static files in media dedicated directory
Thomas Fillon [Mon, 6 Mar 2017 11:42:28 +0000 (12:42 +0100)]
Update Nginx configuration to protect static files in media dedicated directory

9 years agoAdd domain arg for import
Guillaume Pellerin [Tue, 22 Nov 2016 16:26:07 +0000 (17:26 +0100)]
Add domain arg for import

9 years agoFix CREM import with existing codes
Guillaume Pellerin [Tue, 22 Nov 2016 16:03:24 +0000 (17:03 +0100)]
Fix CREM import with existing codes

9 years agoAdd domain arg for import
Guillaume Pellerin [Tue, 22 Nov 2016 16:26:07 +0000 (17:26 +0100)]
Add domain arg for import

9 years agoMerge branch 'dev' of github.com:Parisson/Telemeta into dev
Guillaume Pellerin [Tue, 22 Nov 2016 16:03:57 +0000 (17:03 +0100)]
Merge branch 'dev' of github.com:Parisson/Telemeta into dev

9 years agoFix CREM import with existing codes
Guillaume Pellerin [Tue, 22 Nov 2016 16:03:24 +0000 (17:03 +0100)]
Fix CREM import with existing codes

9 years agoSpecify docker versions
Guillaume Pellerin [Tue, 15 Nov 2016 16:20:01 +0000 (17:20 +0100)]
Specify docker versions

9 years agoAdd missing migration
Thomas Fillon [Wed, 24 Aug 2016 13:20:23 +0000 (15:20 +0200)]
Add missing migration

9 years agoMerge pull request #136 from Parisson/maths28-patch-2
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

9 years agoMerge pull request #133 from maths28/dev
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

9 years agoMerge pull request #130 from lesaec/dev
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…

9 years agoFix process() error
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

9 years agoAdd next input for redirect to current url when change language
mathieu [Mon, 11 Jul 2016 09:33:57 +0000 (11:33 +0200)]
Add next input for redirect to current url when change language

9 years agoOptimization of RealTimeCustomSIgnal
mathieu [Mon, 11 Jul 2016 09:31:54 +0000 (11:31 +0200)]
Optimization of RealTimeCustomSIgnal

Modify methods of Signal
Add routers

9 years agofix file upload permissions
Guillaume Pellerin [Tue, 28 Jun 2016 10:40:38 +0000 (12:40 +0200)]
fix file upload permissions

9 years agobugfix
Guillaume Pellerin [Tue, 28 Jun 2016 10:31:45 +0000 (12:31 +0200)]
bugfix

9 years agofix duplicate test collection
Guillaume Pellerin [Tue, 28 Jun 2016 10:29:53 +0000 (12:29 +0200)]
fix duplicate test collection

9 years agoue default ES conf, try to fix lang menu against BIDI
Guillaume Pellerin [Mon, 20 Jun 2016 21:43:43 +0000 (23:43 +0200)]
ue default ES conf, try to fix lang menu against BIDI

9 years agoAjout lecture des sons dans telemeta/templates/telemeta/inc/mediaitem_list.html
lesaec [Mon, 20 Jun 2016 15:48:24 +0000 (17:48 +0200)]
Ajout lecture des sons dans telemeta/templates/telemeta/inc/mediaitem_list.html

9 years agofix duplicate method
Guillaume Pellerin [Tue, 14 Jun 2016 13:07:25 +0000 (15:07 +0200)]
fix duplicate method

9 years agoMerge pull request #126 from maths28/dev
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)

9 years agoRemove log
mathieu [Tue, 14 Jun 2016 10:30:38 +0000 (12:30 +0200)]
Remove log

9 years agoImprove loading resource for playlist player
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

9 years agoMerge branch 'dev'
Guillaume Pellerin [Tue, 14 Jun 2016 09:10:29 +0000 (11:10 +0200)]
Merge branch 'dev'

10 years agouse public_id
Guillaume Pellerin [Mon, 13 Jun 2016 14:38:19 +0000 (16:38 +0200)]
use public_id

10 years agoadd jsonrpc get_item_export_url method, cleanup
Guillaume Pellerin [Mon, 13 Jun 2016 14:33:01 +0000 (16:33 +0200)]
add jsonrpc get_item_export_url method, cleanup

10 years agore-add file url but can be overloading for big lists
Guillaume Pellerin [Mon, 13 Jun 2016 13:06:17 +0000 (15:06 +0200)]
re-add file url but can be overloading for big lists

10 years agono player for collections
Guillaume Pellerin [Mon, 13 Jun 2016 13:04:50 +0000 (15:04 +0200)]
no player for collections

10 years agoMerge branch 'dev' of github.com:Parisson/Telemeta into dev
Guillaume Pellerin [Fri, 10 Jun 2016 16:19:42 +0000 (18:19 +0200)]
Merge branch 'dev' of github.com:Parisson/Telemeta into dev

10 years agoMerge pull request #124 from maths28/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

10 years agoEnable toolbar when debug is True
mathieu [Fri, 10 Jun 2016 16:14:08 +0000 (18:14 +0200)]
Enable toolbar when debug is True

10 years agoincrease waiting time for DB up
Guillaume Pellerin [Fri, 10 Jun 2016 15:55:25 +0000 (17:55 +0200)]
increase waiting time for DB up

10 years agoplay button for item only
Guillaume Pellerin [Fri, 10 Jun 2016 15:32:42 +0000 (17:32 +0200)]
play button for item only

10 years agoMerge pull request #123 from maths28/dev
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

10 years agoFix enable debug toolbar in dev
mathieu [Fri, 10 Jun 2016 14:54:36 +0000 (16:54 +0200)]
Fix enable debug toolbar in dev

10 years agoMerge pull request #122 from maths28/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)

10 years agoFixs from master
mathieu [Fri, 10 Jun 2016 14:05:17 +0000 (16:05 +0200)]
Fixs from master

10 years agoMerge remote-tracking branch 'upstream/dev' into dev
mathieu [Fri, 10 Jun 2016 13:46:35 +0000 (15:46 +0200)]
Merge remote-tracking branch 'upstream/dev' into dev

10 years agoUpdate pages
mathieu [Fri, 10 Jun 2016 13:07:43 +0000 (15:07 +0200)]
Update pages

10 years agoAdd data in gitignore
mathieu [Fri, 10 Jun 2016 13:07:14 +0000 (15:07 +0200)]
Add data in gitignore

10 years agofix bower component
Guillaume Pellerin [Fri, 10 Jun 2016 12:46:15 +0000 (14:46 +0200)]
fix bower component

10 years agobugfix
Guillaume Pellerin [Fri, 10 Jun 2016 12:44:15 +0000 (14:44 +0200)]
bugfix

10 years agopin more bower components
Guillaume Pellerin [Fri, 10 Jun 2016 12:42:53 +0000 (14:42 +0200)]
pin more bower components

10 years agofix dockerignore againt data
Guillaume Pellerin [Fri, 10 Jun 2016 10:50:02 +0000 (12:50 +0200)]
fix dockerignore againt data

10 years agoMerge branch 'dev'
Guillaume Pellerin [Fri, 10 Jun 2016 09:18:08 +0000 (11:18 +0200)]
Merge branch 'dev'

10 years agoback to original haystack.signals.RealtimeSignalProcessor, fix auto_code for item... 1.6.3
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

10 years agoMerge branch 'dev' of github.com:Parisson/Telemeta into dev
Guillaume Pellerin [Thu, 9 Jun 2016 11:18:24 +0000 (13:18 +0200)]
Merge branch 'dev' of github.com:Parisson/Telemeta into dev

10 years agoadd timeside modules to volumes
Guillaume Pellerin [Thu, 9 Jun 2016 11:17:58 +0000 (13:17 +0200)]
add timeside modules to volumes

10 years agoadd TimeSide as a submodule
Guillaume Pellerin [Thu, 9 Jun 2016 11:15:02 +0000 (13:15 +0200)]
add TimeSide as a submodule

10 years agoMerge pull request #120 from maths28/dev
Guillaume Pellerin [Thu, 9 Jun 2016 09:52:25 +0000 (11:52 +0200)]
Merge pull request #120 from maths28/dev

Add spanish in languages list

10 years agoAdd spanish in languages list
mathieu [Thu, 9 Jun 2016 08:49:38 +0000 (10:49 +0200)]
Add spanish in languages list

10 years agogoto 1.6.3
Guillaume Pellerin [Wed, 8 Jun 2016 22:06:02 +0000 (00:06 +0200)]
goto 1.6.3

10 years agoMerge branch 'dev' 1.6.2
Guillaume Pellerin [Wed, 8 Jun 2016 22:05:13 +0000 (00:05 +0200)]
Merge branch 'dev'

Conflicts:
README.rst
app/scripts/app.sh

10 years agouse vanilla runserver
Guillaume Pellerin [Wed, 8 Jun 2016 22:04:19 +0000 (00:04 +0200)]
use vanilla runserver

10 years agoupdate pages
Guillaume Pellerin [Wed, 8 Jun 2016 22:01:04 +0000 (00:01 +0200)]
update pages

10 years ago1.6.2
Guillaume Pellerin [Wed, 8 Jun 2016 21:49:49 +0000 (23:49 +0200)]
1.6.2

10 years agoadd envs to doc
Guillaume Pellerin [Wed, 8 Jun 2016 20:44:07 +0000 (22:44 +0200)]
add envs to doc

10 years agoimprove backup / restore scripts
Guillaume Pellerin [Wed, 8 Jun 2016 20:40:36 +0000 (22:40 +0200)]
improve backup / restore scripts

10 years agouse data/mysql for DB in production
Guillaume Pellerin [Wed, 8 Jun 2016 20:25:52 +0000 (22:25 +0200)]
use data/mysql for DB in production

10 years agoput main HayStack parameters in env
Guillaume Pellerin [Wed, 8 Jun 2016 20:18:47 +0000 (22:18 +0200)]
put main HayStack parameters in env

10 years agocannot have autonomous and local only ES search container, so back to original conf
Guillaume Pellerin [Wed, 8 Jun 2016 20:02:24 +0000 (22:02 +0200)]
cannot have autonomous and local only ES search container, so back to original conf

10 years agoadd elasticsearch config with no multicast
Guillaume Pellerin [Tue, 7 Jun 2016 21:14:15 +0000 (23:14 +0200)]
add elasticsearch config with no multicast

Conflicts:
docker-compose.yml

10 years agoMerge pull request #119 from ThomasBalastegui/dev
Guillaume Pellerin [Sat, 4 Jun 2016 18:29:13 +0000 (20:29 +0200)]
Merge pull request #119 from ThomasBalastegui/dev

Fixed bug adding/updating a playlist

10 years agoFixed bug adding/updating a playlist
balastegui [Fri, 3 Jun 2016 13:24:55 +0000 (15:24 +0200)]
Fixed bug adding/updating a playlist

10 years agoMerge branch 'dev' of github.com:Parisson/Telemeta into dev
Guillaume Pellerin [Thu, 2 Jun 2016 10:06:16 +0000 (12:06 +0200)]
Merge branch 'dev' of github.com:Parisson/Telemeta into dev

10 years agouse bootstrap style for language selector
Guillaume Pellerin [Thu, 2 Jun 2016 10:05:18 +0000 (12:05 +0200)]
use bootstrap style for language selector

10 years agoMerge pull request #118 from ThomasBalastegui/dev
Guillaume Pellerin [Thu, 2 Jun 2016 09:38:52 +0000 (11:38 +0200)]
Merge pull request #118 from ThomasBalastegui/dev

Simple Player JavaScript restructuring

10 years agoSimple Player JavaScript restructuring
balastegui [Thu, 2 Jun 2016 08:22:45 +0000 (10:22 +0200)]
Simple Player JavaScript restructuring

10 years agono redirect after lang select
Guillaume Pellerin [Tue, 31 May 2016 15:10:43 +0000 (17:10 +0200)]
no redirect after lang select

10 years agofix menu lang
Guillaume Pellerin [Tue, 31 May 2016 15:08:19 +0000 (17:08 +0200)]
fix menu lang

10 years agoauto select language
Guillaume Pellerin [Tue, 31 May 2016 15:06:22 +0000 (17:06 +0200)]
auto select language

10 years agoMerge pull request #113 from maths28/dev
Guillaume Pellerin [Tue, 31 May 2016 13:47:45 +0000 (15:47 +0200)]
Merge pull request #113 from maths28/dev

Improve Search Engine + Playlist

10 years agoFix tablesorter
mathieu [Tue, 31 May 2016 11:53:37 +0000 (13:53 +0200)]
Fix tablesorter
Remove parser numerised
Add invisible paragraph in haystack results list in order to keep
sort funtion in this list

10 years agoMerge pull request #117 from ThomasBalastegui/dev
Guillaume Pellerin [Tue, 31 May 2016 09:24:58 +0000 (11:24 +0200)]
Merge pull request #117 from ThomasBalastegui/dev

Changed the place of the play button

10 years agoChanged the place of the play button
balastegui [Tue, 31 May 2016 09:18:42 +0000 (11:18 +0200)]
Changed the place of the play button

10 years agoMerge pull request #116 from ThomasBalastegui/dev
Guillaume Pellerin [Mon, 30 May 2016 10:46:24 +0000 (12:46 +0200)]
Merge pull request #116 from ThomasBalastegui/dev

Functions added and changed for the Simple Player (playlist)

10 years agofunction to play/stop audio and to change GlyphIcons
balastegui [Fri, 27 May 2016 13:25:50 +0000 (15:25 +0200)]
function to play/stop audio and to change GlyphIcons

10 years agoMerge branch 'dev' of https://github.com/ThomasBalastegui/Telemeta into dev
balastegui [Tue, 24 May 2016 08:34:33 +0000 (10:34 +0200)]
Merge branch 'dev' of https://github.com/ThomasBalastegui/Telemeta into dev

Update playlist.js

10 years agoMerge pull request #1 from maths28/patch-1
ThomasBalastegui [Tue, 24 May 2016 08:32:32 +0000 (10:32 +0200)]
Merge pull request #1 from maths28/patch-1

Fix compatibility format

10 years agoFix compatibility format
maths28 [Sun, 22 May 2016 13:49:27 +0000 (15:49 +0200)]
Fix compatibility format

FIx compatibility by change format of file resource to "ogg" instead of "mp3" when an error occurs
 in an old browser like in my case Firefox 28.0

10 years agoMerge branch 'ThomasBalastegui-dev' into dev
Guillaume Pellerin [Fri, 20 May 2016 16:41:03 +0000 (18:41 +0200)]
Merge branch 'ThomasBalastegui-dev' into dev

10 years agoMerge pull request #114 from ThomasBalastegui/dev
Guillaume Pellerin [Fri, 20 May 2016 16:40:49 +0000 (18:40 +0200)]
Merge pull request #114 from ThomasBalastegui/dev

Add simpler player for items in the playlists

10 years agofix item file url for tiny player
Guillaume Pellerin [Fri, 20 May 2016 16:29:37 +0000 (18:29 +0200)]
fix item file url for tiny player