git.parisson.com Git - telemeta.git/log

]> git.parisson.com Git - telemeta.git/log

projects / telemeta.git / log

summary | shortlog | log | commit | commitdiff | tree
first ⋅ prev ⋅ next

commit | commitdiff | tree

Guillaume Pellerin [Tue, 3 Apr 2012 10:43:10 +0000 (12:43 +0200)]

Merge branch 'crem' of http://vcs.parisson.com/git/telemeta into crem

commit | commitdiff | tree

yomguy [Tue, 3 Apr 2012 10:38:57 +0000 (12:38 +0200)]

Merge branch 'master' into crem

commit | commitdiff | tree

yomguy [Tue, 3 Apr 2012 10:38:31 +0000 (12:38 +0200)]

fix approx_duration init, fix init password

commit | commitdiff | tree

yomguy [Tue, 3 Apr 2012 09:01:04 +0000 (11:01 +0200)]

fix default value for duration field with Django 1.4 + MySQL

commit | commitdiff | tree

Guillaume Pellerin [Tue, 3 Apr 2012 07:55:52 +0000 (09:55 +0200)]

Merge branch 'crem' of http://vcs.parisson.com/git/telemeta into crem

commit | commitdiff | tree

yomguy [Tue, 3 Apr 2012 07:55:09 +0000 (09:55 +0200)]

fix crem logo

commit | commitdiff | tree

Guillaume Pellerin [Mon, 2 Apr 2012 15:24:02 +0000 (17:24 +0200)]

Merge branch 'crem' of http://vcs.parisson.com/git/telemeta into crem

commit | commitdiff | tree

yomguy [Mon, 2 Apr 2012 15:23:27 +0000 (17:23 +0200)]

Merge branch 'master' into crem

commit | commitdiff | tree

yomguy [Mon, 2 Apr 2012 15:23:12 +0000 (17:23 +0200)]

fix fr

commit | commitdiff | tree

Guillaume Pellerin [Mon, 2 Apr 2012 10:37:05 +0000 (12:37 +0200)]

Merge branch 'crem' of http://vcs.parisson.com/git/telemeta into crem

commit | commitdiff | tree

yomguy [Mon, 2 Apr 2012 10:36:43 +0000 (12:36 +0200)]

Merge branch 'master' into crem

commit | commitdiff | tree

yomguy [Mon, 2 Apr 2012 10:36:18 +0000 (12:36 +0200)]

add mp4 to extensions

commit | commitdiff | tree

Guillaume Pellerin [Mon, 2 Apr 2012 10:29:29 +0000 (12:29 +0200)]

Merge branch 'crem' of http://vcs.parisson.com/git/telemeta into crem

commit | commitdiff | tree

yomguy [Mon, 2 Apr 2012 10:27:38 +0000 (12:27 +0200)]

Merge branch 'master' into crem

commit | commitdiff | tree

yomguy [Mon, 2 Apr 2012 10:27:28 +0000 (12:27 +0200)]

add MP4 streaming

commit | commitdiff | tree

Guillaume Pellerin [Mon, 2 Apr 2012 10:18:02 +0000 (12:18 +0200)]

Merge branch 'crem' of http://vcs.parisson.com/git/telemeta into crem

commit | commitdiff | tree

yomguy [Mon, 2 Apr 2012 10:17:30 +0000 (12:17 +0200)]

Merge branch 'master' into crem

commit | commitdiff | tree

yomguy [Mon, 2 Apr 2012 10:17:09 +0000 (12:17 +0200)]

fix quicktime MP4 mime_type

commit | commitdiff | tree

Guillaume Pellerin [Mon, 2 Apr 2012 09:22:16 +0000 (11:22 +0200)]

Merge branch 'crem' of http://vcs.parisson.com/git/telemeta into crem

commit | commitdiff | tree

yomguy [Mon, 2 Apr 2012 09:13:54 +0000 (11:13 +0200)]

Merge branch 'master' into crem

commit | commitdiff | tree

yomguy [Mon, 2 Apr 2012 09:13:17 +0000 (11:13 +0200)]

add simple player for clean iframe, fix sandbox for django 1.4

