]>
git.parisson.com Git - telemeta.git/log
Thomas Fillon [Tue, 24 Jan 2017 15:54:14 +0000 (16:54 +0100)]
Fix missing module issue in Django 1.9
Thomas Fillon [Tue, 24 Jan 2017 15:53:43 +0000 (16:53 +0100)]
Django 1.9 upgrade: update some requirements for compatibility
Thomas Fillon [Tue, 24 Jan 2017 15:37:36 +0000 (16:37 +0100)]
Update Timeside submodule
Guillaume Pellerin [Fri, 20 Jan 2017 16:22:05 +0000 (17:22 +0100)]
Use custom django-ipauth
Guillaume Pellerin [Fri, 20 Jan 2017 15:52:34 +0000 (16:52 +0100)]
Add all fields (WARNING, check forms!)
Guillaume Pellerin [Fri, 20 Jan 2017 15:22:12 +0000 (16:22 +0100)]
Add migrations 0001 based on django 1.8 migration system, add init script
Thomas Fillon [Fri, 20 Jan 2017 15:17:39 +0000 (16:17 +0100)]
Staging in app.sh: uninstall south, add -y option
Guillaume Pellerin [Fri, 20 Jan 2017 15:12:59 +0000 (16:12 +0100)]
Exclude IpAuth FTM, use some native charfield, fix collection validation function
Guillaume Pellerin [Fri, 20 Jan 2017 14:36:10 +0000 (15:36 +0100)]
Fix date errors using native date fields
Thomas Fillon [Fri, 20 Jan 2017 14:27:43 +0000 (15:27 +0100)]
Staging in app.sh: uninstall south
Thomas Fillon [Wed, 18 Jan 2017 12:48:49 +0000 (13:48 +0100)]
Merge branch 'feature/dj1.8' of github.com:Parisson/Telemeta into feature/dj1.8
Thomas Fillon [Wed, 18 Jan 2017 12:41:10 +0000 (13:41 +0100)]
Fix db_type methode
db_type method takes 2 argument. See https://docs.djangoproject.com/en/1.7/howto/custom-model-fields/#custom-database-types
Guillaume Pellerin [Wed, 18 Jan 2017 09:57:30 +0000 (10:57 +0100)]
Fix migration folder, remove south
Thomas Fillon [Tue, 17 Jan 2017 16:52:02 +0000 (17:52 +0100)]
Fix ImproperlyConfigured Exception for ModelForm
The issue was caused by this change in Django 1.8:
In older versions, omitting both fields and exclude resulted in a form with all the model’s fields. Doing this now raises an ImproperlyConfigured exception.
See https://docs.djangoproject.com/en/1.8/topics/forms/modelforms/#selecting-the-fields-to-use
Thomas Fillon [Mon, 16 Jan 2017 09:41:24 +0000 (10:41 +0100)]
Merge branch 'dev' into feature/dj1.8
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:57:29 +0000 (15:57 +0200)]
Merge branch 'dev' into feature/dj1.8
Conflicts:
app/settings.py
examples/sandbox/wsgi.py
setup.py
telemeta/locale
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 [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 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
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
mathieu [Thu, 9 Jun 2016 08:49:38 +0000 (10:49 +0200)]
Add spanish in languages list
Guillaume Pellerin [Wed, 8 Jun 2016 22:06:02 +0000 (00:06 +0200)]
goto 1.6.3
Guillaume Pellerin [Wed, 8 Jun 2016 22:04:19 +0000 (00:04 +0200)]
use vanilla runserver
Guillaume Pellerin [Wed, 8 Jun 2016 22:01:04 +0000 (00:01 +0200)]
update pages
Guillaume Pellerin [Wed, 8 Jun 2016 21:49:49 +0000 (23:49 +0200)]
1.6.2
Guillaume Pellerin [Wed, 8 Jun 2016 20:44:07 +0000 (22:44 +0200)]
add envs to doc
Guillaume Pellerin [Wed, 8 Jun 2016 20:40:36 +0000 (22:40 +0200)]
improve backup / restore scripts
Guillaume Pellerin [Wed, 8 Jun 2016 20:25:52 +0000 (22:25 +0200)]
use data/mysql for DB in production
Guillaume Pellerin [Wed, 8 Jun 2016 20:18:47 +0000 (22:18 +0200)]
put main HayStack parameters in env
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
Guillaume Pellerin [Tue, 7 Jun 2016 21:14:15 +0000 (23:14 +0200)]
add elasticsearch config with no multicast
Conflicts:
docker-compose.yml
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
balastegui [Fri, 3 Jun 2016 13:24:55 +0000 (15:24 +0200)]
Fixed bug adding/updating a playlist
Guillaume Pellerin [Thu, 2 Jun 2016 10:06:16 +0000 (12:06 +0200)]
Merge branch 'dev' of github.com:Parisson/Telemeta into dev
Guillaume Pellerin [Thu, 2 Jun 2016 10:05:18 +0000 (12:05 +0200)]
use bootstrap style for language selector
Guillaume Pellerin [Thu, 2 Jun 2016 09:38:52 +0000 (11:38 +0200)]
Merge pull request #118 from ThomasBalastegui/dev
Simple Player JavaScript restructuring
balastegui [Thu, 2 Jun 2016 08:22:45 +0000 (10:22 +0200)]
Simple Player JavaScript restructuring
Guillaume Pellerin [Tue, 31 May 2016 15:10:43 +0000 (17:10 +0200)]
no redirect after lang select
Guillaume Pellerin [Tue, 31 May 2016 15:08:19 +0000 (17:08 +0200)]
fix menu lang
Guillaume Pellerin [Tue, 31 May 2016 15:06:22 +0000 (17:06 +0200)]
auto select language
Guillaume Pellerin [Tue, 31 May 2016 13:47:45 +0000 (15:47 +0200)]
Merge pull request #113 from maths28/dev
Improve Search Engine + Playlist
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
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
balastegui [Tue, 31 May 2016 09:18:42 +0000 (11:18 +0200)]
Changed the place of the play button
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)
balastegui [Fri, 27 May 2016 13:25:50 +0000 (15:25 +0200)]
function to play/stop audio and to change GlyphIcons
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
ThomasBalastegui [Tue, 24 May 2016 08:32:32 +0000 (10:32 +0200)]
Merge pull request #1 from maths28/patch-1
Fix 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
Guillaume Pellerin [Fri, 20 May 2016 16:41:03 +0000 (18:41 +0200)]
Merge branch 'ThomasBalastegui-dev' into 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
Guillaume Pellerin [Fri, 20 May 2016 16:29:37 +0000 (18:29 +0200)]
fix item file url for tiny player
Guillaume Pellerin [Fri, 20 May 2016 15:56:35 +0000 (17:56 +0200)]
Merge branch 'dev' of https://github.com/ThomasBalastegui/Telemeta into ThomasBalastegui-dev
Guillaume Pellerin [Fri, 20 May 2016 15:56:22 +0000 (17:56 +0200)]
Merge branch 'dev' into ThomasBalastegui-dev
mathieu [Thu, 19 May 2016 12:01:11 +0000 (14:01 +0200)]
Merge remote-tracking branch 'origin/devinstable' into dev
mathieu [Thu, 19 May 2016 11:48:06 +0000 (13:48 +0200)]
Disable boolean search for future fix
mathieu [Thu, 19 May 2016 11:21:14 +0000 (13:21 +0200)]
Move functions boolean search to boolean_search.py
Fix import error
mathieu [Thu, 19 May 2016 08:58:13 +0000 (10:58 +0200)]
Fix autocomplete location + move scripts from mediaitem_list.html to mediaitem_list.js
balastegui [Thu, 19 May 2016 08:35:29 +0000 (10:35 +0200)]
update
mathieu [Thu, 19 May 2016 08:26:33 +0000 (10:26 +0200)]
Modify app.sh (merge Parisson)
mathieu [Wed, 18 May 2016 15:59:02 +0000 (17:59 +0200)]
Move scripts from advanceSearch.html to advanceSearch.js
mathieu [Wed, 18 May 2016 10:39:33 +0000 (12:39 +0200)]
Fix whitespace
mathieu [Wed, 18 May 2016 10:36:29 +0000 (12:36 +0200)]
End lowercase + english