]>
git.parisson.com Git - telemeta.git/log
Guillaume Pellerin [Fri, 4 Aug 2017 21:01:45 +0000 (23:01 +0200)]
Select all items in collection (fix #151)
Guillaume Pellerin [Fri, 4 Aug 2017 20:36:26 +0000 (22:36 +0200)]
Add static_url var to base.html
Guillaume Pellerin [Fri, 4 Aug 2017 20:22:18 +0000 (22:22 +0200)]
use back local timeside
Guillaume Pellerin [Fri, 4 Aug 2017 16:33:13 +0000 (18:33 +0200)]
bugfix
Guillaume Pellerin [Fri, 4 Aug 2017 16:31:42 +0000 (18:31 +0200)]
Merge tag 'search' into dev
fix search form
Guillaume Pellerin [Fri, 4 Aug 2017 16:30:58 +0000 (18:30 +0200)]
Merge branch 'hotfix/search'
Guillaume Pellerin [Fri, 4 Aug 2017 16:29:35 +0000 (18:29 +0200)]
Use nav.html
Guillaume Pellerin [Fri, 4 Aug 2017 14:09:10 +0000 (16:09 +0200)]
Merge tag 'search' into dev
Fix advanced search
Guillaume Pellerin [Fri, 4 Aug 2017 14:06:37 +0000 (16:06 +0200)]
Merge branch 'hotfix/search'
Guillaume Pellerin [Fri, 4 Aug 2017 14:06:14 +0000 (16:06 +0200)]
ignore more dirs
Guillaume Pellerin [Fri, 4 Aug 2017 14:00:52 +0000 (16:00 +0200)]
Fix advanced search page using jquery-ui 1.11, mv search template directory
Guillaume Pellerin [Fri, 4 Aug 2017 05:58:30 +0000 (07:58 +0200)]
Merge branch 'feature/enumeration' into dev
Guillaume Pellerin [Fri, 4 Aug 2017 05:54:03 +0000 (07:54 +0200)]
Own template for tabs, remove Users tab entry (use native admin user list for this now)
Guillaume Pellerin [Fri, 4 Aug 2017 05:48:14 +0000 (07:48 +0200)]
Fix tab color and structure
Guillaume Pellerin [Fri, 4 Aug 2017 05:36:16 +0000 (07:36 +0200)]
Merge pull request #184 from netonicolas/feature/enumeration
Terminology tab
Guillaume Pellerin [Fri, 28 Jul 2017 22:58:52 +0000 (00:58 +0200)]
mount timeside plugins volume, add jqchat as editable module
nicolas neto [Thu, 13 Jul 2017 10:25:58 +0000 (12:25 +0200)]
change access permission
nicolas neto [Wed, 12 Jul 2017 14:54:56 +0000 (16:54 +0200)]
correct other bugs
nicolas neto [Wed, 12 Jul 2017 14:47:31 +0000 (16:47 +0200)]
correct bugs
nicolas neto [Wed, 12 Jul 2017 14:13:21 +0000 (16:13 +0200)]
spelling mistake
nicolas neto [Wed, 12 Jul 2017 14:08:36 +0000 (16:08 +0200)]
change permission documentalist
nicolas neto [Wed, 12 Jul 2017 13:10:16 +0000 (15:10 +0200)]
add change enumeration permanent
nicolas neto [Mon, 10 Jul 2017 14:45:28 +0000 (16:45 +0200)]
environnement variable change
nicolas neto [Thu, 6 Jul 2017 14:18:48 +0000 (16:18 +0200)]
correct
nicolas neto [Thu, 6 Jul 2017 12:30:09 +0000 (14:30 +0200)]
del enum in user nav
nicolas neto [Thu, 6 Jul 2017 11:33:46 +0000 (13:33 +0200)]
instrument alias replace by instrument (vernacular)
nicolas neto [Thu, 6 Jul 2017 11:28:05 +0000 (13:28 +0200)]
vocabulare user/admin change
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
nicolas neto [Wed, 5 Jul 2017 09:19:15 +0000 (11:19 +0200)]
add vocabulary tab
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
nicolas neto [Tue, 4 Jul 2017 15:02:31 +0000 (17:02 +0200)]
count enumeration value in admin
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 21:34:20 +0000 (23:34 +0200)]
Merge branch 'release/1.6.4'
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 [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 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: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 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: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