commit | commitdiff | tree

yomguy [Thu, 29 Mar 2012 12:31:29 +0000 (14:31 +0200)]

Merge branch 'master' into crem

commit | commitdiff | tree

yomguy [Thu, 29 Mar 2012 12:31:11 +0000 (14:31 +0200)]

add bg and logo

commit | commitdiff | tree

yomguy [Thu, 29 Mar 2012 10:54:05 +0000 (12:54 +0200)]

fix menu bugs, fix some styles, add urls

commit | commitdiff | tree

yomguy [Tue, 27 Mar 2012 15:46:32 +0000 (17:46 +0200)]

Merge branch 'master' into crem

commit | commitdiff | tree

yomguy [Tue, 27 Mar 2012 15:46:26 +0000 (17:46 +0200)]

fix migr

commit | commitdiff | tree

yomguy [Tue, 27 Mar 2012 15:45:13 +0000 (17:45 +0200)]

Merge branch 'master' into crem

commit | commitdiff | tree

yomguy [Tue, 27 Mar 2012 15:42:44 +0000 (17:42 +0200)]

fix edit form

commit | commitdiff | tree

yomguy [Tue, 27 Mar 2012 13:55:52 +0000 (15:55 +0200)]

add migr

commit | commitdiff | tree

yomguy [Tue, 27 Mar 2012 11:29:05 +0000 (13:29 +0200)]

Merge branch 'master' into crem

commit | commitdiff | tree

yomguy [Mon, 26 Mar 2012 12:15:24 +0000 (14:15 +0200)]

update graphs

commit | commitdiff | tree

yomguy [Fri, 23 Mar 2012 11:53:57 +0000 (12:53 +0100)]

add graphs

commit | commitdiff | tree

yomguy [Thu, 22 Mar 2012 02:01:05 +0000 (03:01 +0100)]

reg

commit | commitdiff | tree

yomguy [Thu, 22 Mar 2012 01:56:45 +0000 (02:56 +0100)]

add migr

commit | commitdiff | tree

yomguy [Thu, 22 Mar 2012 01:55:52 +0000 (02:55 +0100)]

fix thumbs height

commit | commitdiff | tree

yomguy [Thu, 22 Mar 2012 01:42:29 +0000 (02:42 +0100)]

Merge branch 'master' into crem

commit | commitdiff | tree

yomguy [Thu, 22 Mar 2012 01:41:59 +0000 (02:41 +0100)]

add init password

commit | commitdiff | tree

yomguy [Wed, 21 Mar 2012 23:46:12 +0000 (00:46 +0100)]

add user profile to admin

commit | commitdiff | tree

yomguy [Wed, 21 Mar 2012 16:32:11 +0000 (17:32 +0100)]

Merge branch 'master' into crem

commit | commitdiff | tree

yomguy [Wed, 21 Mar 2012 16:31:43 +0000 (17:31 +0100)]

add thumbnails to items and collections

commit | commitdiff | tree

yomguy [Wed, 21 Mar 2012 16:09:58 +0000 (17:09 +0100)]

Merge branch 'master' into crem

commit | commitdiff | tree

yomguy [Wed, 21 Mar 2012 16:01:54 +0000 (17:01 +0100)]

upgrade

commit | commitdiff | tree

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

commit | commitdiff | tree

yomguy [Wed, 21 Mar 2012 14:15:41 +0000 (15:15 +0100)]

Merge branch 'master' into crem

commit | commitdiff | tree

yomguy [Wed, 21 Mar 2012 14:15:35 +0000 (15:15 +0100)]

fix

commit | commitdiff | tree

yomguy [Wed, 21 Mar 2012 14:12:57 +0000 (15:12 +0100)]

Merge branch 'master' into crem

commit | commitdiff | tree

yomguy [Wed, 21 Mar 2012 14:12:36 +0000 (15:12 +0100)]

bugfix

commit | commitdiff | tree

yomguy [Wed, 21 Mar 2012 14:09:10 +0000 (15:09 +0100)]

Merge branch 'master' into crem

commit | commitdiff | tree

