]>
git.parisson.com Git - mezzo.git/log
Emilie Zawadzki [Tue, 13 Nov 2018 17:16:58 +0000 (18:16 +0100)]
[docker] : latest-docker for dev mode
Emilie Zawadzki [Tue, 13 Nov 2018 16:06:56 +0000 (17:06 +0100)]
[docker] : update hook post_checkout
Emilie Zawadzki [Tue, 13 Nov 2018 15:31:34 +0000 (16:31 +0100)]
[Dockerfile] : delete npm install
Emilie Zawadzki [Tue, 13 Nov 2018 15:18:47 +0000 (16:18 +0100)]
[WWW theme] : add as package
Emilie Zawadzki [Tue, 13 Nov 2018 14:30:45 +0000 (15:30 +0100)]
Merge branch 'docker' of github.com:Ircam-Web/Mezzo into docker
Guillaume Pellerin [Tue, 13 Nov 2018 14:30:09 +0000 (15:30 +0100)]
Merge branch 'dev' into docker
Emilie Zawadzki [Tue, 13 Nov 2018 14:29:51 +0000 (15:29 +0100)]
[Docker] : add hook for build on docker hub
Guillaume Pellerin [Tue, 13 Nov 2018 14:24:51 +0000 (15:24 +0100)]
Remove mezzanine-organization-themes, add default theme : ircam-www-theme
Guillaume Pellerin [Tue, 13 Nov 2018 14:20:03 +0000 (15:20 +0100)]
update modules
Emilie Zawadzki [Thu, 25 Oct 2018 15:28:12 +0000 (17:28 +0200)]
[Mezzo Task #72] : delete ruby, gem, compass. Using node-sass.
Guillaume Pellerin [Thu, 4 Oct 2018 13:12:57 +0000 (15:12 +0200)]
use ssh
Guillaume Pellerin [Thu, 4 Oct 2018 13:12:19 +0000 (15:12 +0200)]
Merge branch 'master' into dev
Guillaume Pellerin [Tue, 2 Oct 2018 15:39:40 +0000 (17:39 +0200)]
update modules
Guillaume Pellerin [Tue, 2 Oct 2018 15:38:19 +0000 (17:38 +0200)]
update modules
Guillaume Pellerin [Tue, 2 Oct 2018 15:19:17 +0000 (17:19 +0200)]
Update doc against the new 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
Guillaume Pellerin [Tue, 2 Oct 2018 15:07:39 +0000 (17:07 +0200)]
Merge branch 'dev'
Guillaume Pellerin [Tue, 2 Oct 2018 14:58:53 +0000 (16:58 +0200)]
merge and update modules
Guillaume Pellerin [Thu, 27 Sep 2018 11:06:49 +0000 (13:06 +0200)]
Add generic uwsgi logrotate config
Guillaume Pellerin [Mon, 24 Sep 2018 13:53:11 +0000 (15:53 +0200)]
Bump nodejs to 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
Guillaume Pellerin [Tue, 18 Sep 2018 13:27:28 +0000 (15:27 +0200)]
update modules
Guillaume Pellerin [Tue, 18 Sep 2018 13:17:22 +0000 (15:17 +0200)]
update modules
Guillaume Pellerin [Tue, 18 Sep 2018 13:14:20 +0000 (15:14 +0200)]
Add a little more default settings
Guillaume Pellerin [Tue, 18 Sep 2018 10:42:07 +0000 (12:42 +0200)]
Merge branch 'dev' into test
Guillaume Pellerin [Tue, 18 Sep 2018 10:40:20 +0000 (12:40 +0200)]
Update modules (add a lot of unit tests to mezzanine-organization)
Guillaume Pellerin [Wed, 5 Sep 2018 16:25:49 +0000 (18:25 +0200)]
update modules
Guillaume Pellerin [Wed, 5 Sep 2018 15:59:17 +0000 (17:59 +0200)]
update modules
Guillaume Pellerin [Mon, 3 Sep 2018 22:51:19 +0000 (00:51 +0200)]
update modules
Guillaume Pellerin [Mon, 3 Sep 2018 17:00:35 +0000 (19:00 +0200)]
upgrade grappelli
Guillaume Pellerin [Mon, 3 Sep 2018 13:36:07 +0000 (15:36 +0200)]
Upgrade django==1.11 mezzanine==4.3.1
Guillaume Pellerin [Thu, 23 Aug 2018 15:32:30 +0000 (17:32 +0200)]
update themes and bin
Emilie [Tue, 17 Jul 2018 10:52:33 +0000 (12:52 +0200)]
[settings] : leave HOST_THEMES and LOCALE_PATHS
Emilie [Tue, 17 Jul 2018 10:02:17 +0000 (12:02 +0200)]
[settings] : add THEME_APP and THEME_FOLDER
Emilie [Fri, 13 Jul 2018 13:41:35 +0000 (15:41 +0200)]
[Settings] : move all settings to mezzanine-organization
Emilie [Wed, 11 Jul 2018 09:17:25 +0000 (11:17 +0200)]
[app] : example to install a package in development mode
Guillaume Pellerin [Tue, 10 Jul 2018 14:22:49 +0000 (16:22 +0200)]
Fix tinymce_setup.js path, remove STATICFILES_DIRS, update modules
Emilie [Fri, 6 Jul 2018 12:49:25 +0000 (14:49 +0200)]
[Prestashop] router
Emilie [Fri, 6 Jul 2018 12:48:55 +0000 (14:48 +0200)]
resolving conflicts
Guillaume Pellerin [Wed, 4 Jul 2018 16:29:24 +0000 (18:29 +0200)]
update modules
Guillaume Pellerin [Wed, 4 Jul 2018 16:28:28 +0000 (18:28 +0200)]
Merge branch 'dev'
Guillaume Pellerin [Wed, 4 Jul 2018 15:44:42 +0000 (17:44 +0200)]
update modules
Guillaume Pellerin [Wed, 4 Jul 2018 15:32:21 +0000 (17:32 +0200)]
update module and nodejs
Emilie [Fri, 22 Jun 2018 09:58:27 +0000 (11:58 +0200)]
[Requirements] : unpin nodejs version, issue on build image on cloud docker
Emilie [Fri, 22 Jun 2018 09:12:32 +0000 (11:12 +0200)]
/bin/bash: q: command not found
Emilie [Fri, 22 Jun 2018 09:10:12 +0000 (11:10 +0200)]
[NodeJs] : pin to 10.4.1
Emilie [Fri, 22 Jun 2018 09:10:12 +0000 (11:10 +0200)]
[NodeJs] : pin to 10.4.1
Emilie [Fri, 22 Jun 2018 08:38:16 +0000 (10:38 +0200)]
[Mezzanine Organization Theme] : update
Emilie [Fri, 22 Jun 2018 08:17:40 +0000 (10:17 +0200)]
[mezzanine-organization-themes] : update
Emilie [Thu, 21 Jun 2018 16:10:00 +0000 (18:10 +0200)]
[mezzanine-organization-themes] : update
Emilie [Thu, 21 Jun 2018 16:09:23 +0000 (18:09 +0200)]
[mezzanine-organization-themes] : update
Emilie [Thu, 21 Jun 2018 15:28:33 +0000 (17:28 +0200)]
[mezzanine-organization] : add requirements
Guillaume Pellerin [Wed, 20 Jun 2018 14:56:01 +0000 (16:56 +0200)]
Merge branch 'dev'
Guillaume Pellerin [Wed, 20 Jun 2018 10:07:49 +0000 (12:07 +0200)]
update modules
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
Guillaume Pellerin [Fri, 13 Apr 2018 10:04:05 +0000 (12:04 +0200)]
[env] add staging in dev branch
Guillaume Pellerin [Mon, 18 Jun 2018 09:15:42 +0000 (11:15 +0200)]
Merge branch 'dev' of github.com:Ircam-Web/Mezzo into dev
Guillaume Pellerin [Mon, 18 Jun 2018 09:15:00 +0000 (11:15 +0200)]
Upgrade nodeJS to 10.x
Guillaume Pellerin [Fri, 15 Jun 2018 11:55:21 +0000 (13:55 +0200)]
Force nodeJS 10.x
Guillaume Pellerin [Thu, 14 Jun 2018 13:20:02 +0000 (15:20 +0200)]
Use Jessie
Guillaume Pellerin [Thu, 14 Jun 2018 10:55:02 +0000 (12:55 +0200)]
update modules
Guillaume Pellerin [Thu, 14 Jun 2018 08:40:48 +0000 (10:40 +0200)]
Fix apt options
Emilie [Wed, 13 Jun 2018 09:55:13 +0000 (11:55 +0200)]
[Docker] : build to v2
Guillaume Pellerin [Mon, 11 Jun 2018 16:15:17 +0000 (18:15 +0200)]
use jessie-backports packages
Emilie [Fri, 1 Jun 2018 10:19:52 +0000 (12:19 +0200)]
[Docker] v1 to v2, cherry-pick from test branch, resolving conflicts
Guillaume Pellerin [Fri, 1 Jun 2018 15:33:29 +0000 (17:33 +0200)]
Move psycopg2 to psycopg2-binary
Guillaume Pellerin [Fri, 1 Jun 2018 14:58:35 +0000 (16:58 +0200)]
Upgrade pip and setuptools
Guillaume Pellerin [Thu, 31 May 2018 16:05:27 +0000 (18:05 +0200)]
Add rdf_io and skosxl, update modules
Guillaume Pellerin [Tue, 29 May 2018 08:52:36 +0000 (10:52 +0200)]
Cleanup staging, fix import for django 1.11
Guillaume Pellerin [Thu, 24 May 2018 09:54:54 +0000 (11:54 +0200)]
update modules
Antoine Lebrun [Thu, 17 May 2018 10:02:44 +0000 (12:02 +0200)]
[WIP] add selenium yml file
Antoine Lebrun [Wed, 16 May 2018 13:03:19 +0000 (15:03 +0200)]
Merge remote-tracking branch 'origin/dev' into test
Guillaume Pellerin [Tue, 15 May 2018 20:45:01 +0000 (22:45 +0200)]
update modules
Guillaume Pellerin [Tue, 15 May 2018 14:13:29 +0000 (16:13 +0200)]
Merge branch 'dev'
Guillaume Pellerin [Tue, 15 May 2018 14:11:32 +0000 (16:11 +0200)]
update modules
Antoine Lebrun [Mon, 14 May 2018 10:35:02 +0000 (12:35 +0200)]
runtests more user-friendly
Guillaume Pellerin [Wed, 2 May 2018 15:47:28 +0000 (17:47 +0200)]
Update migration paths
Guillaume Pellerin [Wed, 2 May 2018 15:44:21 +0000 (17:44 +0200)]
Cleanup migrations, change mezzanine migrations
Emilie [Wed, 7 Mar 2018 11:34:28 +0000 (12:34 +0100)]
[Mezzanine 4.2.3] : add slug
Emilie [Thu, 19 Apr 2018 09:53:57 +0000 (11:53 +0200)]
[git] : mezzanine-organization on test branch
Emilie [Wed, 18 Apr 2018 10:57:59 +0000 (12:57 +0200)]
[Mezzanine Organization] : update
Emilie [Wed, 18 Apr 2018 08:49:58 +0000 (10:49 +0200)]
Merge branch 'master' of github.com:Ircam-Web/Mezzo
Emilie [Wed, 4 Apr 2018 14:13:24 +0000 (16:13 +0200)]
[WWW Ticket #565] : increase autocomplete results
Emilie [Thu, 5 Apr 2018 08:39:53 +0000 (10:39 +0200)]
[Ticket #612] : search person
Emilie [Wed, 18 Apr 2018 08:47:55 +0000 (10:47 +0200)]
Merge branch 'dev' of github.com:Ircam-Web/Mezzo into dev
Emilie [Thu, 5 Apr 2018 08:39:53 +0000 (10:39 +0200)]
[Ticket #612] : search person
Emilie [Wed, 4 Apr 2018 14:13:24 +0000 (16:13 +0200)]
[WWW Ticket #565] : increase autocomplete results
Guillaume Pellerin [Fri, 13 Apr 2018 10:06:44 +0000 (12:06 +0200)]
add env files
Guillaume Pellerin [Fri, 13 Apr 2018 10:04:05 +0000 (12:04 +0200)]
Update env files, add nginx autonomous env
Guillaume Pellerin [Fri, 6 Apr 2018 08:24:11 +0000 (10:24 +0200)]
Merge branch 'dev'
Guillaume Pellerin [Fri, 6 Apr 2018 08:20:56 +0000 (10:20 +0200)]
Build on travis, update modules
Raphael Voyazopoulos [Fri, 30 Mar 2018 15:26:28 +0000 (17:26 +0200)]
Reverted wrong settings.py edition
Raphael Voyazopoulos [Fri, 30 Mar 2018 15:23:47 +0000 (17:23 +0200)]
Reverted wrong .gitmodule edition
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
projects / mezzo.git / log