]>
git.parisson.com Git - mezzo.git/log
Emilie [Fri, 21 Oct 2016 16:38:05 +0000 (18:38 +0200)]
Task #288: add 'project' filter
Emilie [Fri, 21 Oct 2016 15:39:58 +0000 (17:39 +0200)]
Task #290: Brief > add style
Emilie [Fri, 21 Oct 2016 15:25:14 +0000 (17:25 +0200)]
Task #294 : hide menu 'Vous êtes'
Emilie [Fri, 21 Oct 2016 15:19:35 +0000 (17:19 +0200)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev
Emilie [Fri, 21 Oct 2016 15:19:25 +0000 (17:19 +0200)]
Task #273: if in_menus empty then do not display page in menu
Jérémy Fabre [Fri, 21 Oct 2016 13:56:33 +0000 (15:56 +0200)]
Update event archives links
Jérémy Fabre [Fri, 21 Oct 2016 13:46:00 +0000 (15:46 +0200)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev
Jérémy Fabre [Fri, 21 Oct 2016 13:45:56 +0000 (15:45 +0200)]
Remove banner text from event list
Emilie [Fri, 21 Oct 2016 13:44:31 +0000 (15:44 +0200)]
Task #267: page order
Emilie [Fri, 21 Oct 2016 13:17:31 +0000 (15:17 +0200)]
Task #279: add target blank
Emilie [Fri, 21 Oct 2016 12:56:07 +0000 (14:56 +0200)]
git pMerge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev
Emilie [Fri, 21 Oct 2016 12:55:54 +0000 (14:55 +0200)]
Task #227: Block > add description
Guillaume Pellerin [Fri, 21 Oct 2016 12:51:38 +0000 (14:51 +0200)]
Add person links
Guillaume Pellerin [Fri, 21 Oct 2016 11:40:51 +0000 (13:40 +0200)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev
Guillaume Pellerin [Fri, 21 Oct 2016 11:40:27 +0000 (13:40 +0200)]
Add auto external article link (fix #261)
Emilie [Fri, 21 Oct 2016 11:37:50 +0000 (13:37 +0200)]
Task #248: add title on link
Guillaume Pellerin [Fri, 21 Oct 2016 11:10:38 +0000 (13:10 +0200)]
cleanup
Emilie [Fri, 21 Oct 2016 11:01:25 +0000 (13:01 +0200)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev
Emilie [Fri, 21 Oct 2016 11:01:16 +0000 (13:01 +0200)]
Task #254: add translation on images
Jérémy Fabre [Fri, 21 Oct 2016 10:41:28 +0000 (12:41 +0200)]
Sidebar new style
Emilie [Fri, 21 Oct 2016 10:39:56 +0000 (12:39 +0200)]
Search : add product + project in results
Emilie [Fri, 21 Oct 2016 10:27:16 +0000 (12:27 +0200)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev
Emilie [Fri, 21 Oct 2016 10:27:01 +0000 (12:27 +0200)]
Task #265: bug > readding custompage card on home
Jérémy Fabre [Fri, 21 Oct 2016 10:22:08 +0000 (12:22 +0200)]
Fix header nav margins/paddings
Jérémy Fabre [Fri, 21 Oct 2016 10:11:40 +0000 (12:11 +0200)]
Update sidebar animation
Jérémy Fabre [Fri, 21 Oct 2016 10:02:05 +0000 (12:02 +0200)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev
Jérémy Fabre [Fri, 21 Oct 2016 10:01:53 +0000 (12:01 +0200)]
Update README
Jérémy Fabre [Fri, 21 Oct 2016 10:01:46 +0000 (12:01 +0200)]
Update playlist filters
Emilie [Fri, 21 Oct 2016 09:58:48 +0000 (11:58 +0200)]
Task #225 : department page title
Emilie [Fri, 21 Oct 2016 09:56:26 +0000 (11:56 +0200)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev
Emilie [Fri, 21 Oct 2016 09:56:21 +0000 (11:56 +0200)]
Media: current type
Jérémy Fabre [Fri, 21 Oct 2016 09:43:05 +0000 (11:43 +0200)]
Update the date display in the event card
Jérémy Fabre [Fri, 21 Oct 2016 09:26:39 +0000 (11:26 +0200)]
Add media links to the mobile sidebar
Jérémy Fabre [Fri, 21 Oct 2016 09:26:25 +0000 (11:26 +0200)]
Fix a video.js bug
Jérémy Fabre [Fri, 21 Oct 2016 09:23:14 +0000 (11:23 +0200)]
Increase the brief boxes height
Jérémy Fabre [Fri, 21 Oct 2016 09:17:55 +0000 (11:17 +0200)]
Add placeholder to event and article cards
Jérémy Fabre [Fri, 21 Oct 2016 09:04:53 +0000 (11:04 +0200)]
Downgrade video.js to match current stable version
Jérémy Fabre [Fri, 21 Oct 2016 09:03:28 +0000 (11:03 +0200)]
Remove lowercase from header menu
Jérémy Fabre [Fri, 21 Oct 2016 09:01:57 +0000 (11:01 +0200)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev
Jérémy Fabre [Fri, 21 Oct 2016 09:01:54 +0000 (11:01 +0200)]
Re-add title to video sliders
Jérémy Fabre [Fri, 21 Oct 2016 09:01:44 +0000 (11:01 +0200)]
Remove public type from stages
Guillaume Pellerin [Fri, 21 Oct 2016 08:47:50 +0000 (10:47 +0200)]
NO submodule init
Emilie [Fri, 21 Oct 2016 08:28:17 +0000 (10:28 +0200)]
Media : correcting media list
Emilie [Fri, 21 Oct 2016 08:12:14 +0000 (10:12 +0200)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev
Emilie [Fri, 21 Oct 2016 08:12:04 +0000 (10:12 +0200)]
Event : mask 'Reserve' if archive
Jérémy Fabre [Fri, 21 Oct 2016 08:05:50 +0000 (10:05 +0200)]
Fix a bug in event date
Jérémy Fabre [Fri, 21 Oct 2016 07:59:11 +0000 (09:59 +0200)]
Update search filters
Guillaume Pellerin [Thu, 20 Oct 2016 18:59:55 +0000 (20:59 +0200)]
Status = 1 by default for new products
Guillaume Pellerin [Thu, 20 Oct 2016 18:58:19 +0000 (20:58 +0200)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev
Guillaume Pellerin [Thu, 20 Oct 2016 18:57:55 +0000 (20:57 +0200)]
Update product sync command
Emilie [Thu, 20 Oct 2016 17:31:30 +0000 (19:31 +0200)]
Search : rewrite filters
Emilie [Thu, 20 Oct 2016 15:28:33 +0000 (17:28 +0200)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev
Emilie [Thu, 20 Oct 2016 15:28:24 +0000 (17:28 +0200)]
Media: add audio / video filters
Guillaume Pellerin [Thu, 20 Oct 2016 15:27:08 +0000 (17:27 +0200)]
Finally update submodules
Guillaume Pellerin [Thu, 20 Oct 2016 15:23:58 +0000 (17:23 +0200)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev
Guillaume Pellerin [Thu, 20 Oct 2016 15:23:43 +0000 (17:23 +0200)]
Do not update submodules
Emilie [Thu, 20 Oct 2016 15:08:49 +0000 (17:08 +0200)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev
Emilie [Thu, 20 Oct 2016 15:08:39 +0000 (17:08 +0200)]
Event : add archives
Jérémy Fabre [Thu, 20 Oct 2016 15:06:21 +0000 (17:06 +0200)]
Remove debug from playlist list
Jérémy Fabre [Thu, 20 Oct 2016 14:48:23 +0000 (16:48 +0200)]
Playlist list
Jérémy Fabre [Thu, 20 Oct 2016 13:37:56 +0000 (15:37 +0200)]
Medias first implementation (shutter, list, details)
Jérémy Fabre [Thu, 20 Oct 2016 11:57:23 +0000 (13:57 +0200)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev
Jérémy Fabre [Thu, 20 Oct 2016 11:56:53 +0000 (13:56 +0200)]
Show only 8 briefs in the home shutter
Guillaume Pellerin [Thu, 20 Oct 2016 11:36:14 +0000 (13:36 +0200)]
Bugfix
Guillaume Pellerin [Thu, 20 Oct 2016 11:35:34 +0000 (13:35 +0200)]
update submodules
Guillaume Pellerin [Thu, 20 Oct 2016 11:23:17 +0000 (13:23 +0200)]
Add custom mezzanine as submodule
Guillaume Pellerin [Thu, 20 Oct 2016 11:08:52 +0000 (13:08 +0200)]
Use eve and presta in autonous compositions, add submodule init on pull
Guillaume Pellerin [Thu, 20 Oct 2016 08:53:21 +0000 (10:53 +0200)]
Add prestadhop product inline
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
projects / mezzo.git / log