]> git.parisson.com Git - mezzo.git/log
mezzo.git
6 years agoMerge pull request #5 from Ircam-Web/feature/logging
Guillaume Pellerin [Wed, 5 Dec 2018 17:32:39 +0000 (18:32 +0100)]
Merge pull request #5 from Ircam-Web/feature/logging

[settings] : add logging organization

6 years ago[settings] : add logging organization
Emilie Zawadzki [Wed, 5 Dec 2018 15:22:55 +0000 (16:22 +0100)]
[settings] : add logging organization

6 years agoChange logrotate path, update modules
Guillaume Pellerin [Wed, 5 Dec 2018 15:21:39 +0000 (16:21 +0100)]
Change logrotate path, update modules

6 years agoupdate modules
Guillaume Pellerin [Mon, 3 Dec 2018 12:50:23 +0000 (13:50 +0100)]
update modules

6 years agoupdate organization and use dev branch
Guillaume Pellerin [Wed, 21 Nov 2018 18:31:10 +0000 (19:31 +0100)]
update organization and use dev branch

6 years agoUse wait-for-it
Guillaume Pellerin [Tue, 20 Nov 2018 12:12:52 +0000 (13:12 +0100)]
Use wait-for-it

6 years ago[DB] : add new en + new import script
Emilie Zawadzki [Mon, 19 Nov 2018 15:49:19 +0000 (16:49 +0100)]
[DB] : add new en + new import script

6 years ago[bin] : update
Emilie Zawadzki [Mon, 19 Nov 2018 15:32:22 +0000 (16:32 +0100)]
[bin] : update

6 years agoupdate modules
Guillaume Pellerin [Thu, 15 Nov 2018 13:57:37 +0000 (14:57 +0100)]
update modules

6 years agoupdate modules
Guillaume Pellerin [Thu, 15 Nov 2018 08:25:38 +0000 (09:25 +0100)]
update modules

6 years agoDisable LDAP auth backend by default
Guillaume Pellerin [Wed, 14 Nov 2018 23:20:22 +0000 (00:20 +0100)]
Disable LDAP auth backend by default

6 years agouse mezzo-latest
Guillaume Pellerin [Wed, 14 Nov 2018 18:24:30 +0000 (19:24 +0100)]
use mezzo-latest

6 years agoremove themes
Guillaume Pellerin [Wed, 14 Nov 2018 17:43:20 +0000 (18:43 +0100)]
remove themes

6 years agoMerge branch 'dev'
Guillaume Pellerin [Wed, 14 Nov 2018 17:41:58 +0000 (18:41 +0100)]
Merge branch 'dev'

6 years agoupdate modules
Guillaume Pellerin [Wed, 14 Nov 2018 17:41:09 +0000 (18:41 +0100)]
update modules

6 years agoupdate default port
Guillaume Pellerin [Wed, 14 Nov 2018 17:35:38 +0000 (18:35 +0100)]
update default port

6 years agoMerge remote-tracking branch 'origin/docker' into dev
Guillaume Pellerin [Wed, 14 Nov 2018 17:34:46 +0000 (18:34 +0100)]
Merge remote-tracking branch 'origin/docker' into dev

6 years agotest without hooks
Guillaume Pellerin [Wed, 14 Nov 2018 16:53:26 +0000 (17:53 +0100)]
test without hooks

6 years agoo
Guillaume Pellerin [Wed, 14 Nov 2018 16:37:18 +0000 (17:37 +0100)]
o

6 years agoMerge branch 'docker' of github.com:Ircam-Web/Mezzo into docker
Emilie Zawadzki [Wed, 14 Nov 2018 14:05:22 +0000 (15:05 +0100)]
Merge branch 'docker' of github.com:Ircam-Web/Mezzo into docker

6 years agoupdate modules
Guillaume Pellerin [Wed, 14 Nov 2018 12:10:12 +0000 (13:10 +0100)]
update modules

