]>
git.parisson.com Git - telemeta.git/log
Guillaume Pellerin [Wed, 7 Jun 2017 15:37:30 +0000 (17:37 +0200)]
Local Update of settings.py
Guillaume Pellerin [Wed, 7 Jun 2017 15:33:59 +0000 (17:33 +0200)]
Update telemeta/pages submodule
Guillaume Pellerin [Wed, 7 Jun 2017 15:33:33 +0000 (17:33 +0200)]
Comment playlist player
Guillaume Pellerin [Thu, 24 Nov 2016 11:06:25 +0000 (12:06 +0100)]
Merge branch 'crem' of https://github.com/Parisson/Telemeta into crem
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 [Fri, 10 Jun 2016 15:33:15 +0000 (17:33 +0200)]
Merge remote-tracking branch 'origin' into crem
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:09:37 +0000 (11:09 +0200)]
Merge branch 'dev' of https://github.com/Parisson/Telemeta into crem
Guillaume Pellerin [Fri, 10 Jun 2016 09:08:22 +0000 (11:08 +0200)]
Merge remote-tracking branch 'origin' into crem
Conflicts:
telemeta/locale
telemeta/pages
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
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
mathieu [Wed, 18 May 2016 09:59:14 +0000 (11:59 +0200)]
Convert to english, lowercase and explain backend
mathieu [Wed, 18 May 2016 08:56:46 +0000 (10:56 +0200)]
Remove memo files
mathieu [Wed, 18 May 2016 08:52:43 +0000 (10:52 +0200)]
Remove DATASTART env
mathieu [Wed, 18 May 2016 08:50:30 +0000 (10:50 +0200)]
Remove .idea folder
mathieu [Wed, 18 May 2016 08:09:17 +0000 (10:09 +0200)]
Back to Parisson locale
mathieu [Wed, 18 May 2016 08:08:40 +0000 (10:08 +0200)]
Back to Parisson locale
balastegui [Tue, 17 May 2016 13:59:19 +0000 (15:59 +0200)]
update
balastegui [Tue, 17 May 2016 13:36:25 +0000 (15:36 +0200)]
update
mathieu [Tue, 17 May 2016 13:23:44 +0000 (15:23 +0200)]
Merge remote-tracking branch 'origin/devinstable' into dev
mathieu [Tue, 17 May 2016 13:22:32 +0000 (15:22 +0200)]
Update locale
mathieu [Tue, 17 May 2016 12:51:05 +0000 (14:51 +0200)]
Add traductions
balastegui [Tue, 17 May 2016 12:21:12 +0000 (14:21 +0200)]
update
mathieu [Tue, 17 May 2016 10:50:32 +0000 (12:50 +0200)]
Remove print build_query backend
mathieu [Tue, 17 May 2016 10:49:28 +0000 (12:49 +0200)]
Remove parameter type get_boolean_query + verify boolean when searching
mathieu [Tue, 17 May 2016 10:26:10 +0000 (12:26 +0200)]
Fix descriptions field fonds
mathieu [Tue, 17 May 2016 09:53:43 +0000 (11:53 +0200)]
Fix field descriptions resource
Guillaume Pellerin [Tue, 17 May 2016 08:54:20 +0000 (10:54 +0200)]
recursive chown on media (could fix #112)
mathieu [Tue, 17 May 2016 07:52:54 +0000 (09:52 +0200)]
Merge Parisson (Thomas' work)
mathieu [Fri, 13 May 2016 15:14:39 +0000 (17:14 +0200)]
Hide button back to search result when no precedent search
mathieu [Fri, 13 May 2016 15:04:34 +0000 (17:04 +0200)]
Fix url on success edit collection (on change cote)
mathieu [Fri, 13 May 2016 14:49:40 +0000 (16:49 +0200)]
Add instruments in autocomplete index
balastegui [Fri, 13 May 2016 14:17:05 +0000 (16:17 +0200)]
update
mathieu [Fri, 13 May 2016 09:23:55 +0000 (11:23 +0200)]
End of update locations autocomplete (location + current_location + ancestors + alias)
balastegui [Fri, 13 May 2016 09:11:44 +0000 (11:11 +0200)]
update
Guillaume Pellerin [Thu, 12 May 2016 16:30:31 +0000 (18:30 +0200)]
update infos
Guillaume Pellerin [Thu, 12 May 2016 16:10:19 +0000 (18:10 +0200)]
update doc
Guillaume Pellerin [Thu, 12 May 2016 16:24:32 +0000 (18:24 +0200)]
update install doc
Guillaume Pellerin [Thu, 12 May 2016 15:51:19 +0000 (17:51 +0200)]
don't use global variables whenever it's possible (ping #111)
mathieu [Thu, 12 May 2016 15:40:17 +0000 (17:40 +0200)]
Add aliases + start custom signal for detect change location
Guillaume Pellerin [Thu, 12 May 2016 15:27:09 +0000 (17:27 +0200)]
Merge pull request #111 from ThomasBalastegui/dev
moved the JavaScript functions from lists.html to playlist.js
Guillaume Pellerin [Thu, 12 May 2016 15:25:56 +0000 (17:25 +0200)]
Merge branch 'dev' of https://github.com/ThomasBalastegui/Telemeta into ThomasBalastegui-dev
Guillaume Pellerin [Thu, 12 May 2016 15:25:52 +0000 (17:25 +0200)]
Merge branch 'dev' into ThomasBalastegui-dev
balastegui [Thu, 12 May 2016 15:10:18 +0000 (17:10 +0200)]
update
Guillaume Pellerin [Thu, 12 May 2016 15:09:55 +0000 (17:09 +0200)]
fix media access rights (should close #107)
projects / telemeta.git / log