]> git.parisson.com Git - telemeta.git/log
telemeta.git
6 years agoDeactivate video.js for now 1.6.6
Guillaume Pellerin [Mon, 4 Jun 2018 10:51:34 +0000 (12:51 +0200)]
Deactivate video.js for now

6 years agoUse local compiled video.js files
Guillaume Pellerin [Mon, 4 Jun 2018 10:47:59 +0000 (12:47 +0200)]
Use local compiled video.js files

6 years agoBugfix, finally fixes #200
Guillaume Pellerin [Mon, 4 Jun 2018 10:42:05 +0000 (12:42 +0200)]
Bugfix, finally fixes #200

6 years agoAdd phpmyadmin separated container
Guillaume Pellerin [Mon, 4 Jun 2018 09:56:43 +0000 (11:56 +0200)]
Add phpmyadmin separated container

6 years agoMerge branch 'master' of github.com:Parisson/Telemeta
Guillaume Pellerin [Sun, 3 Jun 2018 22:51:37 +0000 (00:51 +0200)]
Merge branch 'master' of github.com:Parisson/Telemeta

6 years agoFix video streaming, remove phpmyadmin by default,
Guillaume Pellerin [Sun, 3 Jun 2018 22:47:15 +0000 (00:47 +0200)]
Fix video streaming, remove phpmyadmin by default,

6 years agoUpdate docker-compose.yml
Anas [Thu, 17 May 2018 21:31:24 +0000 (22:31 +0100)]
Update docker-compose.yml

6 years agoMerge pull request #202 from Parisson/mysql-version
Guillaume Pellerin [Wed, 16 May 2018 16:15:02 +0000 (18:15 +0200)]
Merge pull request #202 from Parisson/mysql-version

Update docker-compose.yml

6 years agoUpdate docker-compose.yml
Anas [Sat, 5 May 2018 17:51:10 +0000 (18:51 +0100)]
Update docker-compose.yml

Specifying the mysql:5.7 version

7 years agoCollect static only at init
Guillaume Pellerin [Mon, 12 Mar 2018 11:08:41 +0000 (12:08 +0100)]
Collect static only at init

7 years agoReinstall south at start
Guillaume Pellerin [Mon, 12 Mar 2018 11:08:01 +0000 (12:08 +0100)]
Reinstall south at start

7 years agoFix various form fields, fix delete cache file, fix deprecated
Guillaume Pellerin [Mon, 12 Mar 2018 11:05:54 +0000 (12:05 +0100)]
Fix various form fields, fix delete cache file, fix deprecated

7 years agoNginx timesout to 600s
Guillaume Pellerin [Thu, 22 Feb 2018 12:19:27 +0000 (13:19 +0100)]
Nginx timesout to 600s

7 years agoAdd wsgi touch-reload /srv/app/wsgi.py
Guillaume Pellerin [Mon, 19 Feb 2018 23:36:09 +0000 (00:36 +0100)]
Add wsgi touch-reload /srv/app/wsgi.py

7 years agoFix ItemView.request, cleanup prints
Guillaume Pellerin [Mon, 19 Feb 2018 23:29:35 +0000 (00:29 +0100)]
Fix ItemView.request, cleanup prints

7 years ago1.6.5 1.6.5
Guillaume Pellerin [Thu, 15 Feb 2018 15:36:09 +0000 (16:36 +0100)]
1.6.5

7 years agouse 1.6 image
Guillaume Pellerin [Thu, 15 Feb 2018 14:28:27 +0000 (15:28 +0100)]
use 1.6 image

7 years agoUse 1.6.x image in prod, migration and bower install only at init, fix graphers listing
Guillaume Pellerin [Thu, 15 Feb 2018 14:17:47 +0000 (15:17 +0100)]
Use 1.6.x image in prod, migration and bower install only at init, fix graphers listing

7 years agoUse official docker image, add build.yml building env, fix dockerignore paths
Guillaume Pellerin [Thu, 15 Feb 2018 11:41:31 +0000 (12:41 +0100)]
Use official docker image, add build.yml building env, fix dockerignore paths

