]>
git.parisson.com Git - mezzo.git/log
Guillaume Pellerin [Thu, 3 Nov 2016 22:10:39 +0000 (23:10 +0100)]
Merge branch 'dev' of gitlab.com:yomguy/ircam-www into dev
Guillaume Pellerin [Thu, 3 Nov 2016 22:09:33 +0000 (23:09 +0100)]
Update locales
Guillaume Pellerin [Thu, 3 Nov 2016 22:06:19 +0000 (23:06 +0100)]
Merge remote-tracking branch 'gitlab/patch-11' into dev
Guillaume Pellerin [Thu, 3 Nov 2016 22:06:13 +0000 (23:06 +0100)]
Merge remote-tracking branch 'gitlab/patch-10' into dev
Guillaume Pellerin [Thu, 3 Nov 2016 22:06:09 +0000 (23:06 +0100)]
Merge remote-tracking branch 'gitlab/patch-9' into dev
Guillaume Pellerin [Thu, 3 Nov 2016 22:04:19 +0000 (22:04 +0000)]
Merge branch 'patch-10' into 'dev'
Update django.po
See merge request !8
Guillaume Pellerin [Thu, 3 Nov 2016 17:47:38 +0000 (18:47 +0100)]
Merge branch 'feature/demos' into dev
Guillaume Pellerin [Thu, 3 Nov 2016 17:44:47 +0000 (18:44 +0100)]
Merge feature/demos
Delacour [Thu, 3 Nov 2016 17:44:31 +0000 (17:44 +0000)]
Update django.po
Guillaume Pellerin [Thu, 3 Nov 2016 17:42:45 +0000 (18:42 +0100)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev
Guillaume Pellerin [Thu, 3 Nov 2016 17:41:32 +0000 (18:41 +0100)]
Final Demo and Repository models, add reposity systems fixtures
Emilie [Thu, 3 Nov 2016 17:20:24 +0000 (18:20 +0100)]
Task #356: confirmation cart page
Emilie [Thu, 3 Nov 2016 16:13:54 +0000 (17:13 +0100)]
Task #326: deleting link location
Emilie [Thu, 3 Nov 2016 16:04:02 +0000 (17:04 +0100)]
Event : correcting date card on home
Emilie [Thu, 3 Nov 2016 15:49:09 +0000 (16:49 +0100)]
Task #340: list + detail button reserve
Emilie [Thu, 3 Nov 2016 15:02:52 +0000 (16:02 +0100)]
Task #340: training link
Guillaume Pellerin [Thu, 3 Nov 2016 14:33:17 +0000 (15:33 +0100)]
Merge branch 'dev' into feature/demos
Conflicts:
app/local_settings.py
Guillaume Pellerin [Thu, 3 Nov 2016 14:22:23 +0000 (15:22 +0100)]
Add Demo migrations
Guillaume Pellerin [Thu, 3 Nov 2016 13:20:14 +0000 (14:20 +0100)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev
Guillaume Pellerin [Thu, 3 Nov 2016 13:19:42 +0000 (14:19 +0100)]
Add login required page settings
Emilie [Thu, 3 Nov 2016 12:11:59 +0000 (13:11 +0100)]
VEL : change url and add id placeholder
Emilie [Thu, 3 Nov 2016 11:20:58 +0000 (12:20 +0100)]
Search: correcting path template
Emilie [Thu, 3 Nov 2016 11:13:40 +0000 (12:13 +0100)]
Media: move include into related_content block
Emilie [Thu, 3 Nov 2016 11:02:04 +0000 (12:02 +0100)]
Media : typo issue
Emilie [Thu, 3 Nov 2016 10:58:59 +0000 (11:58 +0100)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into media-related-object
Emilie [Thu, 3 Nov 2016 10:57:51 +0000 (11:57 +0100)]
Media: dynamic object card
Jérémy Fabre [Thu, 3 Nov 2016 09:49:19 +0000 (10:49 +0100)]
Fix the page box style on mobile devices
Jérémy Fabre [Thu, 3 Nov 2016 09:49:08 +0000 (10:49 +0100)]
Add/Remove the banner on mobile device on event list template
Jérémy Fabre [Thu, 3 Nov 2016 09:48:47 +0000 (10:48 +0100)]
Decrease the font size of the bio on mobile devices
Jérémy Fabre [Thu, 3 Nov 2016 09:48:33 +0000 (10:48 +0100)]
Increase the size of the image menu links
Jérémy Fabre [Thu, 3 Nov 2016 09:10:34 +0000 (10:10 +0100)]
Fix a HTML characters encoding bug on topic detail template
Jérémy Fabre [Thu, 3 Nov 2016 09:05:10 +0000 (10:05 +0100)]
Add a minimum height to the pages
Jérémy Fabre [Thu, 3 Nov 2016 09:01:44 +0000 (10:01 +0100)]
Add a new link style to the wysiwyg editor
Guillaume Pellerin [Wed, 2 Nov 2016 21:11:12 +0000 (22:11 +0100)]
Use context processor for variables
Emilie [Wed, 2 Nov 2016 18:09:24 +0000 (19:09 +0100)]
Media : get related FK dynamically, need to set dynamically context object name
Delacour [Wed, 2 Nov 2016 18:05:24 +0000 (18:05 +0000)]
Update django.po
Guillaume Pellerin [Wed, 2 Nov 2016 14:30:46 +0000 (15:30 +0100)]
Add project demos and related repositories
Emilie [Wed, 2 Nov 2016 11:10:29 +0000 (12:10 +0100)]
Iframe VEL : deleting scrollbar
Emilie [Wed, 2 Nov 2016 10:31:56 +0000 (11:31 +0100)]
Change eve iframe
Emilie [Fri, 28 Oct 2016 16:32:29 +0000 (18:32 +0200)]
Media : list related content
Emilie [Fri, 28 Oct 2016 14:26:11 +0000 (16:26 +0200)]
Task #328: add related titles
Emilie [Fri, 28 Oct 2016 09:10:41 +0000 (11:10 +0200)]
Task #334: Article related content
Jérémy Fabre [Thu, 27 Oct 2016 16:01:18 +0000 (18:01 +0200)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev
Jérémy Fabre [Thu, 27 Oct 2016 16:01:15 +0000 (18:01 +0200)]
Fix the pattern on cards without image
Delacour [Thu, 27 Oct 2016 15:47:08 +0000 (15:47 +0000)]
Update django.po
Emilie [Thu, 27 Oct 2016 15:01:10 +0000 (17:01 +0200)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into gitlab-dev
Emilie [Thu, 27 Oct 2016 14:57:50 +0000 (16:57 +0200)]
Delete fuzzy
Jérémy Fabre [Thu, 27 Oct 2016 13:20:14 +0000 (15:20 +0200)]
Update footer texts and font size
Jérémy Fabre [Thu, 27 Oct 2016 13:17:54 +0000 (15:17 +0200)]
Update home on mobile and tablet devices
Jérémy Fabre [Thu, 27 Oct 2016 11:56:31 +0000 (13:56 +0200)]
Update banners style and layout on homepage
Jérémy Fabre [Thu, 27 Oct 2016 11:45:51 +0000 (13:45 +0200)]
Show the bio on mobile devices
Jérémy Fabre [Thu, 27 Oct 2016 11:43:51 +0000 (13:43 +0200)]
Event location details template
Jérémy Fabre [Thu, 27 Oct 2016 11:28:44 +0000 (13:28 +0200)]
Update the bio on the homepage
Jérémy Fabre [Thu, 27 Oct 2016 11:27:40 +0000 (13:27 +0200)]
Remove the date on spontaneous candidacy
Jérémy Fabre [Thu, 27 Oct 2016 11:25:51 +0000 (13:25 +0200)]
Change event list title
Emilie [Thu, 27 Oct 2016 11:00:45 +0000 (13:00 +0200)]
Task #315: make editable more content
Emilie [Thu, 27 Oct 2016 10:21:40 +0000 (12:21 +0200)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev
Emilie [Thu, 27 Oct 2016 10:21:34 +0000 (12:21 +0200)]
Task #305: delete title link
Guillaume Pellerin [Thu, 27 Oct 2016 10:19:01 +0000 (12:19 +0200)]
Update Google analytics code
Guillaume Pellerin [Thu, 27 Oct 2016 09:46:36 +0000 (11:46 +0200)]
Add IRCAM teams (fix #303)
Guillaume Pellerin [Thu, 27 Oct 2016 09:05:45 +0000 (11:05 +0200)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev
Guillaume Pellerin [Thu, 27 Oct 2016 09:05:28 +0000 (11:05 +0200)]
update locales
Emilie [Thu, 27 Oct 2016 08:50:54 +0000 (10:50 +0200)]
Task #283: js for translastion tab wasn't loaded for Event Categories
Emilie [Wed, 26 Oct 2016 17:06:03 +0000 (19:06 +0200)]
Task #302: add card for project topic page
Emilie [Wed, 26 Oct 2016 16:28:42 +0000 (18:28 +0200)]
Task #213 : adapt map
Emilie [Wed, 26 Oct 2016 15:49:41 +0000 (17:49 +0200)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev
Emilie [Wed, 26 Oct 2016 15:49:28 +0000 (17:49 +0200)]
Templating : symplifying blocks call
Delacour [Wed, 26 Oct 2016 14:48:41 +0000 (14:48 +0000)]
Update django.po
Jérémy Fabre [Wed, 26 Oct 2016 14:37:17 +0000 (16:37 +0200)]
Fix product card template on small screens
Jérémy Fabre [Wed, 26 Oct 2016 14:22:06 +0000 (16:22 +0200)]
Truncate the event category in the event card and move the button to the bottom right
Jérémy Fabre [Wed, 26 Oct 2016 14:17:05 +0000 (16:17 +0200)]
Fix the playlists shutter
Jérémy Fabre [Wed, 26 Oct 2016 14:12:23 +0000 (16:12 +0200)]
Remove center alignment on product list
Jérémy Fabre [Wed, 26 Oct 2016 14:06:07 +0000 (16:06 +0200)]
Fix actions menu
Jérémy Fabre [Wed, 26 Oct 2016 14:02:23 +0000 (16:02 +0200)]
Update summary style
Jérémy Fabre [Wed, 26 Oct 2016 13:54:21 +0000 (15:54 +0200)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev
Jérémy Fabre [Wed, 26 Oct 2016 13:54:18 +0000 (15:54 +0200)]
Fix summary scroll spy
Emilie [Wed, 26 Oct 2016 13:22:03 +0000 (15:22 +0200)]
Task #311 #257 : add product list into Team and Department page
Emilie [Wed, 26 Oct 2016 13:07:35 +0000 (15:07 +0200)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev
Emilie [Wed, 26 Oct 2016 13:06:56 +0000 (15:06 +0200)]
Task #257: display block if content exists
Jérémy Fabre [Wed, 26 Oct 2016 12:58:03 +0000 (14:58 +0200)]
Add image to search results (events and playlists), also add booking button to events
Jérémy Fabre [Wed, 26 Oct 2016 12:33:37 +0000 (14:33 +0200)]
Update hover style on header nav sub items
Jérémy Fabre [Wed, 26 Oct 2016 12:25:14 +0000 (14:25 +0200)]
Remove "white bug" from event list
Jérémy Fabre [Wed, 26 Oct 2016 12:17:17 +0000 (14:17 +0200)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev
Jérémy Fabre [Wed, 26 Oct 2016 12:17:01 +0000 (14:17 +0200)]
Reduce the size of the category on cards
Jérémy Fabre [Wed, 26 Oct 2016 12:16:38 +0000 (14:16 +0200)]
Add a small dashed style
Jérémy Fabre [Wed, 26 Oct 2016 12:16:29 +0000 (14:16 +0200)]
Fix the lowercase/uppercase in header nav
Jérémy Fabre [Wed, 26 Oct 2016 12:16:12 +0000 (14:16 +0200)]
Add transition on article card
Jérémy Fabre [Wed, 26 Oct 2016 12:15:58 +0000 (14:15 +0200)]
Fix related content margin/padding
Guillaume Pellerin [Wed, 26 Oct 2016 11:21:21 +0000 (13:21 +0200)]
update locales again
Guillaume Pellerin [Wed, 26 Oct 2016 11:20:11 +0000 (13:20 +0200)]
update locales
Guillaume Pellerin [Wed, 26 Oct 2016 11:19:07 +0000 (13:19 +0200)]
Merge remote-tracking branch 'gitlab/patch-7' into dev
Emilie [Wed, 26 Oct 2016 09:56:13 +0000 (11:56 +0200)]
Task #308: display projects if exist
Emilie [Wed, 26 Oct 2016 09:34:04 +0000 (11:34 +0200)]
Task #257: slicing block issue
Emilie [Wed, 26 Oct 2016 09:17:46 +0000 (11:17 +0200)]
Task #294: re-hidding 'vous êtes' menu
Emilie [Wed, 26 Oct 2016 09:01:21 +0000 (11:01 +0200)]
Task #279: link target issue
Emilie [Wed, 26 Oct 2016 08:33:10 +0000 (10:33 +0200)]
Task #248: translate titles
Guillaume Pellerin [Tue, 25 Oct 2016 22:34:40 +0000 (00:34 +0200)]
Truncate department page description at 415 chars (fix #301)
Guillaume Pellerin [Tue, 25 Oct 2016 22:24:55 +0000 (00:24 +0200)]
Add second block part (fix #257)
Delacour [Tue, 25 Oct 2016 10:35:49 +0000 (10:35 +0000)]
Update django.po
Guillaume Pellerin [Mon, 24 Oct 2016 20:39:14 +0000 (22:39 +0200)]
Update locales
projects / mezzo.git / log