]>
git.parisson.com Git - telemeta.git/log
Guillaume Pellerin [Tue, 9 Dec 2014 23:28:31 +0000 (00:28 +0100)]
fix no separated audio tracks in kdenlive parser
Conflicts:
telemeta/util/kdenlive/session.py
Guillaume Pellerin [Wed, 2 May 2012 14:07:35 +0000 (16:07 +0200)]
Merge branch 'master' of /var/git/telemeta
Guillaume Pellerin [Wed, 2 May 2012 14:07:29 +0000 (16:07 +0200)]
rr
Guillaume Pellerin [Wed, 2 May 2012 14:06:48 +0000 (16:06 +0200)]
Merge branch 'dev' of /var/git/telemeta
Conflicts:
telemeta/models/__init__.py
yomguy [Wed, 2 May 2012 13:55:15 +0000 (15:55 +0200)]
again
yomguy [Wed, 2 May 2012 13:52:43 +0000 (15:52 +0200)]
fix dev push
yomguy [Wed, 2 May 2012 13:34:04 +0000 (15:34 +0200)]
Merge branch 'master' into dev
yomguy [Wed, 2 May 2012 13:33:02 +0000 (15:33 +0200)]
test
yomguy [Wed, 2 May 2012 13:28:49 +0000 (15:28 +0200)]
add migrations, fix format
yomguy [Wed, 2 May 2012 08:54:02 +0000 (10:54 +0200)]
fix Format (LAM) and enums, linked in item
yomguy [Tue, 1 May 2012 20:11:03 +0000 (22:11 +0200)]
order user list by last_name
yomguy [Tue, 1 May 2012 19:48:16 +0000 (21:48 +0200)]
re fix
yomguy [Tue, 1 May 2012 19:37:41 +0000 (21:37 +0200)]
fix again
yomguy [Tue, 1 May 2012 19:30:02 +0000 (21:30 +0200)]
fix searches when anon
yomguy [Fri, 27 Apr 2012 11:12:12 +0000 (13:12 +0200)]
Merge branch 'master' into dev
yomguy [Fri, 27 Apr 2012 11:11:59 +0000 (13:11 +0200)]
readd profile properties
Guillaume Pellerin [Fri, 20 Apr 2012 13:06:30 +0000 (15:06 +0200)]
Merge branch 'master' of /var/git/telemeta
yomguy [Fri, 20 Apr 2012 13:05:40 +0000 (15:05 +0200)]
fix again
Guillaume Pellerin [Fri, 20 Apr 2012 13:05:13 +0000 (15:05 +0200)]
Merge branch 'master' of /var/git/telemeta
yomguy [Fri, 20 Apr 2012 13:04:20 +0000 (15:04 +0200)]
fix static
Guillaume Pellerin [Fri, 20 Apr 2012 13:03:41 +0000 (15:03 +0200)]
Merge branch 'master' of /var/git/telemeta
yomguy [Fri, 20 Apr 2012 13:02:42 +0000 (15:02 +0200)]
try static files
Guillaume Pellerin [Thu, 19 Apr 2012 14:31:12 +0000 (16:31 +0200)]
Merge branch 'master' of /var/git/telemeta
Guillaume Pellerin [Thu, 19 Apr 2012 14:30:57 +0000 (16:30 +0200)]
fix i18n
yomguy [Thu, 19 Apr 2012 14:26:20 +0000 (16:26 +0200)]
add all graphers to first analyses, set new settings parameter for default size values
yomguy [Thu, 19 Apr 2012 10:43:37 +0000 (12:43 +0200)]
add rec icon
yomguy [Wed, 18 Apr 2012 16:45:29 +0000 (18:45 +0200)]
add white vox module icon
yomguy [Wed, 18 Apr 2012 10:52:06 +0000 (12:52 +0200)]
Merge branch 'master' into dev
yomguy [Wed, 18 Apr 2012 10:51:06 +0000 (12:51 +0200)]
remove item validation clean against collection code (NOT for crem branch)
yomguy [Wed, 18 Apr 2012 10:26:29 +0000 (12:26 +0200)]
add template context processors to example
yomguy [Sun, 15 Apr 2012 22:00:26 +0000 (00:00 +0200)]
fix account edit post response
yomguy [Sun, 15 Apr 2012 21:21:55 +0000 (23:21 +0200)]
add tw bg
yomguy [Fri, 13 Apr 2012 13:45:15 +0000 (15:45 +0200)]
add images, logos, crem_checker tool
yomguy [Thu, 12 Apr 2012 12:36:27 +0000 (14:36 +0200)]
rm videotime
yomguy [Thu, 12 Apr 2012 11:12:37 +0000 (13:12 +0200)]
HOT: add login security to accounts/ view, now need django 1.4
yomguy [Thu, 12 Apr 2012 11:04:44 +0000 (13:04 +0200)]
fix accounts
yomguy [Thu, 12 Apr 2012 10:59:16 +0000 (12:59 +0200)]
add new modules to sandbox, fix doc and styles, users/ goes to accounts/
yomguy [Mon, 9 Apr 2012 21:27:30 +0000 (23:27 +0200)]
add video.js links
yomguy [Mon, 9 Apr 2012 21:25:54 +0000 (23:25 +0200)]
cleanup
yomguy [Mon, 9 Apr 2012 21:24:49 +0000 (23:24 +0200)]
add video.js files, fix some icons
yomguy [Fri, 6 Apr 2012 08:19:56 +0000 (10:19 +0200)]
Merge branch 'master' into dev
yomguy [Fri, 6 Apr 2012 08:19:48 +0000 (10:19 +0200)]
collections first
yomguy [Fri, 6 Apr 2012 08:14:33 +0000 (10:14 +0200)]
Merge branch 'master' into dev
yomguy [Fri, 6 Apr 2012 08:14:15 +0000 (10:14 +0200)]
add tw bg image
yomguy [Fri, 6 Apr 2012 08:13:17 +0000 (10:13 +0200)]
increase streaming chunk size, fix mimetype for mp4 when editing
yomguy [Wed, 4 Apr 2012 08:22:55 +0000 (10:22 +0200)]
Merge branch 'master' into dev
yomguy [Wed, 4 Apr 2012 08:22:42 +0000 (10:22 +0200)]
fix bad RSS urls
yomguy [Tue, 3 Apr 2012 10:47:16 +0000 (12:47 +0200)]
Merge branch 'master' into dev
yomguy [Tue, 3 Apr 2012 10:47:06 +0000 (12:47 +0200)]
HTML5 doctype
yomguy [Tue, 3 Apr 2012 10:38:57 +0000 (12:38 +0200)]
Merge branch 'master' into dev
yomguy [Tue, 3 Apr 2012 10:38:31 +0000 (12:38 +0200)]
fix approx_duration init, fix init password
yomguy [Tue, 3 Apr 2012 09:01:04 +0000 (11:01 +0200)]
fix default value for duration field with Django 1.4 + MySQL
yomguy [Mon, 2 Apr 2012 15:23:27 +0000 (17:23 +0200)]
Merge branch 'master' into dev
yomguy [Mon, 2 Apr 2012 15:23:12 +0000 (17:23 +0200)]
fix fr
yomguy [Mon, 2 Apr 2012 10:36:43 +0000 (12:36 +0200)]
Merge branch 'master' into dev
yomguy [Mon, 2 Apr 2012 10:36:18 +0000 (12:36 +0200)]
add mp4 to extensions
yomguy [Mon, 2 Apr 2012 10:27:38 +0000 (12:27 +0200)]
Merge branch 'master' into dev
yomguy [Mon, 2 Apr 2012 10:27:28 +0000 (12:27 +0200)]
add MP4 streaming
yomguy [Mon, 2 Apr 2012 10:17:30 +0000 (12:17 +0200)]
Merge branch 'master' into dev
yomguy [Mon, 2 Apr 2012 10:17:09 +0000 (12:17 +0200)]
fix quicktime MP4 mime_type
yomguy [Mon, 2 Apr 2012 09:13:54 +0000 (11:13 +0200)]
Merge branch 'master' into dev
yomguy [Mon, 2 Apr 2012 09:13:17 +0000 (11:13 +0200)]
add simple player for clean iframe, fix sandbox for django 1.4
yomguy [Thu, 29 Mar 2012 12:31:29 +0000 (14:31 +0200)]
Merge branch 'master' into dev
yomguy [Thu, 29 Mar 2012 12:31:11 +0000 (14:31 +0200)]
add bg and logo
yomguy [Thu, 29 Mar 2012 10:54:05 +0000 (12:54 +0200)]
fix menu bugs, fix some styles, add urls
yomguy [Tue, 27 Mar 2012 15:46:32 +0000 (17:46 +0200)]
Merge branch 'master' into dev
yomguy [Tue, 27 Mar 2012 15:46:26 +0000 (17:46 +0200)]
fix migr
yomguy [Tue, 27 Mar 2012 15:45:13 +0000 (17:45 +0200)]
Merge branch 'master' into dev
yomguy [Tue, 27 Mar 2012 15:42:44 +0000 (17:42 +0200)]
fix edit form
yomguy [Tue, 27 Mar 2012 13:55:52 +0000 (15:55 +0200)]
add migr
yomguy [Tue, 27 Mar 2012 11:29:05 +0000 (13:29 +0200)]
Merge branch 'master' into dev
yomguy [Mon, 26 Mar 2012 12:15:24 +0000 (14:15 +0200)]
update graphs
yomguy [Fri, 23 Mar 2012 11:53:57 +0000 (12:53 +0100)]
add graphs
yomguy [Thu, 22 Mar 2012 02:01:05 +0000 (03:01 +0100)]
reg
yomguy [Thu, 22 Mar 2012 01:56:45 +0000 (02:56 +0100)]
add migr
yomguy [Thu, 22 Mar 2012 01:55:52 +0000 (02:55 +0100)]
fix thumbs height
yomguy [Thu, 22 Mar 2012 01:42:29 +0000 (02:42 +0100)]
Merge branch 'master' into dev
yomguy [Thu, 22 Mar 2012 01:41:59 +0000 (02:41 +0100)]
add init password
yomguy [Wed, 21 Mar 2012 23:46:12 +0000 (00:46 +0100)]
add user profile to admin
yomguy [Wed, 21 Mar 2012 16:32:12 +0000 (17:32 +0100)]
Merge branch 'master' into dev
yomguy [Wed, 21 Mar 2012 16:31:43 +0000 (17:31 +0100)]
add thumbnails to items and collections
yomguy [Wed, 21 Mar 2012 16:09:58 +0000 (17:09 +0100)]
Merge branch 'master' into dev
yomguy [Wed, 21 Mar 2012 16:01:54 +0000 (17:01 +0100)]
upgrade
yomguy [Wed, 21 Mar 2012 15:21:08 +0000 (16:21 +0100)]
* fix some wrong user properties
* NEW DEP: add solr-thumbnail for resource related media
* add static media handling for solr and various cache
* SECURITY: you need to move your TELEMETA_EXPORT_CACHE_DIR from TELEMETA_CACHE_DIR cache. See example/sandbox_sqlite/settings.py
yomguy [Wed, 21 Mar 2012 14:15:41 +0000 (15:15 +0100)]
Merge branch 'master' into dev
yomguy [Wed, 21 Mar 2012 14:15:35 +0000 (15:15 +0100)]
fix
yomguy [Wed, 21 Mar 2012 14:12:57 +0000 (15:12 +0100)]
Merge branch 'master' into dev
yomguy [Wed, 21 Mar 2012 14:12:36 +0000 (15:12 +0100)]
bugfix
yomguy [Wed, 21 Mar 2012 14:09:11 +0000 (15:09 +0100)]
Merge branch 'master' into dev
yomguy [Wed, 21 Mar 2012 14:08:58 +0000 (15:08 +0100)]
reg
yomguy [Wed, 21 Mar 2012 14:06:14 +0000 (15:06 +0100)]
Merge branch 'master' into dev
yomguy [Wed, 21 Mar 2012 14:06:03 +0000 (15:06 +0100)]
add mig
yomguy [Wed, 21 Mar 2012 14:05:06 +0000 (15:05 +0100)]
fix profile
yomguy [Wed, 21 Mar 2012 13:44:33 +0000 (14:44 +0100)]
Merge branch 'master' into dev
yomguy [Wed, 21 Mar 2012 13:43:25 +0000 (14:43 +0100)]
add extra blocks, horizontal window for children in admin
yomguy [Wed, 14 Mar 2012 11:25:01 +0000 (12:25 +0100)]
go back
yomguy [Tue, 13 Mar 2012 17:42:46 +0000 (18:42 +0100)]
add postman templates
yomguy [Tue, 13 Mar 2012 10:46:21 +0000 (11:46 +0100)]
cleanup
yomguy [Mon, 5 Mar 2012 12:17:31 +0000 (13:17 +0100)]
Merge branch 'master' into dev
yomguy [Mon, 5 Mar 2012 12:17:25 +0000 (13:17 +0100)]
fix doc