]>
git.parisson.com Git - telemeta.git/log
Guillaume Pellerin [Thu, 23 May 2013 09:08:20 +0000 (11:08 +0200)]
Merge branch 'crem2' into dev2
Guillaume Pellerin [Thu, 23 May 2013 08:11:04 +0000 (10:11 +0200)]
better filter items in collection player
Guillaume Pellerin [Tue, 21 May 2013 15:34:44 +0000 (17:34 +0200)]
Merge branch 'dev' into crem2
Guillaume Pellerin [Tue, 21 May 2013 15:34:32 +0000 (17:34 +0200)]
fix no lastname
Guillaume Pellerin [Tue, 21 May 2013 15:25:27 +0000 (17:25 +0200)]
Merge branch 'dev' into crem2
Guillaume Pellerin [Tue, 21 May 2013 15:25:15 +0000 (17:25 +0200)]
fix templates
Guillaume Pellerin [Tue, 21 May 2013 15:23:58 +0000 (17:23 +0200)]
Merge branch 'dev' into crem2
Guillaume Pellerin [Tue, 21 May 2013 15:23:36 +0000 (17:23 +0200)]
fix sandbox, perms
Guillaume Pellerin [Mon, 20 May 2013 20:39:54 +0000 (22:39 +0200)]
Merge branch 'dev' of git+ssh://vcs.parisson.com/var/git/telemeta into dev
Guillaume Pellerin [Mon, 20 May 2013 20:39:18 +0000 (22:39 +0200)]
Merge branch 'dev' into crem2
Guillaume Pellerin [Mon, 20 May 2013 20:38:32 +0000 (22:38 +0200)]
add perms to access to users list and profile
Guillaume Pellerin [Mon, 20 May 2013 20:21:10 +0000 (22:21 +0200)]
Merge branch 'dev' into crem2
Guillaume Pellerin [Mon, 20 May 2013 20:20:35 +0000 (22:20 +0200)]
add "cannot_view_users_and_profiles" perm
Guillaume Pellerin [Mon, 20 May 2013 20:13:51 +0000 (22:13 +0200)]
UNSTABLE : prepare various project branches merging, code regex go to settings
Guillaume Pellerin [Mon, 20 May 2013 20:00:13 +0000 (22:00 +0200)]
fix mlt fix path
Guillaume Pellerin [Wed, 15 May 2013 09:27:49 +0000 (11:27 +0200)]
Merge branch 'crem2' into dev2
Guillaume Pellerin [Wed, 15 May 2013 09:27:11 +0000 (11:27 +0200)]
add modules
Guillaume Pellerin [Thu, 18 Apr 2013 21:50:51 +0000 (23:50 +0200)]
mv transcode scripts
Guillaume Pellerin [Tue, 16 Apr 2013 15:51:55 +0000 (17:51 +0200)]
Merge branch 'dev' into crem2
Guillaume Pellerin [Tue, 16 Apr 2013 15:51:39 +0000 (17:51 +0200)]
fix item collector
Guillaume Pellerin [Tue, 16 Apr 2013 13:02:30 +0000 (15:02 +0200)]
bugfix
Guillaume Pellerin [Tue, 16 Apr 2013 13:02:30 +0000 (15:02 +0200)]
bugfix
Guillaume Pellerin [Tue, 16 Apr 2013 12:41:51 +0000 (14:41 +0200)]
Merge branch 'dev' into crem2
Guillaume Pellerin [Tue, 16 Apr 2013 12:41:19 +0000 (14:41 +0200)]
add form submit pressing enter for login and search
Guillaume Pellerin [Tue, 16 Apr 2013 12:37:29 +0000 (14:37 +0200)]
add instrument aliases to collection search
Guillaume Pellerin [Tue, 16 Apr 2013 12:30:07 +0000 (14:30 +0200)]
Merge branch 'dev' into crem2
Guillaume Pellerin [Tue, 16 Apr 2013 12:29:50 +0000 (14:29 +0200)]
add alias to item instrument search
Guillaume Pellerin [Tue, 16 Apr 2013 11:03:20 +0000 (13:03 +0200)]
Merge branch 'dev' into crem2
Conflicts:
telemeta/models/query.py
Guillaume Pellerin [Tue, 16 Apr 2013 11:01:58 +0000 (13:01 +0200)]
case insensitive for instrument queries
Guillaume Pellerin [Mon, 15 Apr 2013 22:12:22 +0000 (00:12 +0200)]
fix intrument search
Conflicts:
telemeta/models/query.py
Guillaume Pellerin [Mon, 15 Apr 2013 22:14:10 +0000 (00:14 +0200)]
cleanup
Conflicts:
telemeta/models/query.py
Guillaume Pellerin [Mon, 15 Apr 2013 15:13:49 +0000 (17:13 +0200)]
begin to fix search by instrument
Conflicts:
telemeta/models/query.py
Guillaume Pellerin [Mon, 15 Apr 2013 22:14:10 +0000 (00:14 +0200)]
cleanup
Conflicts:
telemeta/models/query.py
Guillaume Pellerin [Tue, 16 Apr 2013 07:11:51 +0000 (09:11 +0200)]
cleanup
Guillaume Pellerin [Tue, 16 Apr 2013 07:11:51 +0000 (09:11 +0200)]
cleanup
Guillaume Pellerin [Mon, 15 Apr 2013 22:14:10 +0000 (00:14 +0200)]
cleanup
Guillaume Pellerin [Mon, 15 Apr 2013 22:12:22 +0000 (00:12 +0200)]
fix intrument search
Guillaume Pellerin [Mon, 15 Apr 2013 15:13:49 +0000 (17:13 +0200)]
begin to fix search by instrument
Guillaume Pellerin [Mon, 15 Apr 2013 13:27:45 +0000 (15:27 +0200)]
Merge branch 'dev' into crem2
Paul Brossier [Sat, 13 Apr 2013 19:08:01 +0000 (14:08 -0500)]
telemeta/templates/telemeta/search_criteria.html: correct path
Guillaume Pellerin [Fri, 12 Apr 2013 11:43:06 +0000 (13:43 +0200)]
fix bad if and td (closes: #125)
Guillaume Pellerin [Fri, 12 Apr 2013 08:03:33 +0000 (10:03 +0200)]
locale
Guillaume Pellerin [Fri, 12 Apr 2013 08:02:18 +0000 (10:02 +0200)]
locale fr
Guillaume Pellerin [Wed, 10 Apr 2013 15:41:31 +0000 (17:41 +0200)]
goto 1.4.5
Guillaume Pellerin [Wed, 10 Apr 2013 14:10:23 +0000 (16:10 +0200)]
fix home items
Guillaume Pellerin [Wed, 10 Apr 2013 13:38:42 +0000 (15:38 +0200)]
trans access
Guillaume Pellerin [Wed, 10 Apr 2013 13:35:49 +0000 (15:35 +0200)]
fix and add status to edit, copy, add templates
Guillaume Pellerin [Wed, 10 Apr 2013 11:56:51 +0000 (13:56 +0200)]
back colors
yomguy [Mon, 8 Apr 2013 15:15:21 +0000 (17:15 +0200)]
locales
yomguy [Mon, 8 Apr 2013 15:12:59 +0000 (17:12 +0200)]
locale
yomguy [Mon, 8 Apr 2013 14:54:31 +0000 (16:54 +0200)]
add message when no sound access, lighter player colors
yomguy [Mon, 8 Apr 2013 13:32:00 +0000 (15:32 +0200)]
argg
yomguy [Mon, 8 Apr 2013 13:31:44 +0000 (15:31 +0200)]
arg
yomguy [Mon, 8 Apr 2013 13:28:47 +0000 (15:28 +0200)]
revert
yomguy [Mon, 8 Apr 2013 13:26:17 +0000 (15:26 +0200)]
fix modules
yomguy [Mon, 8 Apr 2013 13:21:45 +0000 (15:21 +0200)]
fix sudo
yomguy [Mon, 8 Apr 2013 13:18:25 +0000 (15:18 +0200)]
fix module
yomguy [Mon, 8 Apr 2013 13:16:35 +0000 (15:16 +0200)]
merge & reorganize video mastering utils
Guillaume Pellerin [Mon, 8 Apr 2013 10:28:42 +0000 (12:28 +0200)]
Merge branch 'dev' of /var/git/telemeta into dev
Guillaume Pellerin [Mon, 8 Apr 2013 10:28:17 +0000 (12:28 +0200)]
add kdenlive scripts from promaster
yomguy [Thu, 4 Apr 2013 14:02:45 +0000 (16:02 +0200)]
Merge branch 'dev' into crem2
yomguy [Thu, 4 Apr 2013 14:02:33 +0000 (16:02 +0200)]
fix copying file
yomguy [Thu, 4 Apr 2013 13:39:01 +0000 (15:39 +0200)]
Merge branch 'dev' into crem2
yomguy [Thu, 4 Apr 2013 13:38:10 +0000 (15:38 +0200)]
cleanup migr
yomguy [Thu, 4 Apr 2013 13:31:39 +0000 (15:31 +0200)]
Merge branch 'dev' into crem2
yomguy [Thu, 4 Apr 2013 13:31:18 +0000 (15:31 +0200)]
copy item.file by default
yomguy [Thu, 4 Apr 2013 09:55:16 +0000 (11:55 +0200)]
locale
yomguy [Thu, 4 Apr 2013 09:54:56 +0000 (11:54 +0200)]
locale
yomguy [Fri, 15 Mar 2013 11:24:22 +0000 (12:24 +0100)]
add migr
yomguy [Fri, 15 Mar 2013 10:51:24 +0000 (11:51 +0100)]
fix access
yomguy [Thu, 14 Mar 2013 14:52:03 +0000 (15:52 +0100)]
readd 0024
yomguy [Thu, 14 Mar 2013 14:51:15 +0000 (15:51 +0100)]
add migr
yomguy [Thu, 14 Mar 2013 14:47:38 +0000 (15:47 +0100)]
add auto_period_access to collection, fix resource edit rights
yomguy [Wed, 13 Mar 2013 22:15:30 +0000 (23:15 +0100)]
update access rules
yomguy [Wed, 13 Mar 2013 21:58:04 +0000 (22:58 +0100)]
add sound_public query for full access items,
optimize random items query in home,
debug new access workflow
yomguy [Wed, 13 Mar 2013 14:26:16 +0000 (15:26 +0100)]
Merge branch 'crem' into crem2
Conflicts:
telemeta/models/media.py
telemeta/views/core.py
yomguy [Fri, 1 Mar 2013 12:03:03 +0000 (13:03 +0100)]
Merge branch 'dev' into crem
yomguy [Fri, 1 Mar 2013 12:01:59 +0000 (13:01 +0100)]
fix overwrite
Guillaume Pellerin [Fri, 1 Mar 2013 10:49:17 +0000 (11:49 +0100)]
Merge branch 'dev' of /var/git/telemeta into dev
yomguy [Fri, 1 Mar 2013 10:42:33 +0000 (11:42 +0100)]
Merge branch 'dev' into crem
yomguy [Fri, 1 Mar 2013 10:42:11 +0000 (11:42 +0100)]
fix encoder overwriting
yomguy [Thu, 28 Feb 2013 11:05:34 +0000 (12:05 +0100)]
add PublisherCollection to admin
yomguy [Thu, 28 Feb 2013 10:51:29 +0000 (11:51 +0100)]
fix fr locale (closes: #107)
yomguy [Thu, 28 Feb 2013 10:14:33 +0000 (11:14 +0100)]
Merge branch 'dev' into crem
Conflicts:
telemeta/locale/de/LC_MESSAGES/django.mo
telemeta/locale/de/LC_MESSAGES/djangojs.mo
telemeta/locale/fr/LC_MESSAGES/django.mo
telemeta/locale/fr/LC_MESSAGES/djangojs.mo
yomguy [Thu, 28 Feb 2013 09:53:15 +0000 (10:53 +0100)]
fix related media parsing
yomguy [Thu, 28 Feb 2013 09:40:18 +0000 (10:40 +0100)]
fix related media parsing when no file (closes: #106)
Conflicts:
telemeta/models/media.py
yomguy [Tue, 19 Feb 2013 10:00:27 +0000 (11:00 +0100)]
locales
Guillaume Pellerin [Thu, 14 Feb 2013 16:23:56 +0000 (17:23 +0100)]
Merge branch 'dev' of /var/git/telemeta into dev
Guillaume Pellerin [Thu, 14 Feb 2013 16:23:12 +0000 (17:23 +0100)]
Merge branch 'dev' of /var/git/telemeta into dev
yomguy [Thu, 14 Feb 2013 16:23:01 +0000 (17:23 +0100)]
locales
yomguy [Thu, 14 Feb 2013 15:50:52 +0000 (16:50 +0100)]
fix init account email
yomguy [Thu, 14 Feb 2013 15:50:01 +0000 (16:50 +0100)]
info
yomguy [Mon, 11 Feb 2013 10:30:12 +0000 (11:30 +0100)]
Merge branch 'dev' into crem2
Guillaume Pellerin [Fri, 8 Feb 2013 13:27:07 +0000 (14:27 +0100)]
Merge branch 'dev' of /var/git/telemeta into dev
yomguy [Fri, 8 Feb 2013 01:40:37 +0000 (02:40 +0100)]
rename, add kwargs
yomguy [Fri, 8 Feb 2013 00:53:08 +0000 (01:53 +0100)]
fix bad SQL query with postgresl
add relative marker offset to the kdenlive parsing
Guillaume Pellerin [Thu, 7 Feb 2013 14:24:32 +0000 (15:24 +0100)]
Merge branch 'dev' of /var/git/telemeta into dev
yomguy [Thu, 7 Feb 2013 14:23:25 +0000 (15:23 +0100)]
cleanup
Guillaume Pellerin [Thu, 7 Feb 2013 14:19:31 +0000 (15:19 +0100)]
Merge branch 'dev' of /var/git/telemeta into dev
yomguy [Thu, 7 Feb 2013 14:17:24 +0000 (15:17 +0100)]
fix last entry
projects / telemeta.git / log