]>
git.parisson.com Git - telemeta.git/log
Raouf Benmansour [Fri, 8 Jan 2016 09:53:15 +0000 (10:53 +0100)]
Fix advance search, now displays Collections results by default
Raouf Benmansour [Fri, 8 Jan 2016 09:47:00 +0000 (10:47 +0100)]
Fix basic search template, Fonds count displayed was equal to Corpus count
Raouf Benmansour [Thu, 7 Jan 2016 10:52:18 +0000 (11:52 +0100)]
Merging corpus and fonds templates into a single one
Raouf Benmansour [Thu, 17 Dec 2015 13:46:32 +0000 (14:46 +0100)]
Merge branch 'feature/haystack' of github.com:Parisson/Telemeta into feature/haystack
Raouf Benmansour [Thu, 17 Dec 2015 13:18:54 +0000 (14:18 +0100)]
Indexation of Corpus and Fonds for the search module
Raouf Benmansour [Thu, 17 Dec 2015 12:39:27 +0000 (13:39 +0100)]
Corpus and Fonds added in the search module + Submodule locale mis à jour
Raouf Benmansour [Thu, 17 Dec 2015 11:10:38 +0000 (12:10 +0100)]
Merge remote-tracking branch 'origin/master' into feature/haystack
Guillaume Pellerin [Tue, 8 Dec 2015 16:36:49 +0000 (17:36 +0100)]
re-add django-bower
Guillaume Pellerin [Tue, 8 Dec 2015 16:11:20 +0000 (17:11 +0100)]
fix bower_install
Guillaume Pellerin [Tue, 8 Dec 2015 16:07:14 +0000 (17:07 +0100)]
fix bower install
Guillaume Pellerin [Tue, 8 Dec 2015 16:04:37 +0000 (17:04 +0100)]
add bower install to start_app
Guillaume Pellerin [Tue, 8 Dec 2015 09:39:05 +0000 (10:39 +0100)]
fix video time
Guillaume Pellerin [Thu, 3 Dec 2015 09:00:30 +0000 (10:00 +0100)]
fix tags
Guillaume Pellerin [Thu, 3 Dec 2015 08:46:13 +0000 (09:46 +0100)]
Merge branch 'feature/csv-streaming' into dev
Guillaume Pellerin [Thu, 3 Dec 2015 08:45:37 +0000 (09:45 +0100)]
fix no elements
Guillaume Pellerin [Thu, 3 Dec 2015 08:44:01 +0000 (09:44 +0100)]
fix CSV stream output
Guillaume Pellerin [Wed, 2 Dec 2015 14:49:22 +0000 (15:49 +0100)]
update logo link
Guillaume Pellerin [Mon, 23 Nov 2015 00:28:41 +0000 (01:28 +0100)]
pin ES==1
Guillaume Pellerin [Sun, 22 Nov 2015 23:10:17 +0000 (00:10 +0100)]
rm lib and log containers
Guillaume Pellerin [Sun, 22 Nov 2015 22:46:31 +0000 (23:46 +0100)]
fix registration version (dj1.6 compatible), re-add some dep install, change default sql passwords
Guillaume Pellerin [Wed, 18 Nov 2015 22:14:20 +0000 (23:14 +0100)]
Merge branch 'dev' into feature/csv-streaming
Conflicts:
telemeta/util/unicode.py
telemeta/views/playlist.py
Guillaume Pellerin [Fri, 13 Nov 2015 15:37:30 +0000 (16:37 +0100)]
bugfix
Guillaume Pellerin [Fri, 13 Nov 2015 15:35:23 +0000 (16:35 +0100)]
bugfix
Guillaume Pellerin [Fri, 13 Nov 2015 15:30:50 +0000 (16:30 +0100)]
csv: tags of the first element
Guillaume Pellerin [Fri, 13 Nov 2015 15:28:50 +0000 (16:28 +0100)]
fix csv table
Guillaume Pellerin [Fri, 13 Nov 2015 14:45:28 +0000 (15:45 +0100)]
fix playlist resource type
Guillaume Pellerin [Fri, 13 Nov 2015 14:40:08 +0000 (15:40 +0100)]
Merge branch 'dev' of github.com:Parisson/Telemeta into dev
Guillaume Pellerin [Fri, 13 Nov 2015 14:39:42 +0000 (15:39 +0100)]
add csv element function
Guillaume Pellerin [Fri, 13 Nov 2015 14:35:47 +0000 (15:35 +0100)]
begin CSV streaming
Guillaume Pellerin [Thu, 5 Nov 2015 21:32:29 +0000 (22:32 +0100)]
fix unicode export bugs
Guillaume Pellerin [Thu, 5 Nov 2015 16:34:07 +0000 (17:34 +0100)]
Merge branch 'dev' of https://github.com/yomguy/Telemeta into dev
Guillaume Pellerin [Thu, 5 Nov 2015 16:33:45 +0000 (17:33 +0100)]
add playlist csv export script
Guillaume Pellerin [Fri, 23 Oct 2015 10:56:09 +0000 (12:56 +0200)]
Merge branch 'dev' of https://github.com/yomguy/Telemeta into dev
Guillaume Pellerin [Fri, 23 Oct 2015 10:55:50 +0000 (12:55 +0200)]
fix duration parsing
Guillaume Pellerin [Thu, 22 Oct 2015 15:39:14 +0000 (17:39 +0200)]
Merge branch 'dev' of https://github.com/yomguy/Telemeta into dev
Conflicts:
telemeta/locale
telemeta/management/commands/telemeta-import-collections-from-crem.py
Guillaume Pellerin [Thu, 22 Oct 2015 15:36:54 +0000 (17:36 +0200)]
fix import command, add mp4 to video mime types
Guillaume Pellerin [Thu, 22 Oct 2015 15:23:21 +0000 (17:23 +0200)]
make a CSV export generic function, add a command to export all items and collections
Guillaume Pellerin [Thu, 22 Oct 2015 14:31:01 +0000 (16:31 +0200)]
add collection metada to item CSV export
Guillaume Pellerin [Thu, 22 Oct 2015 12:37:35 +0000 (14:37 +0200)]
fix footer
anas [Wed, 21 Oct 2015 19:27:56 +0000 (21:27 +0200)]
Allowing html in collections' description
Guillaume Pellerin [Thu, 15 Oct 2015 14:02:42 +0000 (16:02 +0200)]
add blog post
Guillaume Pellerin [Thu, 15 Oct 2015 14:01:35 +0000 (16:01 +0200)]
pin elasticsearch python module, split requirements
Guillaume Pellerin [Thu, 15 Oct 2015 13:24:15 +0000 (15:24 +0200)]
Merge branch 'dev' of github.com:Parisson/Telemeta into dev
Guillaume Pellerin [Thu, 15 Oct 2015 13:23:39 +0000 (15:23 +0200)]
update doc plugins
Thomas Fillon [Thu, 15 Oct 2015 13:22:03 +0000 (15:22 +0200)]
Pinned some requirement in setup.py
Guillaume Pellerin [Wed, 16 Sep 2015 15:35:36 +0000 (17:35 +0200)]
Merge branch 'dev'
Guillaume Pellerin [Wed, 16 Sep 2015 15:35:16 +0000 (17:35 +0200)]
http for default submodules
Guillaume Pellerin [Wed, 16 Sep 2015 13:37:00 +0000 (15:37 +0200)]
Merge branch 'dev'
Guillaume Pellerin [Tue, 15 Sep 2015 23:20:39 +0000 (01:20 +0200)]
fix item format
Guillaume Pellerin [Tue, 15 Sep 2015 23:10:20 +0000 (01:10 +0200)]
one inline for format
Guillaume Pellerin [Tue, 15 Sep 2015 21:08:21 +0000 (23:08 +0200)]
docker: fix lib volumes for db
Guillaume Pellerin [Sun, 13 Sep 2015 19:16:04 +0000 (21:16 +0200)]
Merge branch 'dev'
Guillaume Pellerin [Sun, 13 Sep 2015 19:14:16 +0000 (21:14 +0200)]
update locale
Guillaume Pellerin [Fri, 11 Sep 2015 14:52:45 +0000 (16:52 +0200)]
Merge branch 'dev'
Guillaume Pellerin [Fri, 11 Sep 2015 14:52:35 +0000 (16:52 +0200)]
update locales
Guillaume Pellerin [Thu, 10 Sep 2015 12:41:22 +0000 (14:41 +0200)]
goto 1.6
Guillaume Pellerin [Thu, 10 Sep 2015 12:35:22 +0000 (14:35 +0200)]
remove top player, fix public item button
Guillaume Pellerin [Tue, 8 Sep 2015 16:15:00 +0000 (18:15 +0200)]
add Playlist to admin
Guillaume Pellerin [Mon, 7 Sep 2015 23:20:32 +0000 (01:20 +0200)]
fix paths and commands
Guillaume Pellerin [Mon, 7 Sep 2015 22:04:57 +0000 (00:04 +0200)]
bugfix for item serializer
Guillaume Pellerin [Fri, 4 Sep 2015 15:46:29 +0000 (17:46 +0200)]
Merge branch 'dev' into feature/haystack
Guillaume Pellerin [Fri, 4 Sep 2015 15:46:14 +0000 (17:46 +0200)]
update locale
Guillaume Pellerin [Fri, 4 Sep 2015 15:43:33 +0000 (17:43 +0200)]
update default page title
Guillaume Pellerin [Fri, 4 Sep 2015 14:50:16 +0000 (16:50 +0200)]
fix github version to specific commit
Guillaume Pellerin [Tue, 1 Sep 2015 12:20:23 +0000 (14:20 +0200)]
Merge branch 'dev'
Guillaume Pellerin [Tue, 1 Sep 2015 12:19:53 +0000 (14:19 +0200)]
fix deps
Guillaume Pellerin [Mon, 31 Aug 2015 10:03:00 +0000 (12:03 +0200)]
fix news
Guillaume Pellerin [Mon, 31 Aug 2015 10:01:22 +0000 (12:01 +0200)]
Merge branch 'dev'
Guillaume Pellerin [Mon, 31 Aug 2015 10:01:10 +0000 (12:01 +0200)]
update NEWS
Guillaume Pellerin [Mon, 31 Aug 2015 09:06:20 +0000 (11:06 +0200)]
Merge branch 'dev'
Guillaume Pellerin [Tue, 28 Jul 2015 21:24:12 +0000 (23:24 +0200)]
fix eub url
Guillaume Pellerin [Tue, 28 Jul 2015 21:17:38 +0000 (23:17 +0200)]
unicode regression on model serializers
Guillaume Pellerin [Tue, 28 Jul 2015 21:13:12 +0000 (23:13 +0200)]
fix epub url
Guillaume Pellerin [Fri, 24 Jul 2015 14:19:20 +0000 (16:19 +0200)]
fix more unicode
Guillaume Pellerin [Thu, 23 Jul 2015 17:13:39 +0000 (19:13 +0200)]
cleanup
Guillaume Pellerin [Thu, 23 Jul 2015 16:55:01 +0000 (18:55 +0200)]
fix cover
Guillaume Pellerin [Thu, 23 Jul 2015 16:10:50 +0000 (18:10 +0200)]
epub: add path setup
Guillaume Pellerin [Thu, 23 Jul 2015 14:04:06 +0000 (16:04 +0200)]
locale
Guillaume Pellerin [Thu, 23 Jul 2015 13:59:49 +0000 (15:59 +0200)]
remove epub perms
Guillaume Pellerin [Thu, 23 Jul 2015 13:58:15 +0000 (15:58 +0200)]
fix again
Guillaume Pellerin [Thu, 23 Jul 2015 13:56:47 +0000 (15:56 +0200)]
fix url
Guillaume Pellerin [Thu, 23 Jul 2015 13:54:49 +0000 (15:54 +0200)]
update links
Guillaume Pellerin [Thu, 23 Jul 2015 13:42:18 +0000 (15:42 +0200)]
add password form for EPUB download access
Guillaume Pellerin [Thu, 9 Jul 2015 16:31:23 +0000 (18:31 +0200)]
Merge branch 'dev' into feature/haystack
Guillaume Pellerin [Wed, 8 Jul 2015 12:03:25 +0000 (14:03 +0200)]
exclude item.public_access for non staff, prepare 1.6 info
Guillaume Pellerin [Wed, 1 Jul 2015 09:17:24 +0000 (11:17 +0200)]
cosmetic fixes
Guillaume Pellerin [Tue, 30 Jun 2015 22:02:30 +0000 (00:02 +0200)]
fix some trans calls
Guillaume Pellerin [Mon, 29 Jun 2015 07:53:10 +0000 (09:53 +0200)]
add portugese (pt_BR)
Guillaume Pellerin [Mon, 29 Jun 2015 07:35:16 +0000 (09:35 +0200)]
Merge pull request #70 from Kaltar5679/feature/haystack
translation for haystack search
kmary [Sun, 28 Jun 2015 14:01:23 +0000 (16:01 +0200)]
Pull from parisson/Telemeta tree featured/haystack
translation for haystack search
Guillaume Pellerin [Fri, 26 Jun 2015 11:25:10 +0000 (13:25 +0200)]
Merge branch 'feature/haystack' of github.com:Parisson/Telemeta into feature/haystack
Guillaume Pellerin [Fri, 26 Jun 2015 11:24:41 +0000 (13:24 +0200)]
cleanup and fix various haystack stuff
Thomas Fillon [Fri, 26 Jun 2015 09:13:48 +0000 (11:13 +0200)]
Remove src directory
Guillaume Pellerin [Fri, 26 Jun 2015 00:09:08 +0000 (02:09 +0200)]
Merge branch 'dev' into feature/haystack
Guillaume Pellerin [Thu, 25 Jun 2015 18:49:25 +0000 (20:49 +0200)]
Merge pull request #69 from afilsaime/feature/haystack
Replace django based search engine with an extensive haystack / elasticsearch implementation
Guillaume Pellerin [Thu, 25 Jun 2015 15:18:22 +0000 (17:18 +0200)]
cleanup submodules
afilsaime [Thu, 25 Jun 2015 12:29:42 +0000 (14:29 +0200)]
prevent the adding of an object several time on playlist adding
Kaltar5679 [Thu, 25 Jun 2015 11:55:53 +0000 (13:55 +0200)]
Merge branch 'feature/haystack' of github.com:afilsaime/Telemeta into feature/haystack
Kaltar5679 [Thu, 25 Jun 2015 11:54:35 +0000 (13:54 +0200)]
organization of haystack function
afilsaime [Thu, 25 Jun 2015 11:49:25 +0000 (13:49 +0200)]
change button