]>
git.parisson.com Git - mezzo.git/log
Guillaume Pellerin [Thu, 20 Oct 2016 08:50:37 +0000 (10:50 +0200)]
Merge branch 'dev' into prestashop
Conflicts:
lib/django-prestashop
Guillaume Pellerin [Wed, 19 Oct 2016 17:24:12 +0000 (19:24 +0200)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev
Conflicts:
app/templates/agenda/includes/event_date.html
Guillaume Pellerin [Wed, 19 Oct 2016 17:08:50 +0000 (19:08 +0200)]
Fix event date display
Guillaume Pellerin [Wed, 19 Oct 2016 16:49:33 +0000 (18:49 +0200)]
Fix import prestashop products to events, adapt event view
Jérémy Fabre [Wed, 19 Oct 2016 09:57:21 +0000 (11:57 +0200)]
Change de copyright style in the sliders
Jérémy Fabre [Wed, 19 Oct 2016 09:54:52 +0000 (11:54 +0200)]
Event details fixes
Jérémy Fabre [Wed, 19 Oct 2016 09:01:00 +0000 (11:01 +0200)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev
Jérémy Fabre [Wed, 19 Oct 2016 09:00:56 +0000 (11:00 +0200)]
Add no price comments to event details
Guillaume Pellerin [Tue, 18 Oct 2016 16:13:52 +0000 (18:13 +0200)]
Merge branch 'dev' into prestashop
Guillaume Pellerin [Tue, 18 Oct 2016 16:08:16 +0000 (18:08 +0200)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev
Guillaume Pellerin [Tue, 18 Oct 2016 16:08:07 +0000 (18:08 +0200)]
More translations
Guillaume Pellerin [Tue, 18 Oct 2016 16:03:14 +0000 (18:03 +0200)]
bum postgres version, update mysql import script
Jérémy Fabre [Tue, 18 Oct 2016 15:54:35 +0000 (17:54 +0200)]
Person lists fixes
Guillaume Pellerin [Tue, 18 Oct 2016 15:43:53 +0000 (17:43 +0200)]
Merge branch 'dev' into prestashop
Conflicts:
app/templates/agenda/includes/event_date.html
Guillaume Pellerin [Tue, 18 Oct 2016 15:38:36 +0000 (17:38 +0200)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev
Guillaume Pellerin [Tue, 18 Oct 2016 15:38:03 +0000 (17:38 +0200)]
cleanup
Jérémy Fabre [Tue, 18 Oct 2016 15:30:20 +0000 (17:30 +0200)]
Decrease the product lists width
Jérémy Fabre [Tue, 18 Oct 2016 15:16:24 +0000 (17:16 +0200)]
Search results first implementation
Jérémy Fabre [Tue, 18 Oct 2016 14:17:59 +0000 (16:17 +0200)]
Event date format update
Jérémy Fabre [Tue, 18 Oct 2016 14:17:43 +0000 (16:17 +0200)]
Add better lazyload on events list
Guillaume Pellerin [Tue, 18 Oct 2016 14:07:18 +0000 (16:07 +0200)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev
Guillaume Pellerin [Tue, 18 Oct 2016 14:07:05 +0000 (16:07 +0200)]
cleanup
Jérémy Fabre [Tue, 18 Oct 2016 14:06:52 +0000 (16:06 +0200)]
Bigger booking button on events list
Jérémy Fabre [Tue, 18 Oct 2016 14:06:15 +0000 (16:06 +0200)]
Product box style implementation
Guillaume Pellerin [Tue, 18 Oct 2016 13:17:07 +0000 (15:17 +0200)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev
Guillaume Pellerin [Tue, 18 Oct 2016 13:16:51 +0000 (15:16 +0200)]
Fix parent event data
Jérémy Fabre [Tue, 18 Oct 2016 12:51:17 +0000 (14:51 +0200)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev
Jérémy Fabre [Tue, 18 Oct 2016 12:50:05 +0000 (14:50 +0200)]
Add Tournees banner to events list sidebar
Guillaume Pellerin [Tue, 18 Oct 2016 10:36:56 +0000 (12:36 +0200)]
Add person list translations
Guillaume Pellerin [Tue, 18 Oct 2016 10:30:58 +0000 (12:30 +0200)]
Bump postgres to 9.5, add admin person desc
Guillaume Pellerin [Tue, 18 Oct 2016 10:06:57 +0000 (12:06 +0200)]
Add more translations, add date to person lists
Jérémy Fabre [Tue, 18 Oct 2016 08:29:39 +0000 (10:29 +0200)]
Update bower.json to fix bower warnings
Jérémy Fabre [Mon, 17 Oct 2016 15:26:44 +0000 (17:26 +0200)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev
Jérémy Fabre [Mon, 17 Oct 2016 15:26:28 +0000 (17:26 +0200)]
Move the room program download link to the sidebar
Guillaume Pellerin [Mon, 17 Oct 2016 15:20:20 +0000 (17:20 +0200)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev
Guillaume Pellerin [Mon, 17 Oct 2016 15:19:44 +0000 (17:19 +0200)]
Use DisplayableManager for pages (fix internal link bug on .published() method)
Jérémy Fabre [Mon, 17 Oct 2016 15:15:10 +0000 (17:15 +0200)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev
Jérémy Fabre [Mon, 17 Oct 2016 15:15:07 +0000 (17:15 +0200)]
Add tournees banner and menu link
Guillaume Pellerin [Mon, 17 Oct 2016 14:41:19 +0000 (16:41 +0200)]
Bugfix media url
Jérémy Fabre [Mon, 17 Oct 2016 13:34:39 +0000 (15:34 +0200)]
Lazyload fix
Jérémy Fabre [Mon, 17 Oct 2016 13:33:45 +0000 (15:33 +0200)]
Add lazyload on cards
Jérémy Fabre [Mon, 17 Oct 2016 12:53:01 +0000 (14:53 +0200)]
Card templates full refactoring
Guillaume Pellerin [Mon, 17 Oct 2016 09:04:31 +0000 (11:04 +0200)]
Finally use 8020 port in prod (2nd nginx will be in front)
Emilie [Fri, 14 Oct 2016 17:08:39 +0000 (19:08 +0200)]
Install : log dir creation for cron
Emilie [Fri, 14 Oct 2016 16:28:30 +0000 (18:28 +0200)]
Install : update cron command
Emilie [Fri, 14 Oct 2016 16:24:49 +0000 (18:24 +0200)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev
Emilie [Fri, 14 Oct 2016 16:23:48 +0000 (18:23 +0200)]
Merge branch 'search' into dev
Emilie [Fri, 14 Oct 2016 16:03:10 +0000 (18:03 +0200)]
Search : deleting useless migrations
Emilie [Fri, 14 Oct 2016 15:59:27 +0000 (17:59 +0200)]
Search : adapt to playlist
Guillaume Pellerin [Fri, 14 Oct 2016 15:19:03 +0000 (17:19 +0200)]
Pull local branch only
Guillaume Pellerin [Fri, 14 Oct 2016 15:14:28 +0000 (17:14 +0200)]
Regression from master branch
Guillaume Pellerin [Fri, 14 Oct 2016 14:55:26 +0000 (16:55 +0200)]
herge branch 'dev'
Guillaume Pellerin [Fri, 14 Oct 2016 14:55:11 +0000 (16:55 +0200)]
Fix links
Guillaume Pellerin [Fri, 14 Oct 2016 14:49:54 +0000 (16:49 +0200)]
Merge branch 'dev'
Guillaume Pellerin [Fri, 14 Oct 2016 14:49:23 +0000 (16:49 +0200)]
Product bugfix
Guillaume Pellerin [Fri, 14 Oct 2016 14:10:19 +0000 (16:10 +0200)]
pull master only on master branch
Guillaume Pellerin [Fri, 14 Oct 2016 14:09:16 +0000 (16:09 +0200)]
Merge branch 'dev'
Guillaume Pellerin [Fri, 14 Oct 2016 14:09:02 +0000 (16:09 +0200)]
Bugfix autocomplete
Emilie [Fri, 14 Oct 2016 13:23:42 +0000 (15:23 +0200)]
Search : deleting useless Video / Audio call
Guillaume Pellerin [Fri, 14 Oct 2016 13:14:34 +0000 (15:14 +0200)]
Merge branch 'dev'
Guillaume Pellerin [Fri, 14 Oct 2016 13:13:13 +0000 (15:13 +0200)]
Merge branch 'master' of git+ssh://git.forge.ircam.fr/ircam-www
Guillaume Pellerin [Fri, 14 Oct 2016 13:13:03 +0000 (15:13 +0200)]
Merge branch 'dev'
Jérémy Fabre [Fri, 14 Oct 2016 13:04:01 +0000 (15:04 +0200)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev
Jérémy Fabre [Fri, 14 Oct 2016 13:03:58 +0000 (15:03 +0200)]
Sticky menu
Emilie [Fri, 14 Oct 2016 12:56:36 +0000 (14:56 +0200)]
Search : merging
cri [Fri, 14 Oct 2016 12:33:32 +0000 (14:33 +0200)]
Merge branch 'master' of ssh://git.forge.ircam.fr/ircam-www
Guillaume Pellerin [Fri, 14 Oct 2016 12:32:25 +0000 (14:32 +0200)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev
Guillaume Pellerin [Fri, 14 Oct 2016 12:32:10 +0000 (14:32 +0200)]
Cleanup person_detail
Jérémy Fabre [Fri, 14 Oct 2016 12:02:00 +0000 (14:02 +0200)]
Fix links in bullet lists
Jérémy Fabre [Fri, 14 Oct 2016 11:56:57 +0000 (13:56 +0200)]
Fix bold font in tables
Jérémy Fabre [Fri, 14 Oct 2016 11:46:13 +0000 (13:46 +0200)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev
Jérémy Fabre [Fri, 14 Oct 2016 11:46:05 +0000 (13:46 +0200)]
Filters style
Guillaume Pellerin [Fri, 14 Oct 2016 11:05:34 +0000 (13:05 +0200)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev
Guillaume Pellerin [Fri, 14 Oct 2016 11:04:55 +0000 (13:04 +0200)]
cleanup
Emilie [Fri, 14 Oct 2016 10:52:52 +0000 (12:52 +0200)]
Search: cleaning
Jérémy Fabre [Fri, 14 Oct 2016 10:36:39 +0000 (12:36 +0200)]
Scrollspy implementation
Jérémy Fabre [Fri, 14 Oct 2016 10:36:30 +0000 (12:36 +0200)]
New events filters (sidebar)
Guillaume Pellerin [Fri, 14 Oct 2016 10:17:15 +0000 (12:17 +0200)]
Fix playlist management, simplify and validate all playlist inclusions in various pages
Emilie [Fri, 14 Oct 2016 10:08:28 +0000 (12:08 +0200)]
Search : gather selected Pages in search result
Jérémy Fabre [Fri, 14 Oct 2016 09:29:47 +0000 (11:29 +0200)]
Network page with infowindows
Guillaume Pellerin [Thu, 13 Oct 2016 20:52:27 +0000 (22:52 +0200)]
Fix playlist templates architecture
Guillaume Pellerin [Thu, 13 Oct 2016 16:34:42 +0000 (18:34 +0200)]
Update media templates
Guillaume Pellerin [Thu, 13 Oct 2016 16:16:22 +0000 (18:16 +0200)]
Merge branch 'playlist' of git+ssh://git.forge.ircam.fr/ircam-www into playlist
Emilie [Thu, 13 Oct 2016 16:16:11 +0000 (18:16 +0200)]
Playlist : add autocomplete on media
Guillaume Pellerin [Thu, 13 Oct 2016 16:16:06 +0000 (18:16 +0200)]
Prepare playlist templates
Guillaume Pellerin [Thu, 13 Oct 2016 15:02:08 +0000 (17:02 +0200)]
Minor fixes
Guillaume Pellerin [Thu, 13 Oct 2016 14:58:11 +0000 (16:58 +0200)]
Unify Audio and Video into Media, then generic Playlist everywhere
Emilie [Thu, 13 Oct 2016 10:19:09 +0000 (12:19 +0200)]
Search : creating page, video, audio, event subtemplate
Emilie [Thu, 13 Oct 2016 09:36:02 +0000 (11:36 +0200)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into search
Emilie [Thu, 13 Oct 2016 09:35:56 +0000 (11:35 +0200)]
mergin
Guillaume Pellerin [Thu, 13 Oct 2016 09:31:42 +0000 (11:31 +0200)]
Fix br
Guillaume Pellerin [Thu, 13 Oct 2016 09:29:51 +0000 (11:29 +0200)]
Add event list date line
Emilie [Thu, 13 Oct 2016 08:17:19 +0000 (10:17 +0200)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into search
Emilie [Wed, 12 Oct 2016 15:11:56 +0000 (17:11 +0200)]
Network : add css class on organization type
Emilie [Wed, 12 Oct 2016 14:58:59 +0000 (16:58 +0200)]
Network : list organizations type + per orga
Emilie [Wed, 12 Oct 2016 14:25:33 +0000 (16:25 +0200)]
Search : get name class
Emilie [Wed, 12 Oct 2016 07:54:10 +0000 (09:54 +0200)]
Search: only page
Guillaume Pellerin [Tue, 11 Oct 2016 21:43:46 +0000 (23:43 +0200)]
Add title_en
Guillaume Pellerin [Tue, 11 Oct 2016 21:10:55 +0000 (23:10 +0200)]
Fix event import against period model
Guillaume Pellerin [Tue, 11 Oct 2016 15:43:19 +0000 (17:43 +0200)]
Merge branch 'dev' into prestashop
projects / mezzo.git / log