]>
git.parisson.com Git - mezzo.git/log
Raphael Voyazopoulos [Fri, 30 Mar 2018 15:21:27 +0000 (17:21 +0200)]
Modified .gitmodules
Raphael Voyazopoulos [Fri, 30 Mar 2018 15:07:35 +0000 (17:07 +0200)]
Merge branch 'master' of https://github.com/Ircam-Web/Mezzo
Raphael Voyazopoulos [Fri, 30 Mar 2018 15:07:12 +0000 (17:07 +0200)]
Using the forumnet theme.
Guillaume Pellerin [Thu, 29 Mar 2018 13:30:53 +0000 (15:30 +0200)]
Use master image
Guillaume Pellerin [Thu, 29 Mar 2018 13:14:50 +0000 (15:14 +0200)]
Merge branch 'dev'
Guillaume Pellerin [Thu, 29 Mar 2018 13:13:57 +0000 (15:13 +0200)]
Cleanup travis test
Guillaume Pellerin [Thu, 29 Mar 2018 12:04:17 +0000 (14:04 +0200)]
update modules
Guillaume Pellerin [Thu, 29 Mar 2018 11:47:11 +0000 (13:47 +0200)]
Merge branch 'dev'
Guillaume Pellerin [Thu, 29 Mar 2018 11:46:08 +0000 (13:46 +0200)]
Up before test
Guillaume Pellerin [Thu, 29 Mar 2018 11:37:56 +0000 (13:37 +0200)]
update modules
Guillaume Pellerin [Thu, 29 Mar 2018 11:32:47 +0000 (13:32 +0200)]
update modules
Guillaume Pellerin [Thu, 29 Mar 2018 11:17:49 +0000 (13:17 +0200)]
Use https repos
Guillaume Pellerin [Thu, 29 Mar 2018 11:16:42 +0000 (13:16 +0200)]
Merge branch 'dev'
Guillaume Pellerin [Wed, 28 Mar 2018 16:52:00 +0000 (18:52 +0200)]
update modules
Guillaume Pellerin [Wed, 28 Mar 2018 16:01:07 +0000 (18:01 +0200)]
Fix GH repos
Guillaume Pellerin [Wed, 28 Mar 2018 15:59:41 +0000 (17:59 +0200)]
update modules
Guillaume Pellerin [Wed, 28 Mar 2018 15:53:16 +0000 (17:53 +0200)]
update bin
Guillaume Pellerin [Wed, 28 Mar 2018 15:49:40 +0000 (17:49 +0200)]
update themes
Guillaume Pellerin [Wed, 28 Mar 2018 14:34:09 +0000 (16:34 +0200)]
update modules
Guillaume Pellerin [Wed, 28 Mar 2018 08:16:43 +0000 (10:16 +0200)]
update modules
Emilie [Tue, 27 Mar 2018 16:18:54 +0000 (18:18 +0200)]
Merge branch 'dev' of github.com:Ircam-Web/Mezzo into dev
Emilie [Tue, 27 Mar 2018 16:18:40 +0000 (18:18 +0200)]
[git] : update submodule ref
Guillaume Pellerin [Tue, 27 Mar 2018 16:17:56 +0000 (18:17 +0200)]
update modules
Guillaume Pellerin [Tue, 27 Mar 2018 16:13:48 +0000 (18:13 +0200)]
Merge branch 'dev' of github.com:Ircam-Web/Mezzo into dev
Guillaume Pellerin [Tue, 27 Mar 2018 16:13:29 +0000 (18:13 +0200)]
update modules
Emilie [Tue, 27 Mar 2018 15:43:46 +0000 (17:43 +0200)]
resolve conflicts
Emilie [Tue, 27 Mar 2018 15:42:48 +0000 (17:42 +0200)]
[mezzanine-organization] : update
Emilie [Tue, 27 Mar 2018 15:37:46 +0000 (17:37 +0200)]
[settings] : issue with mezzanine template loader
Emilie [Tue, 27 Mar 2018 15:36:10 +0000 (17:36 +0200)]
[Docker] : pin on latest-dev
Guillaume Pellerin [Tue, 27 Mar 2018 10:40:50 +0000 (12:40 +0200)]
update modules
Guillaume Pellerin [Tue, 27 Mar 2018 10:34:03 +0000 (12:34 +0200)]
Fix https URLS, update modules
Guillaume Pellerin [Tue, 27 Mar 2018 10:31:30 +0000 (12:31 +0200)]
update modules
Emilie [Fri, 23 Mar 2018 17:02:07 +0000 (18:02 +0100)]
Merge branch 'master' of https://github.com/Ircam-Web/Mezzo
Emilie [Fri, 23 Mar 2018 17:01:50 +0000 (18:01 +0100)]
update instagram
Emilie [Fri, 23 Mar 2018 16:59:27 +0000 (17:59 +0100)]
update instagram
Emilie [Thu, 22 Mar 2018 17:06:15 +0000 (18:06 +0100)]
[cartridge] : update
Emilie [Thu, 22 Mar 2018 15:58:56 +0000 (16:58 +0100)]
[settings] : organization.custom as optional
Emilie [Wed, 21 Mar 2018 11:30:45 +0000 (12:30 +0100)]
[git] : update submodules
Emilie [Tue, 20 Mar 2018 17:19:51 +0000 (18:19 +0100)]
[cron] : update script with new bin
Guillaume Pellerin [Wed, 14 Mar 2018 11:20:07 +0000 (12:20 +0100)]
Add first travis configuration
Guillaume Pellerin [Wed, 14 Mar 2018 10:42:07 +0000 (11:42 +0100)]
update modules
Guillaume Pellerin [Wed, 14 Mar 2018 10:04:14 +0000 (11:04 +0100)]
update bin
Guillaume Pellerin [Wed, 14 Mar 2018 09:25:57 +0000 (10:25 +0100)]
Update doc and README
Guillaume Pellerin [Tue, 6 Mar 2018 17:59:07 +0000 (18:59 +0100)]
update bin
Guillaume Pellerin [Tue, 6 Mar 2018 16:36:30 +0000 (17:36 +0100)]
update bin and related paths
Guillaume Pellerin [Tue, 6 Mar 2018 16:24:26 +0000 (17:24 +0100)]
ignore dirty
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 [Tue, 6 Mar 2018 16:22:08 +0000 (17:22 +0100)]
Add bin dev branch and update
Guillaume Pellerin [Tue, 6 Mar 2018 11:34:28 +0000 (12:34 +0100)]
Cleanup themes
Guillaume Pellerin [Tue, 6 Mar 2018 11:30:16 +0000 (12:30 +0100)]
Merge branch 'feature/mezzanine-4.2.3' into dev
Guillaume Pellerin [Mon, 5 Mar 2018 13:34:56 +0000 (14:34 +0100)]
Update submodules
Guillaume Pellerin [Mon, 5 Mar 2018 13:24:13 +0000 (14:24 +0100)]
Upgrade settings against mezzanine 4.2.3
Guillaume Pellerin [Mon, 26 Feb 2018 11:30:25 +0000 (12:30 +0100)]
Reorder admin object menu
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
Guillaume Pellerin [Mon, 19 Feb 2018 10:15:58 +0000 (11:15 +0100)]
Undo print
Guillaume Pellerin [Mon, 19 Feb 2018 10:14:49 +0000 (11:14 +0100)]
Merge branch 'dev' of github.com:Ircam-Web/Mezzo into dev
Guillaume Pellerin [Mon, 19 Feb 2018 10:13:03 +0000 (11:13 +0100)]
Fix debug_toolbar loading, update submodules
Guillaume Pellerin [Thu, 8 Feb 2018 17:38:14 +0000 (18:38 +0100)]
update submodules
Emilie [Tue, 30 Jan 2018 11:24:52 +0000 (12:24 +0100)]
[403] : custom template
Guillaume Pellerin [Mon, 29 Jan 2018 13:23:37 +0000 (14:23 +0100)]
update bin, staging with on g only
Guillaume Pellerin [Mon, 29 Jan 2018 13:20:46 +0000 (14:20 +0100)]
Merge branch 'dev' of github.com:Ircam-Web/Mezzo into dev
Guillaume Pellerin [Mon, 29 Jan 2018 13:20:28 +0000 (14:20 +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