7 years agoMerge branch 'hotfix/graphers' graphers
Guillaume Pellerin [Wed, 7 Feb 2018 09:06:20 +0000 (10:06 +0100)]
Merge branch 'hotfix/graphers'

7 years agoFix user analysis run permission
Guillaume Pellerin [Wed, 7 Feb 2018 09:05:52 +0000 (10:05 +0100)]
Fix user analysis run permission

7 years agoFix apt update 1.6.4c
Guillaume Pellerin [Mon, 25 Dec 2017 23:48:41 +0000 (00:48 +0100)]
Fix apt update

7 years agomkdir /srv/media
Guillaume Pellerin [Thu, 21 Dec 2017 19:03:58 +0000 (20:03 +0100)]
mkdir /srv/media

7 years agoUse TimeSide master branch
Guillaume Pellerin [Thu, 19 Oct 2017 05:10:00 +0000 (07:10 +0200)]
Use TimeSide master branch

7 years agoMerge branch 'dev' of github.com:Parisson/Telemeta into dev
Guillaume Pellerin [Tue, 17 Oct 2017 16:12:48 +0000 (18:12 +0200)]
Merge branch 'dev' of github.com:Parisson/Telemeta into dev

7 years agouse Timeside dev branch
Guillaume Pellerin [Tue, 17 Oct 2017 16:12:31 +0000 (18:12 +0200)]
use Timeside dev branch

7 years agoMerge branch 'master' into dev
Thomas Fillon [Wed, 4 Oct 2017 07:18:17 +0000 (09:18 +0200)]
Merge branch 'master' into dev

7 years ago Fix docker composition Timeside plugin mounting
Thomas Fillon [Tue, 3 Oct 2017 10:50:06 +0000 (12:50 +0200)]
 Fix docker composition Timeside plugin mounting

7 years agoUpdate .travis.yml
Thomas Fillon [Mon, 2 Oct 2017 07:49:48 +0000 (09:49 +0200)]
Update .travis.yml

Add curl access test to some test item url

7 years agoAdd ghp-import
Guillaume Pellerin [Tue, 3 Oct 2017 13:44:11 +0000 (15:44 +0200)]
Add ghp-import

7 years ago Fix docker composition Timeside plugin mounting
Thomas Fillon [Tue, 3 Oct 2017 10:50:06 +0000 (12:50 +0200)]
 Fix docker composition Timeside plugin mounting

7 years agoUpdate Timeside submodule
Thomas Fillon [Mon, 2 Oct 2017 14:20:35 +0000 (16:20 +0200)]
Update Timeside submodule

7 years agoUpdate .travis.yml
Thomas Fillon [Mon, 2 Oct 2017 07:49:48 +0000 (09:49 +0200)]
Update .travis.yml

Add curl access test to some test item url

7 years agoadd pdoc script
Guillaume Pellerin [Fri, 29 Sep 2017 09:00:01 +0000 (11:00 +0200)]
add pdoc script

7 years agoAdd doc modules and pdoc custom script
Guillaume Pellerin [Fri, 29 Sep 2017 08:59:09 +0000 (10:59 +0200)]
Add doc modules and pdoc custom script

7 years agoRestrict chown fix to depth level 1
Thomas Fillon [Wed, 20 Sep 2017 10:23:30 +0000 (12:23 +0200)]
Restrict chown fix to depth level 1

This should prevent very long recursive checking in production.

Move the code in order to execute that line only for production (and not runserver)

7 years agoRestore /media directory owner fix
Thomas Fillon [Tue, 19 Sep 2017 16:15:18 +0000 (18:15 +0200)]
Restore /media directory owner fix

7 years agofix TimeSide HEAD 1.6.4b
Guillaume Pellerin [Mon, 18 Sep 2017 10:39:49 +0000 (12:39 +0200)]
fix TimeSide HEAD

7 years agoRe-move search templates
Guillaume Pellerin [Mon, 18 Sep 2017 10:00:15 +0000 (12:00 +0200)]
Re-move search templates

