]> git.parisson.com Git - mezzo.git/log
mezzo.git
8 years agoMerge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev
Guillaume Pellerin [Tue, 5 Jul 2016 14:48:14 +0000 (16:48 +0200)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev

8 years agoTask #59: adding custom page with a field sub_title
Emilie [Tue, 5 Jul 2016 14:33:05 +0000 (16:33 +0200)]
Task #59: adding custom page with a field sub_title

8 years agoMerge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into basic-page
Emilie [Tue, 5 Jul 2016 13:38:18 +0000 (15:38 +0200)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into basic-page

8 years agoAdding tree menu : action / header / footer
Emilie [Tue, 5 Jul 2016 13:36:53 +0000 (15:36 +0200)]
Adding tree menu : action / header / footer

8 years agore-add index.css
Guillaume Pellerin [Mon, 4 Jul 2016 11:16:12 +0000 (13:16 +0200)]
re-add index.css

8 years agore-add index.css
Guillaume Pellerin [Mon, 4 Jul 2016 11:16:12 +0000 (13:16 +0200)]
re-add index.css

8 years agopin gulp-sass and node-sass avoiding @media bug
Guillaume Pellerin [Mon, 4 Jul 2016 11:11:28 +0000 (13:11 +0200)]
pin gulp-sass and node-sass avoiding @media bug

8 years agoMerge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev
Guillaume Pellerin [Mon, 4 Jul 2016 10:13:58 +0000 (12:13 +0200)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev

8 years agobegin organization models, fix gulp dir config, fix doc
Guillaume Pellerin [Mon, 4 Jul 2016 10:05:35 +0000 (12:05 +0200)]
begin organization models, fix gulp dir config, fix doc

8 years agoDocker : adding Vim
emilie [Thu, 30 Jun 2016 08:02:29 +0000 (10:02 +0200)]
Docker : adding Vim

8 years agokeep jquery from bower only
Guillaume Pellerin [Wed, 29 Jun 2016 15:24:38 +0000 (17:24 +0200)]
keep jquery from bower only

8 years agoMerge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev
Guillaume Pellerin [Wed, 29 Jun 2016 15:02:00 +0000 (17:02 +0200)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev

8 years agoadd bower and npm packages, add debian requirements
Guillaume Pellerin [Wed, 29 Jun 2016 15:01:20 +0000 (17:01 +0200)]
add bower and npm packages, add debian requirements

8 years agoCleaning Project: deleting js lib as we will use Bower
emilie [Wed, 29 Jun 2016 14:51:10 +0000 (16:51 +0200)]
Cleaning Project: deleting js lib as we will use Bower

8 years agoMerge branch 'cleaning-project' into dev
emilie [Wed, 29 Jun 2016 14:39:09 +0000 (16:39 +0200)]
Merge branch 'cleaning-project' into dev

8 years agoCleaning Project : deleting fonts, some img, css files
emilie [Wed, 29 Jun 2016 14:37:29 +0000 (16:37 +0200)]
Cleaning Project : deleting fonts, some img, css files

8 years agoinstall official jquery through bower
Guillaume Pellerin [Wed, 29 Jun 2016 14:00:45 +0000 (16:00 +0200)]
install official jquery through bower

8 years agoadd first bower packages
Guillaume Pellerin [Wed, 29 Jun 2016 13:57:24 +0000 (15:57 +0200)]
add first bower packages

8 years agomake /var/lib/mysql a non local volume in dev mode (for OSX)
Guillaume Pellerin [Mon, 27 Jun 2016 22:14:13 +0000 (00:14 +0200)]
make /var/lib/mysql a non local volume in dev mode (for OSX)

8 years agomv festival static dir to app
Guillaume Pellerin [Mon, 27 Jun 2016 22:06:44 +0000 (00:06 +0200)]
mv festival static dir to app

8 years agomv module institute to organization, fix some FKs
Guillaume Pellerin [Mon, 27 Jun 2016 11:57:35 +0000 (13:57 +0200)]
mv module institute to organization, fix some FKs

8 years agoadd links, start project, add magazine module
Guillaume Pellerin [Thu, 23 Jun 2016 20:58:25 +0000 (22:58 +0200)]
add links, start project, add magazine module

8 years agoadd Topic and Category
Guillaume Pellerin [Thu, 23 Jun 2016 16:48:28 +0000 (18:48 +0200)]
add Topic and Category

8 years agoadd first organization models
Guillaume Pellerin [Thu, 23 Jun 2016 16:25:24 +0000 (18:25 +0200)]
add first organization models

8 years agocleanup
Guillaume Pellerin [Wed, 22 Jun 2016 15:25:21 +0000 (17:25 +0200)]
cleanup

8 years agoupdate DB and media
Guillaume Pellerin [Wed, 22 Jun 2016 10:08:59 +0000 (12:08 +0200)]
update DB and media

8 years agomv templates, add project app, add top header placeholer
Guillaume Pellerin [Tue, 21 Jun 2016 21:32:56 +0000 (23:32 +0200)]
mv templates, add project app, add top header placeholer

8 years agoadd institute module
Guillaume Pellerin [Tue, 21 Jun 2016 08:25:09 +0000 (10:25 +0200)]
add institute module

8 years agoupgrade django, update DB name
Guillaume Pellerin [Mon, 20 Jun 2016 10:14:19 +0000 (12:14 +0200)]
upgrade django, update DB name

8 years agoimprove volumes
Guillaume Pellerin [Mon, 20 Jun 2016 09:23:47 +0000 (11:23 +0200)]
improve volumes

8 years agoupdate pass and keys
Guillaume Pellerin [Mon, 20 Jun 2016 09:21:41 +0000 (11:21 +0200)]
update pass and keys

8 years agoMerge branch 'master' of git+ssh://git.forge.ircam.fr/Manifeste
Guillaume Pellerin [Tue, 24 May 2016 16:22:48 +0000 (18:22 +0200)]
Merge branch 'master' of git+ssh://git.forge.ircam.fr/Manifeste

8 years agofix empty DB
Guillaume Pellerin [Tue, 24 May 2016 16:19:01 +0000 (18:19 +0200)]
fix empty DB

8 years agocompile locales
Guillaume Pellerin [Tue, 24 May 2016 11:15:37 +0000 (13:15 +0200)]
compile locales

8 years agoMerge branch 'master' of gitlab.com:yomguy/Manifeste
Guillaume Pellerin [Tue, 24 May 2016 11:14:41 +0000 (13:14 +0200)]
Merge branch 'master' of gitlab.com:yomguy/Manifeste

8 years agoMerge branch 'patch-2' into 'master'
Guillaume Pellerin [Tue, 24 May 2016 11:13:44 +0000 (11:13 +0000)]
Merge branch 'patch-2' into 'master'

Update django.po

See merge request !1

8 years agoUpdate django.po
Delacour [Mon, 23 May 2016 16:06:50 +0000 (16:06 +0000)]
Update django.po

8 years agoMerge branch 'master' of git+ssh://git.forge.ircam.fr/Manifeste
Guillaume Pellerin [Mon, 23 May 2016 15:54:59 +0000 (17:54 +0200)]
Merge branch 'master' of git+ssh://git.forge.ircam.fr/Manifeste

8 years agofix video and artist publishing
Guillaume Pellerin [Mon, 23 May 2016 15:54:05 +0000 (17:54 +0200)]
fix video and artist publishing

8 years agoupdate ports
Guillaume Pellerin [Fri, 20 May 2016 09:46:59 +0000 (11:46 +0200)]
update ports

8 years agofix repo URL
Guillaume Pellerin [Fri, 20 May 2016 09:44:56 +0000 (11:44 +0200)]
fix repo URL

8 years agofix env doc
Guillaume Pellerin [Fri, 20 May 2016 09:43:53 +0000 (11:43 +0200)]
fix env doc

8 years agofix doc and titles
Guillaume Pellerin [Fri, 20 May 2016 09:43:23 +0000 (11:43 +0200)]
fix doc and titles

8 years agocleanup doc
Guillaume Pellerin [Fri, 20 May 2016 09:38:55 +0000 (11:38 +0200)]
cleanup doc

8 years agofix video to artist link view
Guillaume Pellerin [Tue, 17 May 2016 14:22:23 +0000 (16:22 +0200)]
fix video to artist link view

8 years agofix multiple events
Guillaume Pellerin [Tue, 17 May 2016 14:19:28 +0000 (16:19 +0200)]
fix multiple events

8 years agofix double video
Guillaume Pellerin [Tue, 17 May 2016 13:22:30 +0000 (15:22 +0200)]
fix double video

8 years agofix for loop
Guillaume Pellerin [Tue, 17 May 2016 13:06:16 +0000 (15:06 +0200)]
fix for loop

8 years agofix admin filters
Guillaume Pellerin [Tue, 17 May 2016 13:05:09 +0000 (15:05 +0200)]
fix admin filters

8 years agoadd admin horizontal filters
Guillaume Pellerin [Tue, 17 May 2016 13:02:47 +0000 (15:02 +0200)]
add admin horizontal filters

8 years agoMerge branch 'master' of git+ssh://git.forge.ircam.fr/Manifeste
Guillaume Pellerin [Tue, 17 May 2016 13:00:54 +0000 (15:00 +0200)]
Merge branch 'master' of git+ssh://git.forge.ircam.fr/Manifeste

8 years agoadd video and audio to artists relations
Guillaume Pellerin [Tue, 17 May 2016 12:58:01 +0000 (14:58 +0200)]
add video and audio to artists relations

8 years agofix multiple same posts
Guillaume Pellerin [Wed, 11 May 2016 11:31:40 +0000 (13:31 +0200)]
fix multiple same posts

8 years agoincrease upload size limit
Guillaume Pellerin [Wed, 11 May 2016 11:12:50 +0000 (13:12 +0200)]
increase upload size limit

8 years agoMerge branch 'master' of git+ssh://git.forge.ircam.fr/Manifeste
Guillaume Pellerin [Tue, 10 May 2016 17:44:02 +0000 (19:44 +0200)]
Merge branch 'master' of git+ssh://git.forge.ircam.fr/Manifeste

8 years agofix featured playlist
Guillaume Pellerin [Tue, 10 May 2016 17:43:42 +0000 (19:43 +0200)]
fix featured playlist

8 years agoMerge branch 'dev'
Guillaume Pellerin [Tue, 10 May 2016 16:28:02 +0000 (18:28 +0200)]
Merge branch 'dev'

8 years agofix double post
Guillaume Pellerin [Tue, 10 May 2016 16:27:30 +0000 (18:27 +0200)]
fix double post

8 years agoMerge branch 'dev' of git+ssh://git.forge.ircam.fr/Manifeste into dev
Guillaume Pellerin [Tue, 10 May 2016 16:23:24 +0000 (18:23 +0200)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/Manifeste into dev

8 years agorandomize item index cards
Guillaume Pellerin [Tue, 10 May 2016 16:22:56 +0000 (18:22 +0200)]
randomize item index cards

8 years agolink blog_post to external URL if the content contains a URL only
Guillaume Pellerin [Tue, 10 May 2016 15:43:22 +0000 (17:43 +0200)]
link blog_post to external URL if the content contains a URL only

8 years agoincrease posts num
Guillaume Pellerin [Tue, 10 May 2016 15:26:14 +0000 (17:26 +0200)]
increase posts num

8 years agoadd all related contents to all contents
Guillaume Pellerin [Tue, 10 May 2016 15:21:23 +0000 (17:21 +0200)]
add all related contents to all contents

8 years agoconditional breaking news
Guillaume Pellerin [Tue, 10 May 2016 14:55:57 +0000 (16:55 +0200)]
conditional breaking news

8 years agolocale
Guillaume Pellerin [Tue, 10 May 2016 14:50:32 +0000 (16:50 +0200)]
locale

8 years agoconditional brochure
Guillaume Pellerin [Tue, 10 May 2016 14:47:52 +0000 (16:47 +0200)]
conditional brochure

8 years agoupdate locales
Guillaume Pellerin [Tue, 10 May 2016 14:45:59 +0000 (16:45 +0200)]
update locales

8 years agoadd event program (brochure)
Guillaume Pellerin [Tue, 10 May 2016 14:43:56 +0000 (16:43 +0200)]
add event program (brochure)

8 years agoMerge branch 'dev' of git+ssh://git.forge.ircam.fr/Manifeste into dev
Guillaume Pellerin [Tue, 10 May 2016 13:57:34 +0000 (15:57 +0200)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/Manifeste into dev

8 years agoadd event.brochure migration
Guillaume Pellerin [Tue, 10 May 2016 13:56:30 +0000 (15:56 +0200)]
add event.brochure migration

8 years agoadd migration for event to blog post link
Guillaume Pellerin [Tue, 10 May 2016 13:47:08 +0000 (15:47 +0200)]
add migration for event to blog post link

8 years agoincrease post per page
Guillaume Pellerin [Tue, 10 May 2016 13:38:22 +0000 (15:38 +0200)]
increase post per page

8 years agomerge multiple event dates
Guillaume Pellerin [Tue, 10 May 2016 10:52:35 +0000 (12:52 +0200)]
merge multiple event dates

8 years agoregression
Guillaume Pellerin [Mon, 9 May 2016 14:09:44 +0000 (16:09 +0200)]
regression

9 years agoadd week filters
Guillaume Pellerin [Wed, 4 May 2016 14:26:59 +0000 (16:26 +0200)]
add week filters

9 years agoMerge branch 'dev' of git+ssh://git.forge.ircam.fr/Manifeste into dev
Guillaume Pellerin [Mon, 2 May 2016 14:43:23 +0000 (16:43 +0200)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/Manifeste into dev

9 years agoadd event tags filters
Guillaume Pellerin [Mon, 2 May 2016 13:47:08 +0000 (15:47 +0200)]
add event tags filters

9 years agoadd event tags filters
Guillaume Pellerin [Mon, 2 May 2016 13:47:08 +0000 (15:47 +0200)]
add event tags filters

9 years agouse only categories in post headers
Guillaume Pellerin [Mon, 2 May 2016 12:57:00 +0000 (14:57 +0200)]
use only categories in post headers

9 years agofix parent event on slider
Guillaume Pellerin [Mon, 2 May 2016 11:22:48 +0000 (13:22 +0200)]
fix parent event on slider

9 years agoadd related post card
Guillaume Pellerin [Wed, 27 Apr 2016 05:56:18 +0000 (07:56 +0200)]
add related post card

9 years agofix video tabs
Guillaume Pellerin [Fri, 22 Apr 2016 13:52:42 +0000 (15:52 +0200)]
fix video tabs

9 years agofix locale
Guillaume Pellerin [Fri, 22 Apr 2016 10:07:41 +0000 (12:07 +0200)]
fix locale

9 years agouse featured for breaking news
Guillaume Pellerin [Fri, 22 Apr 2016 10:06:09 +0000 (12:06 +0200)]
use featured for breaking news

9 years agoMerge branch 'dev' of git+ssh://git.forge.ircam.fr/Manifeste into dev
Guillaume Pellerin [Fri, 22 Apr 2016 09:50:26 +0000 (11:50 +0200)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/Manifeste into dev

9 years agoadd related posts
Guillaume Pellerin [Fri, 22 Apr 2016 09:00:14 +0000 (11:00 +0200)]
add related posts

9 years agoadd related events for page by featured
Guillaume Pellerin [Fri, 22 Apr 2016 08:45:21 +0000 (10:45 +0200)]
add related events for page by featured

9 years agoadd HOME_FEATURED_ID
Guillaume Pellerin [Fri, 22 Apr 2016 08:25:21 +0000 (10:25 +0200)]
add HOME_FEATURED_ID

9 years agofix event desc size
Guillaume Pellerin [Thu, 21 Apr 2016 17:59:37 +0000 (19:59 +0200)]
fix event desc size

9 years agoplaylist in the sidebar
Guillaume Pellerin [Thu, 21 Apr 2016 17:26:44 +0000 (19:26 +0200)]
playlist in the sidebar

9 years agoMerge branch 'dev' of git+ssh://git.forge.ircam.fr/Manifeste into dev
Guillaume Pellerin [Thu, 21 Apr 2016 16:43:41 +0000 (18:43 +0200)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/Manifeste into dev

9 years agocleanup
Guillaume Pellerin [Thu, 21 Apr 2016 16:43:20 +0000 (18:43 +0200)]
cleanup

9 years agotest video length
Guillaume Pellerin [Thu, 21 Apr 2016 15:19:37 +0000 (17:19 +0200)]
test video length

9 years agoMerge branch 'dev' of git+ssh://git.forge.ircam.fr/Manifeste into dev
Guillaume Pellerin [Thu, 21 Apr 2016 14:44:25 +0000 (16:44 +0200)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/Manifeste into dev

9 years agobugfix
Guillaume Pellerin [Thu, 21 Apr 2016 14:43:25 +0000 (16:43 +0200)]
bugfix

9 years agofix no poster
Guillaume Pellerin [Thu, 21 Apr 2016 14:40:29 +0000 (16:40 +0200)]
fix no poster

9 years agoMerge branch 'dev' of git+ssh://git.forge.ircam.fr/Manifeste into dev
Guillaume Pellerin [Thu, 21 Apr 2016 14:20:36 +0000 (16:20 +0200)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/Manifeste into dev

9 years agouse keywords
Guillaume Pellerin [Thu, 21 Apr 2016 14:18:42 +0000 (16:18 +0200)]
use keywords

9 years agouse event tags instead of category
Guillaume Pellerin [Thu, 21 Apr 2016 10:21:22 +0000 (12:21 +0200)]
use event tags instead of category

9 years agoMerge branch 'dev' of git+ssh://git.forge.ircam.fr/Manifeste into dev
Guillaume Pellerin [Thu, 21 Apr 2016 10:21:06 +0000 (12:21 +0200)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/Manifeste into dev