6 years agoupdate modules
Guillaume Pellerin [Wed, 14 Nov 2018 09:54:27 +0000 (10:54 +0100)]
update modules

6 years agoFix indents
Guillaume Pellerin [Wed, 14 Nov 2018 09:44:40 +0000 (10:44 +0100)]
Fix indents

6 years agoGoto compose v2 everywhere
Guillaume Pellerin [Wed, 14 Nov 2018 09:38:19 +0000 (10:38 +0100)]
Goto compose v2 everywhere

6 years agoMerge branch 'docker' of github.com:Ircam-Web/Mezzo into docker
Emilie Zawadzki [Wed, 14 Nov 2018 09:18:39 +0000 (10:18 +0100)]
Merge branch 'docker' of github.com:Ircam-Web/Mezzo into docker

6 years agoFix db volumes
Guillaume Pellerin [Wed, 14 Nov 2018 09:15:04 +0000 (10:15 +0100)]
Fix db volumes

6 years agoMerge branch 'docker' of github.com:Ircam-Web/Mezzo into docker
Emilie Zawadzki [Wed, 14 Nov 2018 08:48:06 +0000 (09:48 +0100)]
Merge branch 'docker' of github.com:Ircam-Web/Mezzo into docker

6 years agoUse mezzo-docker for tests, update README
Guillaume Pellerin [Wed, 14 Nov 2018 08:44:07 +0000 (09:44 +0100)]
Use mezzo-docker for tests, update README

6 years agoupdate organization
Guillaume Pellerin [Tue, 13 Nov 2018 18:21:28 +0000 (19:21 +0100)]
update organization

6 years agoupdate theme
Guillaume Pellerin [Tue, 13 Nov 2018 18:19:42 +0000 (19:19 +0100)]
update theme

6 years agoSwitch to debian:stretch and python:3.6-stretch, add .dockerignore
Guillaume Pellerin [Tue, 13 Nov 2018 18:16:54 +0000 (19:16 +0100)]
Switch to debian:stretch and python:3.6-stretch, add .dockerignore

6 years agoupdate theme
Guillaume Pellerin [Tue, 13 Nov 2018 17:38:16 +0000 (18:38 +0100)]
update theme

6 years agoMerge branch 'docker' of github.com:Ircam-Web/Mezzo into docker
Emilie Zawadzki [Tue, 13 Nov 2018 17:37:48 +0000 (18:37 +0100)]
Merge branch 'docker' of github.com:Ircam-Web/Mezzo into docker

6 years agoMerge branch 'docker' of github.com:Ircam-Web/Mezzo into docker
Emilie Zawadzki [Tue, 13 Nov 2018 17:36:12 +0000 (18:36 +0100)]
Merge branch 'docker' of github.com:Ircam-Web/Mezzo into docker

6 years agoupdate module
Guillaume Pellerin [Tue, 13 Nov 2018 17:36:11 +0000 (18:36 +0100)]
update module

6 years agoMerge branch 'docker' of github.com:Ircam-Web/Mezzo into docker
Guillaume Pellerin [Tue, 13 Nov 2018 17:35:25 +0000 (18:35 +0100)]
Merge branch 'docker' of github.com:Ircam-Web/Mezzo into docker

6 years agoupdate module
Guillaume Pellerin [Tue, 13 Nov 2018 17:35:13 +0000 (18:35 +0100)]
update module

6 years agoupdate theme module name
Guillaume Pellerin [Tue, 13 Nov 2018 17:27:47 +0000 (18:27 +0100)]
update theme module name

6 years ago[docker] : latest-docker for dev mode
Emilie Zawadzki [Tue, 13 Nov 2018 17:16:58 +0000 (18:16 +0100)]
[docker] : latest-docker for dev  mode

6 years ago[docker] : update hook post_checkout
Emilie Zawadzki [Tue, 13 Nov 2018 16:06:56 +0000 (17:06 +0100)]
[docker] : update hook post_checkout

