]>
git.parisson.com Git - mezzo.git/log
Guillaume Pellerin [Tue, 6 Mar 2018 16:24:26 +0000 (17:24 +0100)]
ignore dirty
Guillaume Pellerin [Tue, 6 Mar 2018 16:23:32 +0000 (17:23 +0100)]
Update submodules
Guillaume Pellerin [Mon, 26 Feb 2018 10:59:56 +0000 (11:59 +0100)]
Merge branch 'master' of github.com:Ircam-Web/Mezzo
Guillaume Pellerin [Mon, 26 Feb 2018 10:58:56 +0000 (11:58 +0100)]
Update submodules
Emilie [Fri, 26 Jan 2018 15:34:48 +0000 (16:34 +0100)]
Merge dev
Emilie [Fri, 26 Jan 2018 15:33:43 +0000 (16:33 +0100)]
[docker] : create stagging up mode
Guillaume Pellerin [Fri, 26 Jan 2018 14:07:46 +0000 (15:07 +0100)]
Update submodules
Guillaume Pellerin [Wed, 17 Jan 2018 10:18:07 +0000 (11:18 +0100)]
cleanup
Guillaume Pellerin [Wed, 17 Jan 2018 10:18:07 +0000 (11:18 +0100)]
cleanup
Guillaume Pellerin [Wed, 17 Jan 2018 10:02:33 +0000 (11:02 +0100)]
Merge branch 'dev'
Guillaume Pellerin [Wed, 17 Jan 2018 09:37:05 +0000 (10:37 +0100)]
update submodules
Guillaume Pellerin [Wed, 17 Jan 2018 09:36:08 +0000 (10:36 +0100)]
Remove var data module
Guillaume Pellerin [Fri, 22 Dec 2017 11:39:11 +0000 (12:39 +0100)]
Merge branch 'master' of https://github.com/Ircam-Web/Mezzo
Guillaume Pellerin [Fri, 22 Dec 2017 11:38:31 +0000 (12:38 +0100)]
Update submodules with https
Guillaume Pellerin [Fri, 22 Dec 2017 11:35:13 +0000 (12:35 +0100)]
Merge branch 'dev'
Guillaume Pellerin [Fri, 22 Dec 2017 11:34:27 +0000 (12:34 +0100)]
[Installer] update, fix cron app path
Emilie [Fri, 22 Dec 2017 11:13:56 +0000 (12:13 +0100)]
[settings] : resolving conflicts
Emilie [Fri, 22 Dec 2017 10:47:23 +0000 (11:47 +0100)]
[settings] : fix
Emilie [Fri, 22 Dec 2017 10:47:48 +0000 (11:47 +0100)]
Merge branch 'dev'
Emilie [Fri, 22 Dec 2017 10:47:23 +0000 (11:47 +0100)]
[settings] : fix
Emilie [Thu, 21 Dec 2017 11:58:32 +0000 (12:58 +0100)]
Merge branch 'master' of https://github.com/Ircam-Web/Mezzo
Guillaume Pellerin [Thu, 21 Dec 2017 11:24:01 +0000 (12:24 +0100)]
update submodules
Guillaume Pellerin [Thu, 21 Dec 2017 11:23:13 +0000 (12:23 +0100)]
update submodules
Guillaume Pellerin [Tue, 19 Dec 2017 18:01:40 +0000 (19:01 +0100)]
Merge branch 'dev'
Guillaume Pellerin [Tue, 19 Dec 2017 18:01:14 +0000 (19:01 +0100)]
update submodules
Guillaume Pellerin [Mon, 18 Dec 2017 10:19:33 +0000 (11:19 +0100)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www-mezzo into dev
Guillaume Pellerin [Mon, 18 Dec 2017 10:19:29 +0000 (11:19 +0100)]
Merge branch 'dev' of https://github.com/Ircam-Web/Mezzo into dev
Guillaume Pellerin [Mon, 18 Dec 2017 10:08:40 +0000 (11:08 +0100)]
update submodules branches
Guillaume Pellerin [Mon, 18 Dec 2017 10:07:50 +0000 (11:07 +0100)]
Merge branch 'dev' of github.com:Ircam-Web/Mezzo into dev
Guillaume Pellerin [Mon, 18 Dec 2017 10:07:15 +0000 (11:07 +0100)]
Use ircamweb/mezzo image by default, use localhost as default SMTP server, update submodules
Emilie [Fri, 15 Dec 2017 16:29:40 +0000 (17:29 +0100)]
[settings] : deactivate sorl
Guillaume Pellerin [Fri, 15 Dec 2017 15:48:44 +0000 (16:48 +0100)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www-mezzo into dev
Emilie [Fri, 15 Dec 2017 11:08:30 +0000 (12:08 +0100)]
[locale] : fixed
Guillaume Pellerin [Fri, 15 Dec 2017 11:07:43 +0000 (12:07 +0100)]
Merge branch 'master' of github.com:Ircam-Web/Mezzo
Emilie [Fri, 15 Dec 2017 09:35:29 +0000 (10:35 +0100)]
Merge remote-tracking branch 'mezzo/dev' into dev
Emilie [Fri, 15 Dec 2017 09:34:06 +0000 (10:34 +0100)]
Merge branch 'dev'
Emilie [Fri, 15 Dec 2017 09:33:51 +0000 (10:33 +0100)]
[Docker] : add cron folder
Guillaume Pellerin [Thu, 14 Dec 2017 15:58:39 +0000 (16:58 +0100)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www-mezzo into dev
Emilie [Thu, 14 Dec 2017 14:25:54 +0000 (15:25 +0100)]
[Merge] : mezzo/dev
Emilie [Thu, 14 Dec 2017 14:21:25 +0000 (15:21 +0100)]
[git] : update submodules
Emilie [Thu, 14 Dec 2017 14:20:37 +0000 (15:20 +0100)]
merge dev
Emilie [Thu, 14 Dec 2017 14:19:43 +0000 (15:19 +0100)]
Merge branch 'dev' of github.com:Ircam-Web/Mezzo into dev
Emilie [Thu, 14 Dec 2017 14:19:32 +0000 (15:19 +0100)]
[settings] : add static path of mezzanine organization
Emilie [Thu, 14 Dec 2017 13:34:19 +0000 (14:34 +0100)]
[git] : update submodules
Emilie [Thu, 14 Dec 2017 13:21:31 +0000 (14:21 +0100)]
[settings] : specifics to www
Emilie [Thu, 14 Dec 2017 09:25:22 +0000 (10:25 +0100)]
[settings] : languages
Guillaume Pellerin [Wed, 13 Dec 2017 22:55:17 +0000 (23:55 +0100)]
Merge branch 'dev'
Guillaume Pellerin [Wed, 13 Dec 2017 22:54:08 +0000 (23:54 +0100)]
cleanup doc
Guillaume Pellerin [Wed, 13 Dec 2017 22:54:08 +0000 (23:54 +0100)]
cleanup doc
Emilie [Wed, 13 Dec 2017 16:09:12 +0000 (17:09 +0100)]
[Pages] : add missing menu
Emilie [Wed, 13 Dec 2017 11:16:59 +0000 (12:16 +0100)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www-mezzo into dev
Guillaume Pellerin [Wed, 13 Dec 2017 10:40:30 +0000 (11:40 +0100)]
Merge branch 'dev'
Guillaume Pellerin [Wed, 13 Dec 2017 10:40:15 +0000 (11:40 +0100)]
update submodules
Guillaume Pellerin [Wed, 13 Dec 2017 10:38:31 +0000 (11:38 +0100)]
update submodules
Emilie [Wed, 13 Dec 2017 09:23:28 +0000 (10:23 +0100)]
[settings] : set smtp + site info
Emilie [Wed, 13 Dec 2017 09:23:28 +0000 (10:23 +0100)]
[settings] : set smtp + site info
Guillaume Pellerin [Tue, 12 Dec 2017 14:26:55 +0000 (15:26 +0100)]
update theme module
Guillaume Pellerin [Tue, 12 Dec 2017 14:25:20 +0000 (15:25 +0100)]
update themes module
Guillaume Pellerin [Tue, 12 Dec 2017 14:24:37 +0000 (15:24 +0100)]
Merge branch 'master' of github.com:Ircam-Web/Mezzo
Guillaume Pellerin [Tue, 12 Dec 2017 14:22:59 +0000 (15:22 +0100)]
update submodule master branches
Guillaume Pellerin [Tue, 12 Dec 2017 14:22:23 +0000 (15:22 +0100)]
Merge branch 'dev'
Guillaume Pellerin [Tue, 12 Dec 2017 14:20:06 +0000 (15:20 +0100)]
Merge branch 'dev' of github.com:Ircam-Web/Mezzo into dev
Guillaume Pellerin [Tue, 12 Dec 2017 14:19:09 +0000 (15:19 +0100)]
update submodule branches
Guillaume Pellerin [Tue, 12 Dec 2017 09:31:58 +0000 (10:31 +0100)]
update, fix submodule
Emilie [Tue, 12 Dec 2017 09:11:45 +0000 (10:11 +0100)]
[git] rm submodule cache
Emilie [Fri, 8 Dec 2017 15:40:24 +0000 (16:40 +0100)]
[submodule] : update mezzanine-organization
Emilie [Fri, 8 Dec 2017 15:40:24 +0000 (16:40 +0100)]
[submodule] : update mezzanine-organization
Emilie [Fri, 8 Dec 2017 15:38:49 +0000 (16:38 +0100)]
[submodule] : update mezzanine-organization
Emilie [Fri, 8 Dec 2017 15:38:49 +0000 (16:38 +0100)]
[submodule] : update mezzanine-organization
Emilie [Fri, 8 Dec 2017 15:38:49 +0000 (16:38 +0100)]
[submodule] : update mezzanine-organization
Emilie [Fri, 8 Dec 2017 15:31:31 +0000 (16:31 +0100)]
[submodules] : update refs
Emilie [Fri, 8 Dec 2017 15:31:31 +0000 (16:31 +0100)]
[submodules] : update refs
Emilie [Fri, 8 Dec 2017 15:18:57 +0000 (16:18 +0100)]
resolve conflicts
Emilie [Fri, 8 Dec 2017 15:18:57 +0000 (16:18 +0100)]
resolve conflicts
Emilie [Fri, 8 Dec 2017 15:17:07 +0000 (16:17 +0100)]
Merge branch 'dev'
Emilie [Fri, 8 Dec 2017 15:16:50 +0000 (16:16 +0100)]
[WWW task #570] : add Article to search results
Emilie [Fri, 8 Dec 2017 15:16:50 +0000 (16:16 +0100)]
[WWW task #570] : add Article to search results
Emilie [Fri, 8 Dec 2017 15:16:00 +0000 (16:16 +0100)]
[vscode] : ignore it (mea culpa)
Emilie [Fri, 8 Dec 2017 15:16:00 +0000 (16:16 +0100)]
[vscode] : ignore it (mea culpa)
Emilie [Fri, 8 Dec 2017 14:58:25 +0000 (15:58 +0100)]
resolve conflicts
Emilie [Fri, 8 Dec 2017 14:58:25 +0000 (15:58 +0100)]
resolve conflicts
Emilie [Fri, 8 Dec 2017 14:55:10 +0000 (15:55 +0100)]
[Settings] : fix theme
Emilie [Fri, 8 Dec 2017 14:55:10 +0000 (15:55 +0100)]
[Settings] : fix theme
Emilie [Fri, 8 Dec 2017 14:55:10 +0000 (15:55 +0100)]
[Settings] : fix theme
Emilie [Fri, 8 Dec 2017 14:00:47 +0000 (15:00 +0100)]
resolve conficts
Emilie [Fri, 8 Dec 2017 14:00:47 +0000 (15:00 +0100)]
resolve conficts
Guillaume Pellerin [Fri, 8 Dec 2017 12:28:33 +0000 (13:28 +0100)]
Merge branch 'dev'
Guillaume Pellerin [Fri, 8 Dec 2017 12:28:05 +0000 (13:28 +0100)]
Ignore .vscode, update submodules
Guillaume Pellerin [Fri, 8 Dec 2017 12:28:05 +0000 (13:28 +0100)]
Ignore .vscode, update submodules
Emilie [Fri, 8 Dec 2017 12:20:11 +0000 (13:20 +0100)]
resolve conflicts
Emilie [Fri, 8 Dec 2017 11:26:29 +0000 (12:26 +0100)]
[Settings] : fix .gitmodules and django settings
Emilie [Fri, 8 Dec 2017 11:26:29 +0000 (12:26 +0100)]
[Settings] : fix .gitmodules and django settings
Emilie [Fri, 8 Dec 2017 12:12:33 +0000 (13:12 +0100)]
Merge branch 'dev'
Emilie [Fri, 8 Dec 2017 11:26:29 +0000 (12:26 +0100)]
[Settings] : fix .gitmodules and django settings
Emilie [Fri, 8 Dec 2017 11:40:48 +0000 (12:40 +0100)]
[MERGE] : mezzo/dev into dev
Emilie [Fri, 8 Dec 2017 11:40:48 +0000 (12:40 +0100)]
[MERGE] : mezzo/dev into dev
Emilie [Fri, 8 Dec 2017 11:26:29 +0000 (12:26 +0100)]
[Settings] : fix .gitmodules and django settings
Emilie [Fri, 8 Dec 2017 11:26:29 +0000 (12:26 +0100)]
[Settings] : fix .gitmodules and django settings
Guillaume Pellerin [Thu, 7 Dec 2017 17:11:21 +0000 (18:11 +0100)]
Merge branch 'dev' of github.com:Ircam-Web/Mezzo into dev
Guillaume Pellerin [Thu, 7 Dec 2017 16:21:01 +0000 (17:21 +0100)]
update submodules
projects / mezzo.git / log