yomguy [Wed, 21 Mar 2012 14:08:58 +0000 (15:08 +0100)]

reg

commit | commitdiff | tree

yomguy [Wed, 21 Mar 2012 14:06:14 +0000 (15:06 +0100)]

Merge branch 'master' into crem

commit | commitdiff | tree

yomguy [Wed, 21 Mar 2012 14:06:03 +0000 (15:06 +0100)]

add mig

commit | commitdiff | tree

yomguy [Wed, 21 Mar 2012 14:05:06 +0000 (15:05 +0100)]

fix profile

commit | commitdiff | tree

yomguy [Wed, 21 Mar 2012 13:44:33 +0000 (14:44 +0100)]

Merge branch 'master' into crem

commit | commitdiff | tree

yomguy [Wed, 21 Mar 2012 13:43:25 +0000 (14:43 +0100)]

add extra blocks, horizontal window for children in admin

commit | commitdiff | tree

yomguy [Wed, 14 Mar 2012 11:25:01 +0000 (12:25 +0100)]

go back

commit | commitdiff | tree

yomguy [Tue, 13 Mar 2012 17:42:46 +0000 (18:42 +0100)]

add postman templates

commit | commitdiff | tree

yomguy [Tue, 13 Mar 2012 10:46:21 +0000 (11:46 +0100)]

cleanup

commit | commitdiff | tree

yomguy [Mon, 5 Mar 2012 12:17:31 +0000 (13:17 +0100)]

Merge branch 'master' into crem

commit | commitdiff | tree

yomguy [Mon, 5 Mar 2012 12:17:25 +0000 (13:17 +0100)]

fix doc

commit | commitdiff | tree

yomguy [Mon, 5 Mar 2012 12:15:19 +0000 (13:15 +0100)]

Merge branch 'master' into crem

commit | commitdiff | tree

yomguy [Mon, 5 Mar 2012 12:15:05 +0000 (13:15 +0100)]

fix doc

commit | commitdiff | tree

yomguy [Mon, 5 Mar 2012 11:46:24 +0000 (12:46 +0100)]

fix news

commit | commitdiff | tree

yomguy [Thu, 23 Feb 2012 13:33:48 +0000 (14:33 +0100)]

fix content width on profile page

commit | commitdiff | tree

yomguy [Thu, 23 Feb 2012 13:26:38 +0000 (14:26 +0100)]

add user revisions to user profile

commit | commitdiff | tree

yomguy [Mon, 20 Feb 2012 17:32:34 +0000 (18:32 +0100)]

Merge branch 'master' into crem

commit | commitdiff | tree

yomguy [Mon, 20 Feb 2012 17:32:30 +0000 (18:32 +0100)]

tag 1.4.2

commit | commitdiff | tree

yomguy [Mon, 20 Feb 2012 17:21:46 +0000 (18:21 +0100)]

Merge branch 'master' into crem

commit | commitdiff | tree

yomguy [Mon, 20 Feb 2012 17:17:59 +0000 (18:17 +0100)]

add author to last revision

commit | commitdiff | tree

yomguy [Mon, 20 Feb 2012 17:06:24 +0000 (18:06 +0100)]

Merge branch 'master' into crem

commit | commitdiff | tree

yomguy [Mon, 20 Feb 2012 16:58:08 +0000 (17:58 +0100)]

add locale

commit | commitdiff | tree

yomguy [Mon, 20 Feb 2012 16:52:23 +0000 (17:52 +0100)]

add mig

commit | commitdiff | tree

yomguy [Mon, 20 Feb 2012 16:49:50 +0000 (17:49 +0100)]

move all edit buttons to main edit pages

commit | commitdiff | tree

yomguy [Mon, 20 Feb 2012 16:23:07 +0000 (17:23 +0100)]

fix no revisions

commit | commitdiff | tree

yomguy [Mon, 20 Feb 2012 16:18:45 +0000 (17:18 +0100)]

more trans

commit | commitdiff | tree

yomguy [Mon, 20 Feb 2012 16:16:27 +0000 (17:16 +0100)]

fix image url ext

commit | commitdiff | tree

