]>
git.parisson.com Git - telemeta.git/log
mathieu [Wed, 11 May 2016 09:12:24 +0000 (11:12 +0200)]
Merge branch 'dev' of https://github.com/maths28/Telemeta into dev
mathieu [Wed, 11 May 2016 09:11:52 +0000 (11:11 +0200)]
Merge remote-tracking branch 'origin/devinstable' into dev
mathieu [Mon, 9 May 2016 15:15:03 +0000 (17:15 +0200)]
Autocompletion lieu + fix traduction
mathieu [Mon, 9 May 2016 12:57:19 +0000 (14:57 +0200)]
Fix repeat facets Published/Unpublished
mathieu [Mon, 9 May 2016 09:11:17 +0000 (11:11 +0200)]
Update modif telemeta
mathieu [Mon, 9 May 2016 09:08:23 +0000 (11:08 +0200)]
Add display form playlist when authenticated
mathieu [Mon, 9 May 2016 08:42:43 +0000 (10:42 +0200)]
Add repository haystack maths28
mathieu [Tue, 3 May 2016 16:11:51 +0000 (18:11 +0200)]
Fix item deja ds liste
mathieu [Tue, 3 May 2016 13:45:16 +0000 (15:45 +0200)]
Ajout deja ajoute dans liste
mathieu [Tue, 3 May 2016 06:38:38 +0000 (08:38 +0200)]
Fix filter physical_format
mathieu [Tue, 3 May 2016 06:37:22 +0000 (08:37 +0200)]
Fix filter physical format
mathieu [Tue, 3 May 2016 06:05:01 +0000 (08:05 +0200)]
Remove cat script app.sh
mathieu [Tue, 3 May 2016 06:04:16 +0000 (08:04 +0200)]
Remove cat script app.sh
mathieu [Tue, 3 May 2016 05:52:54 +0000 (07:52 +0200)]
Merge remote-tracking branch 'origin/devinstable' into dev
mathieu [Tue, 3 May 2016 05:45:49 +0000 (07:45 +0200)]
Fix item deja ds playlist (convert resource_id to int)
Remove print queries backend
mathieu [Mon, 2 May 2016 22:42:50 +0000 (00:42 +0200)]
Ajout deja ds liste
Marche que quand pas de nouvelle cote
mathieu [Mon, 2 May 2016 16:23:27 +0000 (18:23 +0200)]
Tri inchange qd chgmt page (avancee)
mathieu [Mon, 2 May 2016 15:22:08 +0000 (17:22 +0200)]
Fix backend build_query + fix filtres en ligne/acces compte
mathieu [Mon, 2 May 2016 14:46:50 +0000 (16:46 +0200)]
Update locale + add_playlist pour les items generaux/dans instrus/dans instrus alias (+nb items par page)
mathieu [Mon, 2 May 2016 08:27:49 +0000 (10:27 +0200)]
Fix build_query for query with punctuations
mathieu [Sun, 1 May 2016 06:30:51 +0000 (08:30 +0200)]
Fix .init
mathieu [Fri, 29 Apr 2016 16:12:39 +0000 (18:12 +0200)]
Remodif mapping ES (en cours)
mathieu [Fri, 29 Apr 2016 08:03:45 +0000 (10:03 +0200)]
Fix url inexistant recherche avancée
Lien type résultats avec page=1
mathieu [Thu, 28 Apr 2016 13:24:26 +0000 (15:24 +0200)]
Merge Parisson/Telemeta/dev
mathieu [Thu, 28 Apr 2016 13:19:46 +0000 (15:19 +0200)]
Remove alert parser + desactive debug tablesorter
mathieu [Thu, 28 Apr 2016 13:12:56 +0000 (15:12 +0200)]
Merge Parisson/Telemeta/dev
mathieu [Thu, 28 Apr 2016 13:05:36 +0000 (15:05 +0200)]
Merge remote-tracking branch 'origin/devinstable' into dev
mathieu [Thu, 28 Apr 2016 12:58:11 +0000 (14:58 +0200)]
Amelioration recherche avancee
Amelioration mapping ES
Modif filtres haystack_form
Fix tri numerises
Fix liste autocompletion collecteurs ( plus repetition + separation ;ESPACE )
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
mathieu [Tue, 26 Apr 2016 15:10:36 +0000 (17:10 +0200)]
Revue du mapping ES (utilisation startswith +coherent)
mathieu [Tue, 26 Apr 2016 13:08:28 +0000 (15:08 +0200)]
mathieu [Tue, 26 Apr 2016 13:05:34 +0000 (15:05 +0200)]
Merge branch 'dev' of https://github.com/maths28/Telemeta into dev
Former-commit-id:
b4f83798aaff98f5838ab87a1784c74a39d5c967
mathieu [Tue, 26 Apr 2016 13:04:53 +0000 (15:04 +0200)]
MAJ locale
mathieu [Tue, 26 Apr 2016 13:03:24 +0000 (15:03 +0200)]
MAJ locale
mathieu [Tue, 26 Apr 2016 09:58:18 +0000 (11:58 +0200)]
mathieu [Tue, 26 Apr 2016 09:04:50 +0000 (11:04 +0200)]
Guillaume Pellerin [Mon, 25 Apr 2016 21:42:01 +0000 (23:42 +0200)]
Merge branch 'dev' of github.com:Parisson/Telemeta into dev
mathieu [Fri, 22 Apr 2016 14:34:42 +0000 (16:34 +0200)]
Ajout fermeture listes quand ouverture bureau
Former-commit-id:
d88be27035704b6207e0378d5b15c73da45445ed
mathieu [Fri, 22 Apr 2016 13:59:24 +0000 (15:59 +0200)]
Fin recherche booleenne
Former-commit-id:
195c9451d92ab3916e571d321601ad09ae532f4c
mathieu [Thu, 21 Apr 2016 12:49:14 +0000 (14:49 +0200)]
mathieu [Thu, 21 Apr 2016 08:49:51 +0000 (10:49 +0200)]
Simplify index and settings
Former-commit-id:
0e6442202c996e754c09a234b2c62807182a203d
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
mathieu [Tue, 19 Apr 2016 08:33:27 +0000 (10:33 +0200)]
Debut recherche booleenne instru
Former-commit-id:
cd964ada747b0ed3cd5398f0234f0c3a45264c5d
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
mathieu [Mon, 18 Apr 2016 12:23:40 +0000 (14:23 +0200)]
mathieu [Mon, 18 Apr 2016 12:19:16 +0000 (14:19 +0200)]
mathieu [Mon, 18 Apr 2016 12:12:15 +0000 (14:12 +0200)]
Autocompletion sur cote, instruments (1 seul) et collecteur
Former-commit-id:
2c4cc503bee00074f101de0af6d691aa28b386f9
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
Mathieu [Thu, 14 Apr 2016 19:45:23 +0000 (21:45 +0200)]
Fix collecteur recherche+liste
Former-commit-id:
fff89e77ac2afb3404831417efa245ed17e11a5d
mathieu [Thu, 14 Apr 2016 13:48:26 +0000 (15:48 +0200)]
Ajout liste des items d'un instrument et d'un alias d'instrument
Former-commit-id:
29c0fdbb984c368f56e8bf2ecf5fe0cb5bb578db
mathieu [Thu, 14 Apr 2016 09:27:11 +0000 (11:27 +0200)]
mathieu [Thu, 14 Apr 2016 09:04:35 +0000 (11:04 +0200)]
mathieu [Thu, 14 Apr 2016 08:56:02 +0000 (10:56 +0200)]
mathieu [Thu, 14 Apr 2016 08:10:27 +0000 (10:10 +0200)]
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
Mathieu [Wed, 13 Apr 2016 18:59:07 +0000 (20:59 +0200)]
Mathieu [Wed, 13 Apr 2016 18:36:52 +0000 (20:36 +0200)]
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
mathieu [Wed, 13 Apr 2016 15:05:45 +0000 (17:05 +0200)]
Ajout nb items pour la liste des instruments et alias
Former-commit-id:
d389bf006994f1649c0953533ca0af622a68822e
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
mathieu [Wed, 13 Apr 2016 10:39:51 +0000 (12:39 +0200)]
Ajout tri recherche simple et avancee
Former-commit-id:
fc7321864fa1f8f23f64574dd6df06901226c912
mathieu [Wed, 13 Apr 2016 08:32:09 +0000 (10:32 +0200)]
mathieu [Wed, 13 Apr 2016 08:12:36 +0000 (10:12 +0200)]
Ajout ouverture de la derniere liste de lecture utilisée
Former-commit-id:
7c93e641e9509f6ea41a8a77634b6105587226e4
mathieu [Wed, 13 Apr 2016 07:39:30 +0000 (09:39 +0200)]
Essai avec url et tag inc
Former-commit-id:
8a04bcc8c38f3a7eef168493d83b492978aff944
mathieu [Mon, 11 Apr 2016 14:20:44 +0000 (16:20 +0200)]
VAlidation traduction
Former-commit-id:
180a28fcc35fb3a5990d59e25c25af40fb79fd9c
mathieu [Mon, 11 Apr 2016 14:04:24 +0000 (16:04 +0200)]
mathieu [Mon, 11 Apr 2016 14:00:00 +0000 (16:00 +0200)]
Autocompletion partiel + validation traduction
Former-commit-id:
f5f757c6ca3c1b4699e479280b140390fb417921
mathieu [Mon, 11 Apr 2016 08:49:15 +0000 (10:49 +0200)]
Remove old version backup
Former-commit-id:
2d1bddbe4a1997166440a44a3bf6fde14a1d309d
mathieu [Mon, 11 Apr 2016 08:46:58 +0000 (10:46 +0200)]
Remove custom backend
Former-commit-id:
c27ef4ef566418e76bf2ba4689df1eaac1939d28
mathieu [Mon, 11 Apr 2016 08:35:22 +0000 (10:35 +0200)]
Ajout variable env pour eviter pls rebuild
Thomas Fillon [Mon, 11 Apr 2016 07:35:15 +0000 (09:35 +0200)]
Merge branch 'dev' into feature/ts-server
Mathieu [Mon, 11 Apr 2016 06:09:19 +0000 (08:09 +0200)]
Commit locale
Mathieu [Mon, 11 Apr 2016 06:07:43 +0000 (08:07 +0200)]
Fix search_index
Mathieu [Fri, 8 Apr 2016 11:29:08 +0000 (13:29 +0200)]
Ajout fichier aide-memo
Mathieu [Thu, 7 Apr 2016 17:20:07 +0000 (19:20 +0200)]
Merge remote-tracking branch 'upstream/dev' into dev
projects / telemeta.git / log