6 years ago[Dockerfile] : delete npm install
Emilie Zawadzki [Tue, 13 Nov 2018 15:31:34 +0000 (16:31 +0100)]
[Dockerfile] : delete npm install

6 years ago[WWW theme] : add as package
Emilie Zawadzki [Tue, 13 Nov 2018 15:18:47 +0000 (16:18 +0100)]
[WWW theme] : add as package

6 years agoMerge branch 'docker' of github.com:Ircam-Web/Mezzo into docker
Emilie Zawadzki [Tue, 13 Nov 2018 14:30:45 +0000 (15:30 +0100)]
Merge branch 'docker' of github.com:Ircam-Web/Mezzo into docker

6 years agoMerge branch 'dev' into docker
Guillaume Pellerin [Tue, 13 Nov 2018 14:30:09 +0000 (15:30 +0100)]
Merge branch 'dev' into docker

6 years ago[Docker] : add hook for build on docker hub
Emilie Zawadzki [Tue, 13 Nov 2018 14:29:51 +0000 (15:29 +0100)]
[Docker] : add hook for build on docker hub

6 years agoRemove mezzanine-organization-themes, add default theme : ircam-www-theme
Guillaume Pellerin [Tue, 13 Nov 2018 14:24:51 +0000 (15:24 +0100)]
Remove mezzanine-organization-themes, add default theme : ircam-www-theme

6 years agoupdate modules
Guillaume Pellerin [Tue, 13 Nov 2018 14:20:03 +0000 (15:20 +0100)]
update modules