7 years agofix video extension
Guillaume Pellerin [Mon, 18 Sep 2017 00:09:46 +0000 (02:09 +0200)]
fix video extension

7 years agoMerge branch 'dev' of github.com:Parisson/Telemeta into dev
Guillaume Pellerin [Sun, 17 Sep 2017 23:28:11 +0000 (01:28 +0200)]
Merge branch 'dev' of github.com:Parisson/Telemeta into dev

7 years agoFix video player URL against X-Accel, allow not download extension, disable media...
Guillaume Pellerin [Sun, 17 Sep 2017 23:25:57 +0000 (01:25 +0200)]
Fix video player URL against X-Accel, allow not download extension, disable media dir access rights modification

7 years agoupdate timeside 1.6.4a
Guillaume Pellerin [Sun, 17 Sep 2017 22:02:14 +0000 (00:02 +0200)]
update timeside

7 years agoMerge branch 'master' into dev
Guillaume Pellerin [Sun, 17 Sep 2017 21:51:22 +0000 (23:51 +0200)]
Merge branch 'master' into dev

7 years agoUpdate doc
Guillaume Pellerin [Sun, 17 Sep 2017 21:50:21 +0000 (23:50 +0200)]
Update doc

7 years agoMerge tag '1.6.4' into dev
Guillaume Pellerin [Sun, 17 Sep 2017 21:45:10 +0000 (23:45 +0200)]
Merge tag '1.6.4' into dev

1.6.4

7 years agoMerge branch 'release/1.6.4' 1.6.4
Guillaume Pellerin [Sun, 17 Sep 2017 21:44:27 +0000 (23:44 +0200)]
Merge branch 'release/1.6.4'

7 years agoMerge branch 'feature/eunmeration' into dev
Guillaume Pellerin [Sun, 17 Sep 2017 20:05:25 +0000 (22:05 +0200)]
Merge branch 'feature/eunmeration' into dev

7 years agocollecstatic only in production
Guillaume Pellerin [Sun, 17 Sep 2017 19:58:02 +0000 (21:58 +0200)]
collecstatic only in production

7 years agobegin database enumeration property management
Guillaume Pellerin [Sun, 17 Sep 2017 19:23:49 +0000 (21:23 +0200)]
begin database enumeration property management

7 years agoComment setup.py
Thomas Fillon [Fri, 25 Aug 2017 08:49:34 +0000 (10:49 +0200)]
Comment setup.py

Django-dirtyfields version pinned for compatibility with Django 1.6

7 years agoRe-order setup and pin dirtyfields
Guillaume Pellerin [Thu, 24 Aug 2017 17:29:22 +0000 (19:29 +0200)]
Re-order setup and pin dirtyfields

7 years agoMerge branch 'dev' of github.com:Parisson/Telemeta into dev
Guillaume Pellerin [Thu, 24 Aug 2017 16:56:09 +0000 (18:56 +0200)]
Merge branch 'dev' of github.com:Parisson/Telemeta into dev

7 years agoMerge pull request #191 from Parisson/master
Guillaume Pellerin [Thu, 24 Aug 2017 16:52:05 +0000 (18:52 +0200)]
Merge pull request #191 from Parisson/master

Merge master into Dev

7 years agoMerge branch 'dev' into feature/eunmeration
Guillaume Pellerin [Thu, 24 Aug 2017 16:50:33 +0000 (18:50 +0200)]
Merge branch 'dev' into feature/eunmeration

7 years agoMerge branch 'dev' of github.com:Parisson/Telemeta into dev
Guillaume Pellerin [Thu, 24 Aug 2017 16:27:44 +0000 (18:27 +0200)]
Merge branch 'dev' of github.com:Parisson/Telemeta into dev

7 years agoAdd more logs to .travis.yml
Thomas Fillon [Thu, 24 Aug 2017 10:43:49 +0000 (12:43 +0200)]
Add more logs to .travis.yml

