]>
git.parisson.com Git - telemeta.git/log
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
balastegui [Thu, 19 May 2016 08:35:29 +0000 (10:35 +0200)]
update
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
balastegui [Tue, 17 May 2016 12:21:12 +0000 (14:21 +0200)]
update
Guillaume Pellerin [Tue, 17 May 2016 08:54:20 +0000 (10:54 +0200)]
recursive chown on media (could fix #112)
balastegui [Fri, 13 May 2016 14:17:05 +0000 (16:17 +0200)]
update
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)
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)
balastegui [Thu, 12 May 2016 14:48:46 +0000 (16:48 +0200)]
update
balastegui [Thu, 12 May 2016 14:21:24 +0000 (16:21 +0200)]
update
Guillaume Pellerin [Thu, 12 May 2016 12:04:30 +0000 (14:04 +0200)]
fix playlist editing using more jquery (fixes #109 #44)
Guillaume Pellerin [Thu, 12 May 2016 12:04:30 +0000 (14:04 +0200)]
fix playlist editing (using more jquery)
Guillaume Pellerin [Thu, 12 May 2016 12:04:21 +0000 (14:04 +0200)]
Merge pull request #109 from ThomasBalastegui/dev
update for Edit playlist button (fix needed)
Guillaume Pellerin [Thu, 12 May 2016 11:35:04 +0000 (13:35 +0200)]
Merge branch 'dev' of https://github.com/ThomasBalastegui/Telemeta into ThomasBalastegui-dev
balastegui [Thu, 12 May 2016 10:17:05 +0000 (12:17 +0200)]
Merge remote-tracking branch 'upstream/dev' into dev
Impossible de voir le détail des items.
balastegui [Wed, 11 May 2016 13:36:31 +0000 (15:36 +0200)]
update
Guillaume Pellerin [Wed, 11 May 2016 09:41:09 +0000 (11:41 +0200)]
minor playlist style and title
Guillaume Pellerin [Wed, 11 May 2016 09:42:21 +0000 (11:42 +0200)]
Merge branch 'dev' of github.com:Parisson/Telemeta into dev
Guillaume Pellerin [Wed, 11 May 2016 09:41:09 +0000 (11:41 +0200)]
minor playlist style and title
Guillaume Pellerin [Wed, 11 May 2016 09:04:10 +0000 (11:04 +0200)]
Merge pull request #108 from ThomasBalastegui/dev
Validation du popup playlist
Guillaume Pellerin [Wed, 11 May 2016 08:59:22 +0000 (10:59 +0200)]
Merge branch 'dev' of https://github.com/ThomasBalastegui/Telemeta into ThomasBalastegui-dev
balastegui [Tue, 10 May 2016 14:59:10 +0000 (16:59 +0200)]
Validation du popup playlist
Guillaume Pellerin [Sat, 7 May 2016 19:35:56 +0000 (21:35 +0200)]
remove revisions from home context
Guillaume Pellerin [Wed, 4 May 2016 10:19:04 +0000 (12:19 +0200)]
update locales
Guillaume Pellerin [Tue, 3 May 2016 12:42:29 +0000 (14:42 +0200)]
rm .init, add ES port 9200
Thomas Fillon [Thu, 28 Apr 2016 09:35:09 +0000 (11:35 +0200)]
Merge branch 'dev' of github.com:Parisson/Telemeta into dev
Thomas Fillon [Thu, 28 Apr 2016 09:34:55 +0000 (11:34 +0200)]
Fix redundant line in telemeta/views/item.py
Guillaume Pellerin [Thu, 28 Apr 2016 00:40:33 +0000 (02:40 +0200)]
dont't use timeside item use for now (goto diadems branch)
Guillaume Pellerin [Thu, 28 Apr 2016 00:36:36 +0000 (02:36 +0200)]
comment diadems button
Guillaume Pellerin [Mon, 25 Apr 2016 21:42:01 +0000 (23:42 +0200)]
Merge branch 'dev' of github.com:Parisson/Telemeta into dev
Guillaume Pellerin [Wed, 20 Apr 2016 20:13:42 +0000 (22:13 +0200)]
fix watchmedo patterns, cleanup
Guillaume Pellerin [Wed, 20 Apr 2016 20:13:42 +0000 (22:13 +0200)]
fix warchmedo patterns, cleanup
Guillaume Pellerin [Mon, 18 Apr 2016 14:59:00 +0000 (16:59 +0200)]
Merge branch 'master' into dev
Guillaume Pellerin [Mon, 18 Apr 2016 14:57:59 +0000 (16:57 +0200)]
fix default regex codes
Guillaume Pellerin [Mon, 18 Apr 2016 09:24:48 +0000 (11:24 +0200)]
Merge branch 'master' into dev
Conflicts:
telemeta/pages
Guillaume Pellerin [Mon, 18 Apr 2016 09:00:33 +0000 (11:00 +0200)]
update pages
Guillaume Pellerin [Mon, 18 Apr 2016 08:56:07 +0000 (10:56 +0200)]
fix no ts_item_id
Guillaume Pellerin [Mon, 18 Apr 2016 08:54:30 +0000 (10:54 +0200)]
fix home styles
Guillaume Pellerin [Mon, 18 Apr 2016 08:54:30 +0000 (10:54 +0200)]
fix home styles
Guillaume Pellerin [Wed, 13 Apr 2016 22:45:36 +0000 (00:45 +0200)]
Merge branch 'dev' of github.com:Parisson/Telemeta into dev
Guillaume Pellerin [Wed, 13 Apr 2016 22:45:14 +0000 (00:45 +0200)]
fix init, use bash
Thomas Fillon [Wed, 13 Apr 2016 17:01:25 +0000 (19:01 +0200)]
Merge branch 'dev' into feature/ts-server
Thomas Fillon [Wed, 13 Apr 2016 17:00:32 +0000 (19:00 +0200)]
Preliminary work on timseside.server use
Guillaume Pellerin [Wed, 13 Apr 2016 14:27:33 +0000 (16:27 +0200)]
once init commands
Guillaume Pellerin [Wed, 13 Apr 2016 14:14:47 +0000 (16:14 +0200)]
Merge branch 'dev'
Guillaume Pellerin [Wed, 13 Apr 2016 14:09:37 +0000 (16:09 +0200)]
use min.css
Guillaume Pellerin [Wed, 13 Apr 2016 14:07:21 +0000 (16:07 +0200)]
fix icon
Guillaume Pellerin [Wed, 13 Apr 2016 14:06:43 +0000 (16:06 +0200)]
use django-bootstrap3 css plus patches
Guillaume Pellerin [Wed, 13 Apr 2016 13:35:49 +0000 (15:35 +0200)]
use bash
Guillaume Pellerin [Wed, 13 Apr 2016 13:30:09 +0000 (15:30 +0200)]
bugfix
Guillaume Pellerin [Wed, 13 Apr 2016 13:23:32 +0000 (15:23 +0200)]
bug fix (closes #103)
Guillaume Pellerin [Wed, 13 Apr 2016 12:21:50 +0000 (14:21 +0200)]
fix SM2 url
Guillaume Pellerin [Wed, 13 Apr 2016 12:06:11 +0000 (14:06 +0200)]
fix app start tests
Guillaume Pellerin [Wed, 13 Apr 2016 11:56:54 +0000 (13:56 +0200)]
Merge remote-tracking branch 'origin/app' into test
Guillaume Pellerin [Wed, 13 Apr 2016 11:55:33 +0000 (13:55 +0200)]
update locale
Guillaume Pellerin [Wed, 13 Apr 2016 11:47:37 +0000 (13:47 +0200)]
refactor app
Guillaume Pellerin [Wed, 13 Apr 2016 11:30:30 +0000 (13:30 +0200)]
Merge branch 'dev' of github.com:Parisson/Telemeta into dev
Guillaume Pellerin [Wed, 13 Apr 2016 11:30:09 +0000 (13:30 +0200)]
use source code in prod, update pages
Thomas Fillon [Mon, 11 Apr 2016 07:35:15 +0000 (09:35 +0200)]
Merge branch 'dev' into feature/ts-server
Guillaume Pellerin [Thu, 7 Apr 2016 12:49:03 +0000 (14:49 +0200)]
update link
Guillaume Pellerin [Thu, 7 Apr 2016 12:49:03 +0000 (14:49 +0200)]
fix playlist filter
Guillaume Pellerin [Wed, 6 Apr 2016 23:14:00 +0000 (01:14 +0200)]
fix download url and boilerplate access rights
Guillaume Pellerin [Tue, 5 Apr 2016 05:55:50 +0000 (07:55 +0200)]
fix media access rights at init
Guillaume Pellerin [Tue, 5 Apr 2016 04:51:41 +0000 (06:51 +0200)]
update Manifest
Guillaume Pellerin [Mon, 4 Apr 2016 21:59:10 +0000 (23:59 +0200)]
Merge branch 'dev'
Guillaume Pellerin [Mon, 4 Apr 2016 21:58:31 +0000 (23:58 +0200)]
update pages
Guillaume Pellerin [Mon, 4 Apr 2016 21:32:44 +0000 (23:32 +0200)]
update doc
Guillaume Pellerin [Mon, 4 Apr 2016 20:46:54 +0000 (22:46 +0200)]
fix about
Guillaume Pellerin [Mon, 4 Apr 2016 20:45:15 +0000 (22:45 +0200)]
fix link
Guillaume Pellerin [Mon, 4 Apr 2016 20:44:35 +0000 (22:44 +0200)]
fix links and exs
Guillaume Pellerin [Mon, 4 Apr 2016 20:33:45 +0000 (22:33 +0200)]
fix doc
Guillaume Pellerin [Mon, 4 Apr 2016 20:31:39 +0000 (22:31 +0200)]
fix image url
Guillaume Pellerin [Mon, 4 Apr 2016 20:29:04 +0000 (22:29 +0200)]
fix logo
Guillaume Pellerin [Mon, 4 Apr 2016 20:27:35 +0000 (22:27 +0200)]
fix conflict
Guillaume Pellerin [Mon, 4 Apr 2016 20:25:42 +0000 (22:25 +0200)]
fix image
Guillaume Pellerin [Mon, 4 Apr 2016 20:24:36 +0000 (22:24 +0200)]
update doc
Guillaume Pellerin [Mon, 4 Apr 2016 20:22:35 +0000 (22:22 +0200)]
update readme and 1.6
Guillaume Pellerin [Mon, 4 Apr 2016 20:06:17 +0000 (22:06 +0200)]
cleanup
Guillaume Pellerin [Sun, 3 Apr 2016 19:52:42 +0000 (21:52 +0200)]
fix doc
Guillaume Pellerin [Sat, 2 Apr 2016 23:48:45 +0000 (01:48 +0200)]
add infos
projects / telemeta.git / log