]>
git.parisson.com Git - mezzo.git/log
Jérémy Fabre [Tue, 12 Jul 2016 14:27:04 +0000 (16:27 +0200)]
Merge branch 'dev' into wip
Jérémy Fabre [Tue, 12 Jul 2016 14:22:21 +0000 (16:22 +0200)]
Update actions menu layout and style
Emilie [Tue, 12 Jul 2016 10:06:13 +0000 (12:06 +0200)]
Install.py : adding cron command, each min for test
root [Tue, 12 Jul 2016 09:59:01 +0000 (11:59 +0200)]
update DB and media
root [Tue, 12 Jul 2016 09:56:01 +0000 (11:56 +0200)]
update DB and media
root [Tue, 12 Jul 2016 09:54:01 +0000 (11:54 +0200)]
update DB and media
Emilie [Mon, 11 Jul 2016 17:31:20 +0000 (19:31 +0200)]
update DB and media
Guillaume Pellerin [Mon, 11 Jul 2016 17:20:14 +0000 (19:20 +0200)]
fix lang change onclick
Guillaume Pellerin [Mon, 11 Jul 2016 15:56:05 +0000 (17:56 +0200)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev
Guillaume Pellerin [Mon, 11 Jul 2016 15:55:53 +0000 (17:55 +0200)]
upgrade install script for cron backup rule
Jérémy Fabre [Mon, 11 Jul 2016 14:44:08 +0000 (16:44 +0200)]
Merge branch 'wip' into dev
Jérémy Fabre [Mon, 11 Jul 2016 14:38:52 +0000 (16:38 +0200)]
Gulpfile update and static folder cleaning
Guillaume Pellerin [Mon, 11 Jul 2016 14:35:02 +0000 (16:35 +0200)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev
Emilie [Mon, 11 Jul 2016 13:57:33 +0000 (15:57 +0200)]
Re-enable tinymce wysiwyg in admin
Emilie [Mon, 11 Jul 2016 13:40:09 +0000 (15:40 +0200)]
Adding Article and Brief to features
Emilie [Mon, 11 Jul 2016 09:44:56 +0000 (11:44 +0200)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into breve
Emilie [Fri, 8 Jul 2016 17:04:11 +0000 (19:04 +0200)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev
Emilie [Fri, 8 Jul 2016 17:03:59 +0000 (19:03 +0200)]
push.sh : changing sh to bash
Guillaume Pellerin [Fri, 8 Jul 2016 15:01:20 +0000 (17:01 +0200)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev
Conflicts:
docker-compose.yml
Guillaume Pellerin [Fri, 8 Jul 2016 14:57:33 +0000 (16:57 +0200)]
fix debug toobar static config path, change default pro port
Emilie [Fri, 8 Jul 2016 10:44:19 +0000 (12:44 +0200)]
merging
Guillaume Pellerin [Fri, 8 Jul 2016 11:10:27 +0000 (13:10 +0200)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev
Guillaume Pellerin [Fri, 8 Jul 2016 10:39:03 +0000 (12:39 +0200)]
add old mysql backup scripts
Guillaume Pellerin [Fri, 8 Jul 2016 10:38:36 +0000 (12:38 +0200)]
add migration
Guillaume Pellerin [Fri, 8 Jul 2016 10:38:28 +0000 (12:38 +0200)]
update DB and media
Emilie [Fri, 8 Jul 2016 09:57:28 +0000 (11:57 +0200)]
Task #74 #84: Article list and detail view
Guillaume Pellerin [Thu, 7 Jul 2016 17:02:57 +0000 (19:02 +0200)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev
Guillaume Pellerin [Thu, 7 Jul 2016 17:02:03 +0000 (19:02 +0200)]
merge
Guillaume Pellerin [Thu, 7 Jul 2016 17:00:27 +0000 (19:00 +0200)]
change port
Emilie [Thu, 7 Jul 2016 16:33:42 +0000 (18:33 +0200)]
merging
Emilie [Thu, 7 Jul 2016 16:32:26 +0000 (18:32 +0200)]
Article view
Guillaume Pellerin [Thu, 7 Jul 2016 16:28:39 +0000 (18:28 +0200)]
add urls to each module
Guillaume Pellerin [Thu, 7 Jul 2016 15:54:27 +0000 (17:54 +0200)]
back!
Emilie [Thu, 7 Jul 2016 15:51:09 +0000 (17:51 +0200)]
deleting autocompletion
Guillaume Pellerin [Thu, 7 Jul 2016 15:50:23 +0000 (17:50 +0200)]
upgrade restore and backup scripts against pgsql
Emilie [Thu, 7 Jul 2016 15:10:37 +0000 (17:10 +0200)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev
Emilie [Thu, 7 Jul 2016 15:10:26 +0000 (17:10 +0200)]
add grapelli dev
Emilie [Thu, 7 Jul 2016 15:00:45 +0000 (17:00 +0200)]
Brief : merging
Emilie [Thu, 7 Jul 2016 14:58:39 +0000 (16:58 +0200)]
Brief : creating content
Guillaume Pellerin [Thu, 7 Jul 2016 14:36:22 +0000 (16:36 +0200)]
cleanup
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
projects / mezzo.git / log