6 years ago[Mezzo Task #72] : delete ruby, gem, compass. Using node-sass.
Emilie Zawadzki [Thu, 25 Oct 2018 15:28:12 +0000 (17:28 +0200)]
[Mezzo Task #72] : delete ruby, gem, compass. Using node-sass.

6 years agouse ssh
Guillaume Pellerin [Thu, 4 Oct 2018 13:12:57 +0000 (15:12 +0200)]
use ssh

6 years agoMerge branch 'master' into dev
Guillaume Pellerin [Thu, 4 Oct 2018 13:12:19 +0000 (15:12 +0200)]
Merge branch 'master' into dev

6 years agoupdate modules
Guillaume Pellerin [Tue, 2 Oct 2018 15:39:40 +0000 (17:39 +0200)]
update modules

6 years agoupdate modules
Guillaume Pellerin [Tue, 2 Oct 2018 15:38:19 +0000 (17:38 +0200)]
update modules

6 years agoUpdate doc against the new local_settings.py.sample
Guillaume Pellerin [Tue, 2 Oct 2018 15:19:17 +0000 (17:19 +0200)]
Update doc against the new local_settings.py.sample

6 years agoRename local_settings.py -> local_settings.py.sample
Guillaume Pellerin [Tue, 2 Oct 2018 15:12:40 +0000 (17:12 +0200)]
Rename local_settings.py -> local_settings.py.sample

6 years agoMerge branch 'dev'
Guillaume Pellerin [Tue, 2 Oct 2018 15:07:39 +0000 (17:07 +0200)]
Merge branch 'dev'

6 years agomerge and update modules
Guillaume Pellerin [Tue, 2 Oct 2018 14:58:53 +0000 (16:58 +0200)]
merge and update modules

6 years agoAdd generic uwsgi logrotate config
Guillaume Pellerin [Thu, 27 Sep 2018 11:06:49 +0000 (13:06 +0200)]
Add generic uwsgi logrotate config

6 years agoBump nodejs to last version
Guillaume Pellerin [Mon, 24 Sep 2018 13:53:11 +0000 (15:53 +0200)]
Bump nodejs to last version

6 years agoAdd etc/apt/preferences.d/nodejs to get last version
Guillaume Pellerin [Mon, 24 Sep 2018 13:51:38 +0000 (15:51 +0200)]
Add etc/apt/preferences.d/nodejs to get last version

6 years agoupdate modules
Guillaume Pellerin [Tue, 18 Sep 2018 13:27:28 +0000 (15:27 +0200)]
update modules

6 years agoupdate modules
Guillaume Pellerin [Tue, 18 Sep 2018 13:17:22 +0000 (15:17 +0200)]
update modules

6 years agoAdd a little more default settings
Guillaume Pellerin [Tue, 18 Sep 2018 13:14:20 +0000 (15:14 +0200)]
Add a little more default settings

6 years agoMerge branch 'dev' into test
Guillaume Pellerin [Tue, 18 Sep 2018 10:42:07 +0000 (12:42 +0200)]
Merge branch 'dev' into test

6 years agoUpdate modules (add a lot of unit tests to mezzanine-organization)
Guillaume Pellerin [Tue, 18 Sep 2018 10:40:20 +0000 (12:40 +0200)]
Update modules (add a lot of unit tests to mezzanine-organization)

6 years agoupdate modules
Guillaume Pellerin [Wed, 5 Sep 2018 16:25:49 +0000 (18:25 +0200)]
update modules

6 years agoupdate modules
Guillaume Pellerin [Wed, 5 Sep 2018 15:59:17 +0000 (17:59 +0200)]
update modules

6 years agoupdate modules
Guillaume Pellerin [Mon, 3 Sep 2018 22:51:19 +0000 (00:51 +0200)]
update modules

6 years agoupgrade grappelli
Guillaume Pellerin [Mon, 3 Sep 2018 17:00:35 +0000 (19:00 +0200)]
upgrade grappelli

6 years agoUpgrade django==1.11 mezzanine==4.3.1
Guillaume Pellerin [Mon, 3 Sep 2018 13:36:07 +0000 (15:36 +0200)]
Upgrade django==1.11 mezzanine==4.3.1

6 years agoupdate themes and bin
Guillaume Pellerin [Thu, 23 Aug 2018 15:32:30 +0000 (17:32 +0200)]
update themes and bin

6 years ago[settings] : leave HOST_THEMES and LOCALE_PATHS
Emilie [Tue, 17 Jul 2018 10:52:33 +0000 (12:52 +0200)]
[settings] : leave HOST_THEMES and LOCALE_PATHS

6 years ago[settings] : add THEME_APP and THEME_FOLDER
Emilie [Tue, 17 Jul 2018 10:02:17 +0000 (12:02 +0200)]
[settings] : add THEME_APP and THEME_FOLDER

6 years ago[Settings] : move all settings to mezzanine-organization
Emilie [Fri, 13 Jul 2018 13:41:35 +0000 (15:41 +0200)]
[Settings] : move all settings to mezzanine-organization

6 years ago[app] : example to install a package in development mode
Emilie [Wed, 11 Jul 2018 09:17:25 +0000 (11:17 +0200)]
[app] : example to install a package in development mode

6 years agoFix tinymce_setup.js path, remove STATICFILES_DIRS, update modules
Guillaume Pellerin [Tue, 10 Jul 2018 14:22:49 +0000 (16:22 +0200)]
Fix tinymce_setup.js path, remove STATICFILES_DIRS, update modules

6 years ago[Prestashop] router
Emilie [Fri, 6 Jul 2018 12:49:25 +0000 (14:49 +0200)]
[Prestashop] router

6 years agoresolving conflicts
Emilie [Fri, 6 Jul 2018 12:48:55 +0000 (14:48 +0200)]
resolving conflicts

6 years agoupdate modules
Guillaume Pellerin [Wed, 4 Jul 2018 16:29:24 +0000 (18:29 +0200)]
update modules

6 years agoMerge branch 'dev'
Guillaume Pellerin [Wed, 4 Jul 2018 16:28:28 +0000 (18:28 +0200)]
Merge branch 'dev'

6 years agoupdate modules
Guillaume Pellerin [Wed, 4 Jul 2018 15:44:42 +0000 (17:44 +0200)]
update modules

6 years agoupdate module and nodejs
Guillaume Pellerin [Wed, 4 Jul 2018 15:32:21 +0000 (17:32 +0200)]
update module and nodejs

6 years ago[Requirements] : unpin nodejs version, issue on build image on cloud docker
Emilie [Fri, 22 Jun 2018 09:58:27 +0000 (11:58 +0200)]
[Requirements] : unpin nodejs version, issue on build image on cloud docker

6 years ago/bin/bash: q: command not found
Emilie [Fri, 22 Jun 2018 09:12:32 +0000 (11:12 +0200)]
/bin/bash: q: command not found

6 years ago[NodeJs] : pin to 10.4.1
Emilie [Fri, 22 Jun 2018 09:10:12 +0000 (11:10 +0200)]
[NodeJs] : pin to 10.4.1

6 years ago[NodeJs] : pin to 10.4.1
Emilie [Fri, 22 Jun 2018 09:10:12 +0000 (11:10 +0200)]
[NodeJs] : pin to 10.4.1

6 years ago[Mezzanine Organization Theme] : update
Emilie [Fri, 22 Jun 2018 08:38:16 +0000 (10:38 +0200)]
[Mezzanine Organization Theme] : update

6 years ago[mezzanine-organization-themes] : update
Emilie [Fri, 22 Jun 2018 08:17:40 +0000 (10:17 +0200)]
[mezzanine-organization-themes] : update

6 years ago[mezzanine-organization-themes] : update
Emilie [Thu, 21 Jun 2018 16:10:00 +0000 (18:10 +0200)]
[mezzanine-organization-themes] : update

6 years ago[mezzanine-organization-themes] : update
Emilie [Thu, 21 Jun 2018 16:09:23 +0000 (18:09 +0200)]
[mezzanine-organization-themes] : update

6 years ago[mezzanine-organization] : add requirements
Emilie [Thu, 21 Jun 2018 15:28:33 +0000 (17:28 +0200)]
[mezzanine-organization] : add requirements

6 years agoMerge branch 'dev'
Guillaume Pellerin [Wed, 20 Jun 2018 14:56:01 +0000 (16:56 +0200)]
Merge branch 'dev'

6 years agoupdate modules
Guillaume Pellerin [Wed, 20 Jun 2018 10:07:49 +0000 (12:07 +0200)]
update modules

6 years ago[Docker] : delete nginx service from main docker-compose file and put it env file
Emilie [Tue, 19 Jun 2018 16:04:49 +0000 (18:04 +0200)]
[Docker] : delete nginx service from main docker-compose file and put it env file

6 years ago[env] add staging in dev branch
Guillaume Pellerin [Fri, 13 Apr 2018 10:04:05 +0000 (12:04 +0200)]
[env] add staging in dev branch

6 years agoMerge branch 'dev' of github.com:Ircam-Web/Mezzo into dev
Guillaume Pellerin [Mon, 18 Jun 2018 09:15:42 +0000 (11:15 +0200)]
Merge branch 'dev' of github.com:Ircam-Web/Mezzo into dev

6 years agoUpgrade nodeJS to 10.x
Guillaume Pellerin [Mon, 18 Jun 2018 09:15:00 +0000 (11:15 +0200)]
Upgrade nodeJS to 10.x

6 years agoForce nodeJS 10.x
Guillaume Pellerin [Fri, 15 Jun 2018 11:55:21 +0000 (13:55 +0200)]
Force nodeJS 10.x

6 years agoUse Jessie
Guillaume Pellerin [Thu, 14 Jun 2018 13:20:02 +0000 (15:20 +0200)]
Use Jessie

6 years agoupdate modules
Guillaume Pellerin [Thu, 14 Jun 2018 10:55:02 +0000 (12:55 +0200)]
update modules

6 years agoFix apt options
Guillaume Pellerin [Thu, 14 Jun 2018 08:40:48 +0000 (10:40 +0200)]
Fix apt options