yomguy [Mon, 20 Feb 2012 16:09:36 +0000 (17:09 +0100)]

fix fonds form, add last revision time to all resources

commit | commitdiff | tree

yomguy [Mon, 20 Feb 2012 15:59:52 +0000 (16:59 +0100)]

add migrations

commit | commitdiff | tree

yomguy [Mon, 20 Feb 2012 15:58:37 +0000 (16:58 +0100)]

add Format (LAM) and various enumerations, add last revision to item detail

commit | commitdiff | tree

yomguy [Fri, 17 Feb 2012 11:51:58 +0000 (12:51 +0100)]

Merge branch 'master' into crem

commit | commitdiff | tree

yomguy [Fri, 17 Feb 2012 11:51:41 +0000 (12:51 +0100)]

tag 1.4.1

commit | commitdiff | tree

yomguy [Fri, 17 Feb 2012 11:43:08 +0000 (12:43 +0100)]

Merge branch 'master' into crem

commit | commitdiff | tree

yomguy [Fri, 17 Feb 2012 11:43:03 +0000 (12:43 +0100)]

fix titles

commit | commitdiff | tree

yomguy [Fri, 17 Feb 2012 11:41:43 +0000 (12:41 +0100)]

Merge branch 'master' into crem

commit | commitdiff | tree

yomguy [Fri, 17 Feb 2012 11:41:18 +0000 (12:41 +0100)]

fix no title in related media

commit | commitdiff | tree

yomguy [Tue, 14 Feb 2012 16:36:49 +0000 (17:36 +0100)]

fix doc

commit | commitdiff | tree

yomguy [Tue, 14 Feb 2012 15:16:51 +0000 (16:16 +0100)]

Merge branch 'master' into crem

commit | commitdiff | tree

yomguy [Tue, 14 Feb 2012 15:16:43 +0000 (16:16 +0100)]

fix desc again

commit | commitdiff | tree

yomguy [Tue, 14 Feb 2012 15:15:58 +0000 (16:15 +0100)]

fix desc

commit | commitdiff | tree

yomguy [Tue, 14 Feb 2012 15:05:46 +0000 (16:05 +0100)]

Merge branch 'master' into crem

Conflicts:
telemeta/pages/en/help.rst
telemeta/pages/fr/help.rst

commit | commitdiff | tree

yomguy [Tue, 14 Feb 2012 15:04:48 +0000 (16:04 +0100)]

fix help again

commit | commitdiff | tree

yomguy [Tue, 14 Feb 2012 15:03:38 +0000 (16:03 +0100)]

fix help

commit | commitdiff | tree

yomguy [Tue, 14 Feb 2012 15:02:30 +0000 (16:02 +0100)]

Merge branch 'master' into crem
fix help pages

Conflicts:
telemeta/pages/en/home.rst
telemeta/pages/fr/home.rst

commit | commitdiff | tree

yomguy [Tue, 14 Feb 2012 14:51:02 +0000 (15:51 +0100)]

add help icon, fix titles

commit | commitdiff | tree

yomguy [Tue, 14 Feb 2012 14:47:10 +0000 (15:47 +0100)]

change titles

commit | commitdiff | tree

yomguy [Tue, 14 Feb 2012 00:35:31 +0000 (01:35 +0100)]

Merge branch 'master' into crem

commit | commitdiff | tree

yomguy [Tue, 14 Feb 2012 00:34:23 +0000 (01:34 +0100)]

more loop over types

commit | commitdiff | tree

yomguy [Mon, 13 Feb 2012 23:17:39 +0000 (00:17 +0100)]

Merge branch 'master' into crem

commit | commitdiff | tree

yomguy [Mon, 13 Feb 2012 23:16:59 +0000 (00:16 +0100)]

remove waves

commit | commitdiff | tree

yomguy [Mon, 13 Feb 2012 23:11:59 +0000 (00:11 +0100)]

fix module titles

commit | commitdiff | tree

yomguy [Mon, 13 Feb 2012 23:01:22 +0000 (00:01 +0100)]

Merge branch 'master' into crem

Unnamed repository; edit this file 'description' to name the repository.