]>
git.parisson.com Git - mezzo.git/log
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: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 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:00:47 +0000 (15:00 +0100)]
resolve conficts
Guillaume Pellerin [Fri, 8 Dec 2017 12:28:05 +0000 (13:28 +0100)]
Ignore .vscode, update submodules
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: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
Guillaume Pellerin [Wed, 6 Dec 2017 10:19:51 +0000 (11:19 +0100)]
Merge branch 'dev' of github.com:Ircam-Web/Mezzo into dev
Guillaume Pellerin [Wed, 6 Dec 2017 09:10:24 +0000 (10:10 +0100)]
update submodule branches
Emilie [Tue, 5 Dec 2017 17:58:46 +0000 (18:58 +0100)]
Merge branch 'dev'
Emilie [Tue, 5 Dec 2017 17:58:28 +0000 (18:58 +0100)]
[Guardian] : settings import
Emilie [Tue, 5 Dec 2017 15:28:12 +0000 (16:28 +0100)]
[LDAP] : activated
Emilie [Tue, 5 Dec 2017 15:25:31 +0000 (16:25 +0100)]
Merge branch 'dev'
Emilie [Tue, 5 Dec 2017 15:25:19 +0000 (16:25 +0100)]
[settings] : update guardian settings
Emilie [Tue, 5 Dec 2017 14:17:23 +0000 (15:17 +0100)]
[git] : update gitignore
Guillaume Pellerin [Mon, 4 Dec 2017 14:15:10 +0000 (15:15 +0100)]
Merge branch 'dev' of https://github.com/Ircam-Web/Mezzo into dev
Emilie [Fri, 1 Dec 2017 11:27:26 +0000 (12:27 +0100)]
Merge remote-tracking branch 'mezzo/dev' into dev
Emilie [Fri, 1 Dec 2017 11:23:23 +0000 (12:23 +0100)]
[git] : resolving conflicts
Emilie [Fri, 1 Dec 2017 10:03:26 +0000 (11:03 +0100)]
[LDAP] : as optionnal authentication
Guillaume Pellerin [Mon, 27 Nov 2017 13:11:54 +0000 (14:11 +0100)]
Merge branch 'master' into dev
Guillaume Pellerin [Mon, 27 Nov 2017 13:10:41 +0000 (14:10 +0100)]
fix branches
Emilie [Fri, 3 Nov 2017 12:13:09 +0000 (13:13 +0100)]
[settings] : specific PAGE_MENU_TEMPLATES
Emilie [Fri, 3 Nov 2017 10:16:13 +0000 (11:16 +0100)]
Merge remote-tracking branch 'mezzo/dev' into dev
Emilie [Fri, 3 Nov 2017 10:14:49 +0000 (11:14 +0100)]
[Locale] : add path + update mezzanine-organization
Emilie [Thu, 2 Nov 2017 16:23:27 +0000 (17:23 +0100)]
[hal] : settings
Emilie [Thu, 2 Nov 2017 14:59:34 +0000 (15:59 +0100)]
[HAL] : unmerged config
Emilie [Thu, 2 Nov 2017 12:12:25 +0000 (13:12 +0100)]
Merge Mezzo/dev
Emilie [Thu, 2 Nov 2017 11:03:56 +0000 (12:03 +0100)]
[cartridge] : update submodule
Emilie [Thu, 2 Nov 2017 11:03:44 +0000 (12:03 +0100)]
[mezzanine-organization] : update submodule
Emilie [Thu, 2 Nov 2017 11:03:11 +0000 (12:03 +0100)]
[bin] : update submodule
Emilie [Thu, 2 Nov 2017 10:56:05 +0000 (11:56 +0100)]
[git] : update submodules
Emilie [Thu, 2 Nov 2017 10:55:49 +0000 (11:55 +0100)]
[Docker] : turn DEBUG as False
Guillaume Pellerin [Wed, 1 Nov 2017 04:18:14 +0000 (05:18 +0100)]
Merge branch 'master' of https://github.com/Ircam-Web/Mezzo
Guillaume Pellerin [Wed, 1 Nov 2017 04:16:37 +0000 (05:16 +0100)]
use mezzanine mezzo branch
Emilie [Tue, 31 Oct 2017 15:02:48 +0000 (16:02 +0100)]
Use personnal repository for mezzanine and cartridge
Emilie [Tue, 31 Oct 2017 14:24:27 +0000 (15:24 +0100)]
[git] : add cartridge as submodule
Emilie [Tue, 31 Oct 2017 15:02:48 +0000 (16:02 +0100)]
Use personnal repository for mezzanine and cartridge
Emilie [Tue, 31 Oct 2017 14:24:27 +0000 (15:24 +0100)]
[git] : add cartridge as submodule
Guillaume Pellerin [Mon, 30 Oct 2017 11:04:58 +0000 (12:04 +0100)]
retrieve original vertigo params, update themes
Guillaume Pellerin [Mon, 30 Oct 2017 09:25:15 +0000 (10:25 +0100)]
cleanup
Guillaume Pellerin [Mon, 30 Oct 2017 09:07:25 +0000 (10:07 +0100)]
Merge branch 'master' of github.com:Ircam-Web/Mezzo
Guillaume Pellerin [Mon, 30 Oct 2017 09:04:47 +0000 (10:04 +0100)]
cleanup ircam data
Guillaume Pellerin [Sun, 29 Oct 2017 23:25:47 +0000 (00:25 +0100)]
cleanup locale
Guillaume Pellerin [Sun, 29 Oct 2017 23:20:22 +0000 (00:20 +0100)]
fix build_front command
Guillaume Pellerin [Sun, 29 Oct 2017 23:14:08 +0000 (00:14 +0100)]
Merge branch 'dev' of github.com:Ircam-Web/Mezzo into dev
Guillaume Pellerin [Sun, 29 Oct 2017 23:13:45 +0000 (00:13 +0100)]
add default safe nginx
Guillaume Pellerin [Sun, 29 Oct 2017 23:02:08 +0000 (00:02 +0100)]
ignore dirty for var
Guillaume Pellerin [Sun, 29 Oct 2017 22:58:49 +0000 (23:58 +0100)]
fix debug, ignore more dirty, update modules
Guillaume Pellerin [Sun, 29 Oct 2017 17:08:31 +0000 (18:08 +0100)]
uxsgi in prod
Guillaume Pellerin [Sun, 29 Oct 2017 17:00:58 +0000 (18:00 +0100)]
Merge branch 'dev' of github.com:Ircam-Web/Mezzo into dev
Guillaume Pellerin [Sun, 29 Oct 2017 17:00:11 +0000 (18:00 +0100)]
hijack-admin in debug mode only
Guillaume Pellerin [Fri, 27 Oct 2017 12:47:57 +0000 (14:47 +0200)]
Merge branch 'dev' of github.com:Ircam-Web/Mezzo into dev
Guillaume Pellerin [Fri, 27 Oct 2017 12:47:07 +0000 (14:47 +0200)]
change ports and add prod env with nginx
Guillaume Pellerin [Fri, 27 Oct 2017 12:41:48 +0000 (14:41 +0200)]
change web port
Guillaume Pellerin [Fri, 27 Oct 2017 12:37:14 +0000 (14:37 +0200)]
add ircam-www-data
Guillaume Pellerin [Fri, 27 Oct 2017 12:23:39 +0000 (14:23 +0200)]
update module
Guillaume Pellerin [Fri, 27 Oct 2017 07:14:43 +0000 (09:14 +0200)]
update submodules
Guillaume Pellerin [Thu, 26 Oct 2017 22:48:27 +0000 (00:48 +0200)]
update default theme to ircam-www-theme
Guillaume Pellerin [Thu, 26 Oct 2017 22:05:16 +0000 (00:05 +0200)]
ignore dirty themes
Guillaume Pellerin [Thu, 26 Oct 2017 21:56:26 +0000 (23:56 +0200)]
cleanup
Guillaume Pellerin [Thu, 26 Oct 2017 21:23:46 +0000 (23:23 +0200)]
update submodules
Guillaume Pellerin [Thu, 26 Oct 2017 21:14:58 +0000 (23:14 +0200)]
update modules
Guillaume Pellerin [Thu, 26 Oct 2017 21:10:35 +0000 (23:10 +0200)]
update modules
Guillaume Pellerin [Thu, 26 Oct 2017 17:09:52 +0000 (19:09 +0200)]
Update mezzanine-organization
Guillaume Pellerin [Thu, 26 Oct 2017 11:41:31 +0000 (13:41 +0200)]
Fix various settings
Guillaume Pellerin [Mon, 23 Oct 2017 09:11:42 +0000 (11:11 +0200)]
update bin
Guillaume Pellerin [Mon, 23 Oct 2017 09:10:49 +0000 (11:10 +0200)]
Merge branch 'master' of https://github.com/Ircam-Web/Mezzo
Guillaume Pellerin [Mon, 23 Oct 2017 09:10:14 +0000 (11:10 +0200)]
Fix DB mode
Emilie [Thu, 12 Oct 2017 08:15:34 +0000 (10:15 +0200)]
[git] : specify branch for bin
Guillaume Pellerin [Fri, 29 Sep 2017 08:02:15 +0000 (10:02 +0200)]
Merge pull request #3 from raphaelyancey/master
Added default admin account in the README
Raphael Voyazopoulos [Thu, 28 Sep 2017 11:04:35 +0000 (13:04 +0200)]
Added default admin account in the README
Guillaume Pellerin [Wed, 27 Sep 2017 16:08:49 +0000 (18:08 +0200)]
Finally get the bundle work!
Guillaume Pellerin [Wed, 27 Sep 2017 14:39:02 +0000 (16:39 +0200)]
update submodules again!
CRI [Wed, 27 Sep 2017 13:26:01 +0000 (15:26 +0200)]
update modules
Guillaume Pellerin [Wed, 27 Sep 2017 13:18:46 +0000 (15:18 +0200)]
update module
Guillaume Pellerin [Wed, 27 Sep 2017 13:09:34 +0000 (15:09 +0200)]
finally fix submodules
Guillaume Pellerin [Wed, 27 Sep 2017 13:04:27 +0000 (15:04 +0200)]
rm mezzanine-organization
Guillaume Pellerin [Wed, 27 Sep 2017 10:27:15 +0000 (12:27 +0200)]
Fix debian repos, finally fix submodule setup (should fix #1 and #2)
Guillaume Pellerin [Wed, 27 Sep 2017 08:37:29 +0000 (10:37 +0200)]
Reinit mezzanine-organization against the split module (organization only) (should fix #2)
Guillaume Pellerin [Tue, 26 Sep 2017 22:41:11 +0000 (00:41 +0200)]
Use split branch
Guillaume Pellerin [Tue, 26 Sep 2017 22:34:24 +0000 (00:34 +0200)]
Fix dirty submodule
Guillaume Pellerin [Tue, 26 Sep 2017 22:32:06 +0000 (00:32 +0200)]
update mezzanine
CRI [Tue, 26 Sep 2017 22:18:05 +0000 (00:18 +0200)]
Merge branch 'dev' of https://github.com/Ircam-Web/mezzo into dev
CRI [Tue, 26 Sep 2017 22:17:06 +0000 (00:17 +0200)]
update submodules
Guillaume Pellerin [Tue, 26 Sep 2017 21:50:38 +0000 (23:50 +0200)]
Update / fi submodules, change ports, add more python modules
Guillaume Pellerin [Thu, 6 Jul 2017 16:41:20 +0000 (18:41 +0200)]
iAdd grapelli as module
Guillaume Pellerin [Thu, 6 Jul 2017 16:32:21 +0000 (18:32 +0200)]
Add bin as submodule, prepare lib as global lib directory
Guillaume Pellerin [Wed, 5 Apr 2017 09:49:49 +0000 (11:49 +0200)]
Add submodules
Guillaume Pellerin [Tue, 4 Apr 2017 17:22:00 +0000 (19:22 +0200)]
Update theme config, Fix gulp installer version
Guillaume Pellerin [Tue, 4 Apr 2017 15:24:17 +0000 (17:24 +0200)]
Update name
Guillaume Pellerin [Tue, 4 Apr 2017 15:21:42 +0000 (17:21 +0200)]
Complete package refactoring to make mezzanine-organization a standalone module
Guillaume Pellerin [Tue, 28 Mar 2017 16:06:57 +0000 (18:06 +0200)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/mezzanine-organization into dev
Guillaume Pellerin [Tue, 28 Mar 2017 16:06:30 +0000 (18:06 +0200)]
Make HOST_THEMES a local setting, HomeView as DetailView, rebuild locales
Emilie [Tue, 28 Mar 2017 15:09:41 +0000 (17:09 +0200)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/mezzanine-organization into dev
projects / mezzo.git / log