7 years agoRemove lib/plugins mounting
Thomas Fillon [Thu, 24 Aug 2017 10:23:03 +0000 (12:23 +0200)]
Remove lib/plugins mounting

7 years agoUpdate Timeside submodule to master tip
Thomas Fillon [Thu, 24 Aug 2017 09:26:13 +0000 (11:26 +0200)]
Update Timeside submodule to master tip

7 years agoMove resource code validators outside the MediaBaseResource class
Thomas Fillon [Thu, 24 Aug 2017 08:53:29 +0000 (10:53 +0200)]
Move resource code validators outside the MediaBaseResource class

Conflicts:
telemeta/models/resource.py

7 years agoprepare Enumeration properties
Guillaume Pellerin [Fri, 18 Aug 2017 13:53:46 +0000 (15:53 +0200)]
prepare Enumeration properties

7 years agoFix urls against PR #184
Guillaume Pellerin [Wed, 16 Aug 2017 16:42:41 +0000 (18:42 +0200)]
Fix urls against PR #184

7 years agoPrepare Enumeration management by database
Guillaume Pellerin [Fri, 11 Aug 2017 09:41:43 +0000 (11:41 +0200)]
Prepare Enumeration management by database

7 years agoUpdate install.py with last version
Guillaume Pellerin [Wed, 9 Aug 2017 15:05:39 +0000 (17:05 +0200)]
Update install.py with last version

7 years agoAdd apps.py for future versions based on django>=1.8
Guillaume Pellerin [Wed, 9 Aug 2017 08:24:44 +0000 (10:24 +0200)]
Add apps.py for future versions based on django>=1.8

7 years agoFix debug_toobar config against docker bridge, remove wavejs tools for now
Guillaume Pellerin [Wed, 9 Aug 2017 08:06:43 +0000 (10:06 +0200)]
Fix debug_toobar config against docker bridge, remove wavejs tools for now

