]>
git.parisson.com Git - mezzo.git/log
Jérémy Fabre [Thu, 21 Jul 2016 09:22:50 +0000 (11:22 +0200)]
Basicpage submenu implementation and style
Jérémy Fabre [Thu, 21 Jul 2016 07:56:23 +0000 (09:56 +0200)]
Merge branch 'wip' into dev
Guillaume Pellerin [Wed, 20 Jul 2016 19:36:46 +0000 (21:36 +0200)]
Organization.is_on_map = True by default, add migrations
Jérémy Fabre [Wed, 20 Jul 2016 14:36:10 +0000 (16:36 +0200)]
Add blockquote style
Jérémy Fabre [Wed, 20 Jul 2016 14:34:57 +0000 (16:34 +0200)]
Fix pre header width
Jérémy Fabre [Wed, 20 Jul 2016 14:04:42 +0000 (16:04 +0200)]
Update README
Jérémy Fabre [Wed, 20 Jul 2016 14:02:50 +0000 (16:02 +0200)]
Fix the search form
Jérémy Fabre [Wed, 20 Jul 2016 13:58:48 +0000 (15:58 +0200)]
Update styles page
Jérémy Fabre [Wed, 20 Jul 2016 13:46:47 +0000 (15:46 +0200)]
Fix footer scripts
Jérémy Fabre [Wed, 20 Jul 2016 13:44:40 +0000 (15:44 +0200)]
Bower added
Jérémy Fabre [Wed, 20 Jul 2016 13:27:06 +0000 (15:27 +0200)]
Update styles page
Jérémy Fabre [Wed, 20 Jul 2016 13:09:03 +0000 (15:09 +0200)]
Add Department description in header menu
Jérémy Fabre [Wed, 20 Jul 2016 13:04:21 +0000 (15:04 +0200)]
Fix header. Responsive footer implementation
Jérémy Fabre [Wed, 20 Jul 2016 12:12:30 +0000 (14:12 +0200)]
Fix z-index on search
Jérémy Fabre [Wed, 20 Jul 2016 12:11:53 +0000 (14:11 +0200)]
Header menu with submenu
Jérémy Fabre [Wed, 20 Jul 2016 10:07:58 +0000 (12:07 +0200)]
Fix a bug on language switcher
Jérémy Fabre [Wed, 20 Jul 2016 10:05:56 +0000 (12:05 +0200)]
Cleaning the pagination template
Jérémy Fabre [Wed, 20 Jul 2016 09:49:20 +0000 (11:49 +0200)]
Search results base implementation
Jérémy Fabre [Wed, 20 Jul 2016 09:45:27 +0000 (11:45 +0200)]
Search form implementation
Jérémy Fabre [Wed, 20 Jul 2016 09:00:30 +0000 (11:00 +0200)]
Header, footer and basicpage update
Jérémy Fabre [Tue, 19 Jul 2016 13:16:26 +0000 (15:16 +0200)]
Merge branch 'dev' into wip
Jérémy Fabre [Tue, 19 Jul 2016 13:15:56 +0000 (15:15 +0200)]
Update logo, language switcher and breadcrumb
Guillaume Pellerin [Fri, 15 Jul 2016 16:17:41 +0000 (18:17 +0200)]
rm nationalities, fix str in admin person
Guillaume Pellerin [Fri, 15 Jul 2016 16:12:44 +0000 (18:12 +0200)]
bugfix (no unicode in py3)
Guillaume Pellerin [Fri, 15 Jul 2016 16:07:57 +0000 (18:07 +0200)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev
Guillaume Pellerin [Fri, 15 Jul 2016 16:07:19 +0000 (18:07 +0200)]
add nationalities and first project context
Emilie [Fri, 15 Jul 2016 15:32:26 +0000 (17:32 +0200)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev
Emilie [Fri, 15 Jul 2016 15:32:17 +0000 (17:32 +0200)]
tiny mce js
Guillaume Pellerin [Fri, 15 Jul 2016 14:00:54 +0000 (16:00 +0200)]
add various organization views and templates
Jérémy Fabre [Fri, 15 Jul 2016 13:00:39 +0000 (15:00 +0200)]
Update .gitignore
Guillaume Pellerin [Fri, 15 Jul 2016 12:50:23 +0000 (14:50 +0200)]
update locales, gulp build
Guillaume Pellerin [Fri, 15 Jul 2016 12:31:53 +0000 (14:31 +0200)]
update locales
Jérémy Fabre [Fri, 15 Jul 2016 12:30:03 +0000 (14:30 +0200)]
Merge branch 'dev' into wip
Guillaume Pellerin [Fri, 15 Jul 2016 10:39:24 +0000 (12:39 +0200)]
fix debug toobar loading (only in debug mode)
Jérémy Fabre [Fri, 15 Jul 2016 10:26:18 +0000 (12:26 +0200)]
Merge branch 'dev' into wip
Emilie [Fri, 15 Jul 2016 10:14:13 +0000 (12:14 +0200)]
add PATH var in cron command
Emilie [Fri, 15 Jul 2016 09:48:57 +0000 (11:48 +0200)]
update cron + push script
Guillaume Pellerin [Thu, 14 Jul 2016 17:53:08 +0000 (19:53 +0200)]
add basicpage.content translation
Guillaume Pellerin [Thu, 14 Jul 2016 17:50:17 +0000 (19:50 +0200)]
simplify person model and admin field order
Guillaume Pellerin [Thu, 14 Jul 2016 16:57:47 +0000 (18:57 +0200)]
update agenda
Guillaume Pellerin [Thu, 14 Jul 2016 16:56:11 +0000 (18:56 +0200)]
reinit migrations after branch breakout
Guillaume Pellerin [Thu, 14 Jul 2016 16:08:29 +0000 (18:08 +0200)]
add migrations, cleanup
Guillaume Pellerin [Thu, 14 Jul 2016 15:58:44 +0000 (17:58 +0200)]
fix team admin translations
Guillaume Pellerin [Thu, 14 Jul 2016 09:17:55 +0000 (11:17 +0200)]
update submodule refs
Guillaume Pellerin [Thu, 14 Jul 2016 09:13:11 +0000 (11:13 +0200)]
Merge branch 'pkg' into dev
Guillaume Pellerin [Thu, 14 Jul 2016 09:06:30 +0000 (11:06 +0200)]
change sub app labels, reinit all migrations, reorder admin menu
Jérémy Fabre [Wed, 13 Jul 2016 14:44:31 +0000 (16:44 +0200)]
Merge branch 'dev' into wip
Emilie [Wed, 13 Jul 2016 14:43:22 +0000 (16:43 +0200)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev
Guillaume Pellerin [Wed, 13 Jul 2016 13:51:47 +0000 (15:51 +0200)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev
Guillaume Pellerin [Wed, 13 Jul 2016 13:51:21 +0000 (15:51 +0200)]
add fields, translations, try to fix admin menus
Emilie [Wed, 13 Jul 2016 13:40:23 +0000 (15:40 +0200)]
deleting old data folder
Emilie [Wed, 13 Jul 2016 13:36:02 +0000 (15:36 +0200)]
commit config submodule data
root [Wed, 13 Jul 2016 10:13:02 +0000 (12:13 +0200)]
update DB and media
root [Wed, 13 Jul 2016 10:09:02 +0000 (12:09 +0200)]
update DB and media
root [Wed, 13 Jul 2016 10:06:07 +0000 (12:06 +0200)]
update DB and media
Guillaume Pellerin [Wed, 13 Jul 2016 09:07:32 +0000 (11:07 +0200)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev
Guillaume Pellerin [Wed, 13 Jul 2016 09:06:29 +0000 (11:06 +0200)]
pull
Guillaume Pellerin [Wed, 13 Jul 2016 09:04:30 +0000 (11:04 +0200)]
fix tinymce path for dev/prod
Jérémy Fabre [Tue, 12 Jul 2016 14:27:04 +0000 (16:27 +0200)]
Merge branch 'dev' into wip
Jérémy Fabre [Tue, 12 Jul 2016 14:22:21 +0000 (16:22 +0200)]
Update actions menu layout and style
Emilie [Tue, 12 Jul 2016 10:06:13 +0000 (12:06 +0200)]
Install.py : adding cron command, each min for test
root [Tue, 12 Jul 2016 09:59:01 +0000 (11:59 +0200)]
update DB and media
root [Tue, 12 Jul 2016 09:56:01 +0000 (11:56 +0200)]
update DB and media
root [Tue, 12 Jul 2016 09:54:01 +0000 (11:54 +0200)]
update DB and media
Emilie [Mon, 11 Jul 2016 17:31:20 +0000 (19:31 +0200)]
update DB and media
Guillaume Pellerin [Mon, 11 Jul 2016 17:20:14 +0000 (19:20 +0200)]
fix lang change onclick
Guillaume Pellerin [Mon, 11 Jul 2016 15:56:05 +0000 (17:56 +0200)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev
Guillaume Pellerin [Mon, 11 Jul 2016 15:55:53 +0000 (17:55 +0200)]
upgrade install script for cron backup rule
Jérémy Fabre [Mon, 11 Jul 2016 14:44:08 +0000 (16:44 +0200)]
Merge branch 'wip' into dev
Jérémy Fabre [Mon, 11 Jul 2016 14:38:52 +0000 (16:38 +0200)]
Gulpfile update and static folder cleaning
Guillaume Pellerin [Mon, 11 Jul 2016 14:35:02 +0000 (16:35 +0200)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev
Emilie [Mon, 11 Jul 2016 13:57:33 +0000 (15:57 +0200)]
Re-enable tinymce wysiwyg in admin
Emilie [Mon, 11 Jul 2016 13:40:09 +0000 (15:40 +0200)]
Adding Article and Brief to features
Emilie [Mon, 11 Jul 2016 09:44:56 +0000 (11:44 +0200)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into breve
Emilie [Fri, 8 Jul 2016 17:04:11 +0000 (19:04 +0200)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev
Emilie [Fri, 8 Jul 2016 17:03:59 +0000 (19:03 +0200)]
push.sh : changing sh to bash
Guillaume Pellerin [Fri, 8 Jul 2016 15:01:20 +0000 (17:01 +0200)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev
Conflicts:
docker-compose.yml
Guillaume Pellerin [Fri, 8 Jul 2016 14:57:33 +0000 (16:57 +0200)]
fix debug toobar static config path, change default pro port
Emilie [Fri, 8 Jul 2016 10:44:19 +0000 (12:44 +0200)]
merging
Guillaume Pellerin [Fri, 8 Jul 2016 11:10:27 +0000 (13:10 +0200)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev
Guillaume Pellerin [Fri, 8 Jul 2016 10:39:03 +0000 (12:39 +0200)]
add old mysql backup scripts
Guillaume Pellerin [Fri, 8 Jul 2016 10:38:36 +0000 (12:38 +0200)]
add migration
Guillaume Pellerin [Fri, 8 Jul 2016 10:38:28 +0000 (12:38 +0200)]
update DB and media
Emilie [Fri, 8 Jul 2016 09:57:28 +0000 (11:57 +0200)]
Task #74 #84: Article list and detail view
Guillaume Pellerin [Thu, 7 Jul 2016 17:02:57 +0000 (19:02 +0200)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev
Guillaume Pellerin [Thu, 7 Jul 2016 17:02:03 +0000 (19:02 +0200)]
merge
Guillaume Pellerin [Thu, 7 Jul 2016 17:00:27 +0000 (19:00 +0200)]
change port
Emilie [Thu, 7 Jul 2016 16:33:42 +0000 (18:33 +0200)]
merging
Emilie [Thu, 7 Jul 2016 16:32:26 +0000 (18:32 +0200)]
Article view
Guillaume Pellerin [Thu, 7 Jul 2016 16:28:39 +0000 (18:28 +0200)]
add urls to each module
Guillaume Pellerin [Thu, 7 Jul 2016 15:54:27 +0000 (17:54 +0200)]
back!
Emilie [Thu, 7 Jul 2016 15:51:09 +0000 (17:51 +0200)]
deleting autocompletion
Guillaume Pellerin [Thu, 7 Jul 2016 15:50:23 +0000 (17:50 +0200)]
upgrade restore and backup scripts against pgsql
Emilie [Thu, 7 Jul 2016 15:10:37 +0000 (17:10 +0200)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev
Emilie [Thu, 7 Jul 2016 15:10:26 +0000 (17:10 +0200)]
add grapelli dev
Emilie [Thu, 7 Jul 2016 15:00:45 +0000 (17:00 +0200)]
Brief : merging
Emilie [Thu, 7 Jul 2016 14:58:39 +0000 (16:58 +0200)]
Brief : creating content
Guillaume Pellerin [Thu, 7 Jul 2016 14:36:22 +0000 (16:36 +0200)]
cleanup
Guillaume Pellerin [Thu, 7 Jul 2016 14:31:01 +0000 (16:31 +0200)]
Merge branch 'dev' into postgres
Guillaume Pellerin [Thu, 7 Jul 2016 14:26:45 +0000 (16:26 +0200)]
mv spanning FK to core
projects / mezzo.git / log