]>
git.parisson.com Git - mezzo.git/log
Guillaume Pellerin [Thu, 7 Jul 2016 14:31:01 +0000 (16:31 +0200)]
Merge branch 'dev' into postgres
Guillaume Pellerin [Thu, 7 Jul 2016 14:26:45 +0000 (16:26 +0200)]
mv spanning FK to core
Guillaume Pellerin [Thu, 7 Jul 2016 14:19:43 +0000 (16:19 +0200)]
update mezzanine-agenda
Guillaume Pellerin [Thu, 7 Jul 2016 14:18:24 +0000 (16:18 +0200)]
add featured app, reorganize models and views
Emilie [Thu, 7 Jul 2016 10:52:41 +0000 (12:52 +0200)]
deleting useless code
Emilie [Thu, 7 Jul 2016 10:07:04 +0000 (12:07 +0200)]
unversionning data/mysql
Emilie [Thu, 7 Jul 2016 10:05:18 +0000 (12:05 +0200)]
adding article custome type and merge
Emilie [Thu, 7 Jul 2016 09:49:24 +0000 (11:49 +0200)]
Merge branch 'article' into dev
Conflicts:
app/custom/models.py
app/local_settings.py
app/organization/core/admin.py
app/organization/magazine/models.py
app/settings.py
Emilie [Thu, 7 Jul 2016 09:35:46 +0000 (11:35 +0200)]
Task #73: adding article content type
Guillaume Pellerin [Thu, 7 Jul 2016 09:13:45 +0000 (11:13 +0200)]
add festival initial migration
Guillaume Pellerin [Thu, 7 Jul 2016 09:07:34 +0000 (11:07 +0200)]
fix various labels, update admin menu order, add migration scripts
Guillaume Pellerin [Wed, 6 Jul 2016 16:49:30 +0000 (18:49 +0200)]
make a unique organization module and related sub modules, reinit some migrations...
Guillaume Pellerin [Wed, 6 Jul 2016 15:51:12 +0000 (17:51 +0200)]
add media model and Photos bundle
Guillaume Pellerin [Wed, 6 Jul 2016 15:24:46 +0000 (17:24 +0200)]
improve organization model
Emilie [Wed, 6 Jul 2016 14:37:06 +0000 (16:37 +0200)]
Task #83: Basic Page - add detail view
Emilie [Wed, 6 Jul 2016 13:22:13 +0000 (15:22 +0200)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev
Guillaume Pellerin [Wed, 6 Jul 2016 11:19:27 +0000 (13:19 +0200)]
goto postgres
Emilie [Wed, 6 Jul 2016 10:12:48 +0000 (12:12 +0200)]
Task #83: Basic Page : adding detail view
Guillaume Pellerin [Wed, 6 Jul 2016 09:59:31 +0000 (11:59 +0200)]
add debug-toolbar and more extensions (needs rebuild)
Guillaume Pellerin [Wed, 6 Jul 2016 09:48:08 +0000 (11:48 +0200)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev
Emilie [Wed, 6 Jul 2016 08:50:50 +0000 (10:50 +0200)]
Task #59: renaming
Emilie [Tue, 5 Jul 2016 16:28:35 +0000 (18:28 +0200)]
Task #59: Basic Page - adding image
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
Emilie [Tue, 5 Jul 2016 14:33:05 +0000 (16:33 +0200)]
Task #59: adding custom page with a field sub_title
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
Emilie [Tue, 5 Jul 2016 13:36:53 +0000 (15:36 +0200)]
Adding tree menu : action / header / footer
Guillaume Pellerin [Mon, 4 Jul 2016 11:16:12 +0000 (13:16 +0200)]
re-add index.css
Guillaume Pellerin [Mon, 4 Jul 2016 11:16:12 +0000 (13:16 +0200)]
re-add index.css
Guillaume Pellerin [Mon, 4 Jul 2016 11:11:28 +0000 (13:11 +0200)]
pin gulp-sass and node-sass avoiding @media bug
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
Guillaume Pellerin [Mon, 4 Jul 2016 10:05:35 +0000 (12:05 +0200)]
begin organization models, fix gulp dir config, fix doc
emilie [Thu, 30 Jun 2016 08:02:29 +0000 (10:02 +0200)]
Docker : adding Vim
Guillaume Pellerin [Wed, 29 Jun 2016 15:24:38 +0000 (17:24 +0200)]
keep jquery from bower only
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
Guillaume Pellerin [Wed, 29 Jun 2016 15:01:20 +0000 (17:01 +0200)]
add bower and npm packages, add debian requirements
emilie [Wed, 29 Jun 2016 14:51:10 +0000 (16:51 +0200)]
Cleaning Project: deleting js lib as we will use Bower
emilie [Wed, 29 Jun 2016 14:39:09 +0000 (16:39 +0200)]
Merge branch 'cleaning-project' into dev
emilie [Wed, 29 Jun 2016 14:37:29 +0000 (16:37 +0200)]
Cleaning Project : deleting fonts, some img, css files
Guillaume Pellerin [Wed, 29 Jun 2016 14:00:45 +0000 (16:00 +0200)]
install official jquery through bower
Guillaume Pellerin [Wed, 29 Jun 2016 13:57:24 +0000 (15:57 +0200)]
add first bower packages
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)
Guillaume Pellerin [Mon, 27 Jun 2016 22:06:44 +0000 (00:06 +0200)]
mv festival static dir to app
Guillaume Pellerin [Mon, 27 Jun 2016 11:57:35 +0000 (13:57 +0200)]
mv module institute to organization, fix some FKs
Guillaume Pellerin [Thu, 23 Jun 2016 20:58:25 +0000 (22:58 +0200)]
add links, start project, add magazine module
Guillaume Pellerin [Thu, 23 Jun 2016 16:48:28 +0000 (18:48 +0200)]
add Topic and Category
Guillaume Pellerin [Thu, 23 Jun 2016 16:25:24 +0000 (18:25 +0200)]
add first organization models
Guillaume Pellerin [Wed, 22 Jun 2016 15:25:21 +0000 (17:25 +0200)]
cleanup
Guillaume Pellerin [Wed, 22 Jun 2016 10:08:59 +0000 (12:08 +0200)]
update DB and media
Guillaume Pellerin [Tue, 21 Jun 2016 21:32:56 +0000 (23:32 +0200)]
mv templates, add project app, add top header placeholer
Guillaume Pellerin [Tue, 21 Jun 2016 08:25:09 +0000 (10:25 +0200)]
add institute module
Guillaume Pellerin [Mon, 20 Jun 2016 10:14:19 +0000 (12:14 +0200)]
upgrade django, update DB name
Guillaume Pellerin [Mon, 20 Jun 2016 09:23:47 +0000 (11:23 +0200)]
improve volumes
Guillaume Pellerin [Mon, 20 Jun 2016 09:21:41 +0000 (11:21 +0200)]
update pass and keys
Guillaume Pellerin [Tue, 24 May 2016 16:22:48 +0000 (18:22 +0200)]
Merge branch 'master' of git+ssh://git.forge.ircam.fr/Manifeste
Guillaume Pellerin [Tue, 24 May 2016 16:19:01 +0000 (18:19 +0200)]
fix empty DB
Guillaume Pellerin [Tue, 24 May 2016 11:15:37 +0000 (13:15 +0200)]
compile locales
Guillaume Pellerin [Tue, 24 May 2016 11:14:41 +0000 (13:14 +0200)]
Merge branch 'master' of gitlab.com:yomguy/Manifeste
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
Delacour [Mon, 23 May 2016 16:06:50 +0000 (16:06 +0000)]
Update django.po
Guillaume Pellerin [Mon, 23 May 2016 15:54:59 +0000 (17:54 +0200)]
Merge branch 'master' of git+ssh://git.forge.ircam.fr/Manifeste
Guillaume Pellerin [Mon, 23 May 2016 15:54:05 +0000 (17:54 +0200)]
fix video and artist publishing
Guillaume Pellerin [Fri, 20 May 2016 09:46:59 +0000 (11:46 +0200)]
update ports
Guillaume Pellerin [Fri, 20 May 2016 09:44:56 +0000 (11:44 +0200)]
fix repo URL
Guillaume Pellerin [Fri, 20 May 2016 09:43:53 +0000 (11:43 +0200)]
fix env doc
Guillaume Pellerin [Fri, 20 May 2016 09:43:23 +0000 (11:43 +0200)]
fix doc and titles
Guillaume Pellerin [Fri, 20 May 2016 09:38:55 +0000 (11:38 +0200)]
cleanup doc
Guillaume Pellerin [Tue, 17 May 2016 14:22:23 +0000 (16:22 +0200)]
fix video to artist link view
Guillaume Pellerin [Tue, 17 May 2016 14:19:28 +0000 (16:19 +0200)]
fix multiple events
Guillaume Pellerin [Tue, 17 May 2016 13:22:30 +0000 (15:22 +0200)]
fix double video
Guillaume Pellerin [Tue, 17 May 2016 13:06:16 +0000 (15:06 +0200)]
fix for loop
Guillaume Pellerin [Tue, 17 May 2016 13:05:09 +0000 (15:05 +0200)]
fix admin filters
Guillaume Pellerin [Tue, 17 May 2016 13:02:47 +0000 (15:02 +0200)]
add admin horizontal filters
Guillaume Pellerin [Tue, 17 May 2016 13:00:54 +0000 (15:00 +0200)]
Merge branch 'master' of git+ssh://git.forge.ircam.fr/Manifeste
Guillaume Pellerin [Tue, 17 May 2016 12:58:01 +0000 (14:58 +0200)]
add video and audio to artists relations
Guillaume Pellerin [Wed, 11 May 2016 11:31:40 +0000 (13:31 +0200)]
fix multiple same posts
Guillaume Pellerin [Wed, 11 May 2016 11:12:50 +0000 (13:12 +0200)]
increase upload size limit
Guillaume Pellerin [Tue, 10 May 2016 17:44:02 +0000 (19:44 +0200)]
Merge branch 'master' of git+ssh://git.forge.ircam.fr/Manifeste
Guillaume Pellerin [Tue, 10 May 2016 17:43:42 +0000 (19:43 +0200)]
fix featured playlist
Guillaume Pellerin [Tue, 10 May 2016 16:28:02 +0000 (18:28 +0200)]
Merge branch 'dev'
Guillaume Pellerin [Tue, 10 May 2016 16:27:30 +0000 (18:27 +0200)]
fix double post
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
Guillaume Pellerin [Tue, 10 May 2016 16:22:56 +0000 (18:22 +0200)]
randomize item index cards
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
Guillaume Pellerin [Tue, 10 May 2016 15:26:14 +0000 (17:26 +0200)]
increase posts num
Guillaume Pellerin [Tue, 10 May 2016 15:21:23 +0000 (17:21 +0200)]
add all related contents to all contents
Guillaume Pellerin [Tue, 10 May 2016 14:55:57 +0000 (16:55 +0200)]
conditional breaking news
Guillaume Pellerin [Tue, 10 May 2016 14:50:32 +0000 (16:50 +0200)]
locale
Guillaume Pellerin [Tue, 10 May 2016 14:47:52 +0000 (16:47 +0200)]
conditional brochure
Guillaume Pellerin [Tue, 10 May 2016 14:45:59 +0000 (16:45 +0200)]
update locales
Guillaume Pellerin [Tue, 10 May 2016 14:43:56 +0000 (16:43 +0200)]
add event program (brochure)
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
Guillaume Pellerin [Tue, 10 May 2016 13:56:30 +0000 (15:56 +0200)]
add event.brochure migration
Guillaume Pellerin [Tue, 10 May 2016 13:47:08 +0000 (15:47 +0200)]
add migration for event to blog post link
Guillaume Pellerin [Tue, 10 May 2016 13:38:22 +0000 (15:38 +0200)]
increase post per page
Guillaume Pellerin [Tue, 10 May 2016 10:52:35 +0000 (12:52 +0200)]
merge multiple event dates
Guillaume Pellerin [Mon, 9 May 2016 14:09:44 +0000 (16:09 +0200)]
regression
Guillaume Pellerin [Wed, 4 May 2016 14:26:59 +0000 (16:26 +0200)]
add week filters
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
Guillaume Pellerin [Mon, 2 May 2016 13:47:08 +0000 (15:47 +0200)]
add event tags filters
Guillaume Pellerin [Mon, 2 May 2016 13:47:08 +0000 (15:47 +0200)]
add event tags filters
projects / mezzo.git / log