7 years agoAllow empty lists in Fonds and Corpus edit page (fix #188 #167)
Guillaume Pellerin [Fri, 4 Aug 2017 22:46:14 +0000 (00:46 +0200)]
Allow empty lists in Fonds and Corpus edit page (fix #188 #167)

7 years agoAllow empty lists in Fonds and Corpus edit page (fix #188 #167)
Guillaume Pellerin [Fri, 4 Aug 2017 22:46:14 +0000 (00:46 +0200)]
Allow empty lists in Fonds and Corpus edit page (fix #188 #167)

7 years agoBugfix: search indexes back to templates/search
Guillaume Pellerin [Fri, 4 Aug 2017 22:23:17 +0000 (00:23 +0200)]
Bugfix: search indexes back to templates/search

7 years agoAdd a regex based validator to Resource.code (fix #187)
Guillaume Pellerin [Fri, 4 Aug 2017 22:20:32 +0000 (00:20 +0200)]
Add a regex based validator to Resource.code (fix #187)

7 years agoSelect all items in collection (fix #151)
Guillaume Pellerin [Fri, 4 Aug 2017 21:01:45 +0000 (23:01 +0200)]
Select all items in collection (fix #151)

7 years agoAdd static_url var to base.html
Guillaume Pellerin [Fri, 4 Aug 2017 20:36:26 +0000 (22:36 +0200)]
Add static_url var to base.html

7 years agoAdd static_url var to base.html
Guillaume Pellerin [Fri, 4 Aug 2017 20:36:26 +0000 (22:36 +0200)]
Add static_url var to base.html

7 years agouse back local timeside
Guillaume Pellerin [Fri, 4 Aug 2017 20:22:18 +0000 (22:22 +0200)]
use back local timeside

7 years agobugfix
Guillaume Pellerin [Fri, 4 Aug 2017 16:33:13 +0000 (18:33 +0200)]
bugfix

7 years agobugfix
Guillaume Pellerin [Fri, 4 Aug 2017 16:33:13 +0000 (18:33 +0200)]
bugfix

7 years agoMerge tag 'search' into dev
Guillaume Pellerin [Fri, 4 Aug 2017 16:31:42 +0000 (18:31 +0200)]
Merge tag 'search' into dev

fix search form

7 years agoMerge branch 'hotfix/search' search
Guillaume Pellerin [Fri, 4 Aug 2017 16:30:58 +0000 (18:30 +0200)]
Merge branch 'hotfix/search'

7 years agoUse nav.html
Guillaume Pellerin [Fri, 4 Aug 2017 16:29:35 +0000 (18:29 +0200)]
Use nav.html

7 years agoMerge tag 'search' into dev
Guillaume Pellerin [Fri, 4 Aug 2017 14:09:10 +0000 (16:09 +0200)]
Merge tag 'search' into dev

Fix advanced search

7 years agoMerge branch 'hotfix/search'
Guillaume Pellerin [Fri, 4 Aug 2017 14:06:37 +0000 (16:06 +0200)]
Merge branch 'hotfix/search'

7 years agoignore more dirs
Guillaume Pellerin [Fri, 4 Aug 2017 14:06:14 +0000 (16:06 +0200)]
ignore more dirs

7 years agoFix advanced search page using jquery-ui 1.11, mv search template directory
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

7 years agoMerge branch 'feature/enumeration' into dev
Guillaume Pellerin [Fri, 4 Aug 2017 05:58:30 +0000 (07:58 +0200)]
Merge branch 'feature/enumeration' into dev

7 years agoOwn template for tabs, remove Users tab entry (use native admin user list for this...
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)

7 years agoFix tab color and structure
Guillaume Pellerin [Fri, 4 Aug 2017 05:48:14 +0000 (07:48 +0200)]
Fix tab color and structure

7 years agoMerge pull request #184 from netonicolas/feature/enumeration
Guillaume Pellerin [Fri, 4 Aug 2017 05:36:16 +0000 (07:36 +0200)]
Merge pull request #184 from netonicolas/feature/enumeration

Terminology tab

7 years agomount timeside plugins volume, add jqchat as editable module
Guillaume Pellerin [Fri, 28 Jul 2017 22:58:52 +0000 (00:58 +0200)]
mount timeside plugins volume, add jqchat as editable module

7 years agochange access permission
nicolas neto [Thu, 13 Jul 2017 10:25:58 +0000 (12:25 +0200)]
change access permission

7 years agocorrect other bugs
nicolas neto [Wed, 12 Jul 2017 14:54:56 +0000 (16:54 +0200)]
correct  other bugs

7 years agocorrect bugs
nicolas neto [Wed, 12 Jul 2017 14:47:31 +0000 (16:47 +0200)]
correct  bugs

7 years agospelling mistake
nicolas neto [Wed, 12 Jul 2017 14:13:21 +0000 (16:13 +0200)]
spelling mistake

7 years agochange permission documentalist
nicolas neto [Wed, 12 Jul 2017 14:08:36 +0000 (16:08 +0200)]
change permission documentalist

7 years agoadd change enumeration permanent
nicolas neto [Wed, 12 Jul 2017 13:10:16 +0000 (15:10 +0200)]
add change enumeration permanent

7 years agoenvironnement variable change
nicolas neto [Mon, 10 Jul 2017 14:45:28 +0000 (16:45 +0200)]
environnement variable change

7 years agocorrect
nicolas neto [Thu, 6 Jul 2017 14:18:48 +0000 (16:18 +0200)]
correct

7 years agodel enum in user nav
nicolas neto [Thu, 6 Jul 2017 12:30:09 +0000 (14:30 +0200)]
del enum in user nav

7 years agoinstrument alias replace by instrument (vernacular)
nicolas neto [Thu, 6 Jul 2017 11:33:46 +0000 (13:33 +0200)]
instrument alias replace by instrument (vernacular)

7 years agovocabulare user/admin change
nicolas neto [Thu, 6 Jul 2017 11:28:05 +0000 (13:28 +0200)]
vocabulare user/admin change

7 years agoDocker: install plugins dependencies before Telemeta
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