]> git.parisson.com Git - mezzo.git/log
mezzo.git
8 years agoMerge branch 'dev' of git+ssh://git.forge.ircam.fr/vertigo into dev
Emilie [Wed, 22 Feb 2017 10:22:44 +0000 (11:22 +0100)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/vertigo into dev

8 years ago[Event] : move ranking into mezzanine agenda + deleting custom list view
Emilie [Wed, 22 Feb 2017 10:22:35 +0000 (11:22 +0100)]
[Event] : move ranking into mezzanine agenda + deleting custom list view

8 years agoAdd various blocks
Guillaume Pellerin [Wed, 22 Feb 2017 10:04:37 +0000 (11:04 +0100)]
Add various blocks

8 years agoFix the top margin of the main container
Jérémy Fabre [Wed, 22 Feb 2017 08:58:33 +0000 (09:58 +0100)]
Fix the top margin of the main container

8 years ago[Event] : try another url on list events
Emilie [Tue, 21 Feb 2017 19:00:05 +0000 (20:00 +0100)]
[Event] : try another url on list events

8 years agoTry to fix agenda urls
Guillaume Pellerin [Tue, 21 Feb 2017 18:50:52 +0000 (19:50 +0100)]
Try to fix agenda urls

8 years agoMerge branch 'dev' of git+ssh://git.forge.ircam.fr/vertigo into dev
Emilie [Tue, 21 Feb 2017 16:12:48 +0000 (17:12 +0100)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/vertigo into dev

8 years ago[Media] : update url
Emilie [Tue, 21 Feb 2017 16:12:39 +0000 (17:12 +0100)]
[Media] : update url

8 years ago[Event] : order by rank
Emilie [Tue, 21 Feb 2017 16:11:55 +0000 (17:11 +0100)]
[Event] : order by rank

8 years agoDispose video player when closing overlay
Jérémy Fabre [Tue, 21 Feb 2017 15:35:56 +0000 (16:35 +0100)]
Dispose video player when closing overlay

8 years agoDetach sidebar at 1171
Jérémy Fabre [Tue, 21 Feb 2017 14:58:33 +0000 (15:58 +0100)]
Detach sidebar at 1171

8 years agoFix label and submit button on the forms
Jérémy Fabre [Tue, 21 Feb 2017 14:40:55 +0000 (15:40 +0100)]
Fix label and submit button on the forms

8 years ago[Search] : add person
Emilie [Tue, 21 Feb 2017 11:10:22 +0000 (12:10 +0100)]
[Search] : add person

8 years ago[Article] : correcting url article cards
Emilie [Tue, 21 Feb 2017 10:25:18 +0000 (11:25 +0100)]
[Article] : correcting url article cards

8 years agoMerge branch 'dev' of git+ssh://git.forge.ircam.fr/vertigo into dev
Emilie [Tue, 21 Feb 2017 08:59:16 +0000 (09:59 +0100)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/vertigo into dev

8 years agoupdate lang
Guillaume Pellerin [Wed, 15 Feb 2017 17:55:41 +0000 (18:55 +0100)]
update lang

8 years agoMerge branch 'dev' of git+ssh://git.forge.ircam.fr/vertigo into dev
Guillaume Pellerin [Wed, 15 Feb 2017 17:46:43 +0000 (18:46 +0100)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/vertigo into dev

8 years agoMerge branch 'patch-1' into 'dev'
Guillaume Pellerin [Wed, 15 Feb 2017 17:43:21 +0000 (17:43 +0000)]
Merge branch 'patch-1' into 'dev'

Update django.po

See merge request !1

8 years agoUpdate django.po
Delacour [Wed, 15 Feb 2017 17:35:04 +0000 (17:35 +0000)]
Update django.po

8 years agoMerge branch 'dev' of git+ssh://git.forge.ircam.fr/vertigo into dev
Emilie [Wed, 15 Feb 2017 16:49:16 +0000 (17:49 +0100)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/vertigo into dev

8 years ago[Event] : create event_base template to invert block text and persons list
Emilie [Wed, 15 Feb 2017 16:49:08 +0000 (17:49 +0100)]
[Event] : create event_base template to invert block text and persons list

8 years agoChange the zoom level on network map
Jérémy Fabre [Wed, 15 Feb 2017 16:46:18 +0000 (17:46 +0100)]
Change the zoom level on network map

8 years agoMerge branch 'dev' of git+ssh://git.forge.ircam.fr/vertigo into dev
Jérémy Fabre [Wed, 15 Feb 2017 16:14:05 +0000 (17:14 +0100)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/vertigo into dev

8 years agoRemove unstyled related from person page
Jérémy Fabre [Wed, 15 Feb 2017 16:13:54 +0000 (17:13 +0100)]
Remove unstyled related from person page

8 years agoMerge branch 'dev' of git+ssh://git.forge.ircam.fr/vertigo into dev
Emilie [Wed, 15 Feb 2017 16:09:24 +0000 (17:09 +0100)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/vertigo into dev

8 years ago[#454] : resolving 23:59
Emilie Zawadzki [Wed, 15 Feb 2017 14:36:26 +0000 (15:36 +0100)]
[#454] : resolving 23:59

8 years agoFix map info windows overflow
Jérémy Fabre [Wed, 15 Feb 2017 15:09:24 +0000 (16:09 +0100)]
Fix map info windows overflow

8 years agoIncrease date size on homepage
Jérémy Fabre [Wed, 15 Feb 2017 14:49:14 +0000 (15:49 +0100)]
Increase date size on homepage

8 years agoFix highlighted paragraphs on main page blocks
Jérémy Fabre [Wed, 15 Feb 2017 14:32:24 +0000 (15:32 +0100)]
Fix highlighted paragraphs on main page blocks

8 years agoAdd person cards on home to responsive devices
Jérémy Fabre [Wed, 15 Feb 2017 14:29:49 +0000 (15:29 +0100)]
Add person cards on home to responsive devices

8 years agoFix media box title text align
Jérémy Fabre [Wed, 15 Feb 2017 14:29:36 +0000 (15:29 +0100)]
Fix media box title text align

8 years agoFix padding on media boxes on responsive devices
Jérémy Fabre [Wed, 15 Feb 2017 14:22:19 +0000 (15:22 +0100)]
Fix padding on media boxes on responsive devices

8 years agoFix overlay on responsive devices
Jérémy Fabre [Wed, 15 Feb 2017 14:20:43 +0000 (15:20 +0100)]
Fix overlay on responsive devices

8 years agoAdd medias to home slider
Jérémy Fabre [Wed, 15 Feb 2017 14:16:35 +0000 (15:16 +0100)]
Add medias to home slider

8 years agoAudio details page. Darken the audio media box placeholder.
Jérémy Fabre [Wed, 15 Feb 2017 14:10:20 +0000 (15:10 +0100)]
Audio details page. Darken the audio media box placeholder.

8 years agoAdd gettext and build_messages.sh, build messages
Guillaume Pellerin [Wed, 15 Feb 2017 13:30:26 +0000 (14:30 +0100)]
Add gettext and build_messages.sh, build messages

8 years agoMerge branch 'dev' of git+ssh://git.forge.ircam.fr/vertigo into dev
Jérémy Fabre [Wed, 15 Feb 2017 13:10:13 +0000 (14:10 +0100)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/vertigo into dev

# Conflicts:
# app/templates/media/media/includes/media_card.html

8 years agoAudio overlay
Jérémy Fabre [Wed, 15 Feb 2017 12:57:36 +0000 (13:57 +0100)]
Audio overlay

8 years agoresolving conflicts
Emilie [Wed, 15 Feb 2017 11:49:51 +0000 (12:49 +0100)]
resolving conflicts

8 years ago[Home] : add media on home | [Media] : add image block
Emilie [Wed, 15 Feb 2017 11:39:35 +0000 (12:39 +0100)]
[Home] : add media on home | [Media] : add image block

8 years agoUpdates and fixes for mobile devices
Jérémy Fabre [Wed, 15 Feb 2017 10:57:10 +0000 (11:57 +0100)]
Updates and fixes for mobile devices

8 years agoMove slider content before bio on home page on mobile devices
Jérémy Fabre [Wed, 15 Feb 2017 10:43:55 +0000 (11:43 +0100)]
Move slider content before bio on home page on mobile devices

8 years agoLinked events and articles in person details
Jérémy Fabre [Wed, 15 Feb 2017 10:24:32 +0000 (11:24 +0100)]
Linked events and articles in person details

8 years agoMerge branch 'dev' of git+ssh://git.forge.ircam.fr/vertigo into dev
Emilie [Wed, 15 Feb 2017 10:09:04 +0000 (11:09 +0100)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/vertigo into dev

8 years ago[Person] : events and other objects
Emilie [Wed, 15 Feb 2017 10:08:56 +0000 (11:08 +0100)]
[Person] : events and other objects

8 years agoMove the help texts of the form to the right
Jérémy Fabre [Wed, 15 Feb 2017 10:07:48 +0000 (11:07 +0100)]
Move the help texts of the form to the right

8 years agoFix the width of page blocks
Jérémy Fabre [Wed, 15 Feb 2017 10:00:23 +0000 (11:00 +0100)]
Fix the width of page blocks

8 years agoAdd booking button
Jérémy Fabre [Wed, 15 Feb 2017 09:58:20 +0000 (10:58 +0100)]
Add booking button

8 years agoMerge branch 'dev' of git+ssh://git.forge.ircam.fr/vertigo into dev
Jérémy Fabre [Wed, 15 Feb 2017 09:46:14 +0000 (10:46 +0100)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/vertigo into dev

8 years agoFix a bug in card titles
Jérémy Fabre [Wed, 15 Feb 2017 09:45:57 +0000 (10:45 +0100)]
Fix a bug in card titles

8 years ago[Media] : separating overlay for audio and video
Emilie [Wed, 15 Feb 2017 09:25:45 +0000 (10:25 +0100)]
[Media] : separating overlay for audio and video

8 years agoMerge branch 'dev' of git+ssh://git.forge.ircam.fr/vertigo into dev
Emilie [Tue, 14 Feb 2017 17:13:04 +0000 (18:13 +0100)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/vertigo into dev

8 years ago[Person] : separate related objects
Emilie [Tue, 14 Feb 2017 17:12:57 +0000 (18:12 +0100)]
[Person] : separate related objects

8 years agoUpdate links title
Jérémy Fabre [Tue, 14 Feb 2017 17:03:17 +0000 (18:03 +0100)]
Update links title

8 years agoRemove padding from h3 if it's not in a page block
Jérémy Fabre [Tue, 14 Feb 2017 17:03:07 +0000 (18:03 +0100)]
Remove padding from h3 if it's not in a page block

8 years agoPerson page first implementation
Jérémy Fabre [Tue, 14 Feb 2017 17:00:08 +0000 (18:00 +0100)]
Person page first implementation

8 years agoAdd slider to related content dynamic template
Jérémy Fabre [Tue, 14 Feb 2017 16:59:55 +0000 (17:59 +0100)]
Add slider to related content dynamic template

8 years agoFix event list
Jérémy Fabre [Tue, 14 Feb 2017 16:59:36 +0000 (17:59 +0100)]
Fix event list

8 years agoUpdate select form style
Jérémy Fabre [Tue, 14 Feb 2017 16:58:25 +0000 (17:58 +0100)]
Update select form style

8 years agoFix h3 again -_-
Jérémy Fabre [Tue, 14 Feb 2017 16:18:22 +0000 (17:18 +0100)]
Fix h3 again -_-

8 years agoFix event line box and h3
Jérémy Fabre [Tue, 14 Feb 2017 16:15:56 +0000 (17:15 +0100)]
Fix event line box and h3

8 years agoMerge branch 'dev' of git+ssh://git.forge.ircam.fr/vertigo into dev
Jérémy Fabre [Tue, 14 Feb 2017 16:10:46 +0000 (17:10 +0100)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/vertigo into dev

8 years agoUpdate h3 style
Jérémy Fabre [Tue, 14 Feb 2017 16:10:35 +0000 (17:10 +0100)]
Update h3 style

8 years agoForms template
Jérémy Fabre [Tue, 14 Feb 2017 16:06:19 +0000 (17:06 +0100)]
Forms template

8 years ago[Page Block] : add white style
Emilie [Tue, 14 Feb 2017 15:46:52 +0000 (16:46 +0100)]
[Page Block] : add white style

8 years agoMerge branch 'dev' of git+ssh://git.forge.ircam.fr/vertigo into dev
Emilie [Tue, 14 Feb 2017 15:20:57 +0000 (16:20 +0100)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/vertigo into dev

8 years ago[Person] : list related Article, Events and CustomPage
Emilie [Tue, 14 Feb 2017 15:20:42 +0000 (16:20 +0100)]
[Person] : list related Article, Events and CustomPage

8 years agoFavicon update
Jérémy Fabre [Tue, 14 Feb 2017 15:14:33 +0000 (16:14 +0100)]
Favicon update

8 years agoFix the back to events link
Jérémy Fabre [Tue, 14 Feb 2017 15:10:37 +0000 (16:10 +0100)]
Fix the back to events link

8 years ago3 columns person list on events
Jérémy Fabre [Tue, 14 Feb 2017 15:07:31 +0000 (16:07 +0100)]
3 columns person list on events

8 years agoAdd description to network page
Jérémy Fabre [Tue, 14 Feb 2017 14:14:58 +0000 (15:14 +0100)]
Add description to network page

8 years agoUpdate highlighted paragraph style on green page blocks
Jérémy Fabre [Tue, 14 Feb 2017 14:05:02 +0000 (15:05 +0100)]
Update highlighted paragraph style on green page blocks

8 years agoUpdate times on event line card
Jérémy Fabre [Tue, 14 Feb 2017 13:55:04 +0000 (14:55 +0100)]
Update times on event line card

8 years agoRemove the height on the person cards
Jérémy Fabre [Tue, 14 Feb 2017 13:40:07 +0000 (14:40 +0100)]
Remove the height on the person cards

8 years agoRemove media description in overlay
Jérémy Fabre [Tue, 14 Feb 2017 13:34:27 +0000 (14:34 +0100)]
Remove media description in overlay

8 years agoRemove the video description in the video player
Jérémy Fabre [Tue, 14 Feb 2017 13:32:48 +0000 (14:32 +0100)]
Remove the video description in the video player

8 years agoRemove the playlist view on video details view
Jérémy Fabre [Tue, 14 Feb 2017 13:27:39 +0000 (14:27 +0100)]
Remove the playlist view on video details view

8 years agoMerge branch 'dev' of git+ssh://git.forge.ircam.fr/vertigo into dev
Jérémy Fabre [Tue, 14 Feb 2017 13:12:35 +0000 (14:12 +0100)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/vertigo into dev

8 years agoReduce size of date on event line cards
Jérémy Fabre [Tue, 14 Feb 2017 13:12:24 +0000 (14:12 +0100)]
Reduce size of date on event line cards

8 years agoAdd times to multi date events
Jérémy Fabre [Tue, 14 Feb 2017 13:11:15 +0000 (14:11 +0100)]
Add times to multi date events

8 years agoMerge branch 'dev' of git+ssh://git.forge.ircam.fr/vertigo into dev
Guillaume Pellerin [Tue, 14 Feb 2017 13:08:42 +0000 (14:08 +0100)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/vertigo into dev

8 years agoFix absolute media url by adding a type property (Fix #114)
Guillaume Pellerin [Tue, 14 Feb 2017 13:07:55 +0000 (14:07 +0100)]
Fix absolute media url by adding a type property (Fix #114)

8 years agoPast events style
Jérémy Fabre [Tue, 14 Feb 2017 13:05:25 +0000 (14:05 +0100)]
Past events style

8 years agoAdd 6 posts to Instagram feed. Add a link to Instagram #ircam tag.
Jérémy Fabre [Tue, 14 Feb 2017 12:58:38 +0000 (13:58 +0100)]
Add 6 posts to Instagram feed. Add a link to Instagram #ircam tag.

8 years agoUpdate favicon
Jérémy Fabre [Tue, 14 Feb 2017 12:58:16 +0000 (13:58 +0100)]
Update favicon

8 years ago[Event] : change agenda url
Emilie [Tue, 14 Feb 2017 12:42:58 +0000 (13:42 +0100)]
[Event] : change agenda url

8 years ago[Article] : can add Person in related content
Emilie [Tue, 14 Feb 2017 11:29:39 +0000 (12:29 +0100)]
[Article] : can add Person in related content

8 years agoMerge branch 'dev' of git+ssh://git.forge.ircam.fr/vertigo into dev
Emilie [Tue, 14 Feb 2017 11:11:00 +0000 (12:11 +0100)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/vertigo into dev

8 years ago[Event] : list archives on the same page
Emilie [Tue, 14 Feb 2017 11:10:52 +0000 (12:10 +0100)]
[Event] : list archives on the same page

8 years agoFix footer section title margin
Jérémy Fabre [Tue, 14 Feb 2017 10:57:13 +0000 (11:57 +0100)]
Fix footer section title margin

8 years agoMerge branch 'dev' of git+ssh://git.forge.ircam.fr/vertigo into dev
Jérémy Fabre [Tue, 14 Feb 2017 10:53:05 +0000 (11:53 +0100)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/vertigo into dev

8 years agoUpdate related content. Now related content is displayed as a slider.
Jérémy Fabre [Tue, 14 Feb 2017 10:52:53 +0000 (11:52 +0100)]
Update related content. Now related content is displayed as a slider.

8 years agoMerge branch 'dev' of git+ssh://git.forge.ircam.fr/vertigo into dev
Emilie [Tue, 14 Feb 2017 10:22:49 +0000 (11:22 +0100)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/vertigo into dev

8 years ago[Media] : playlist overlay
Emilie [Tue, 14 Feb 2017 10:22:43 +0000 (11:22 +0100)]
[Media] : playlist overlay

8 years agoSame height on article/media boxes
Jérémy Fabre [Tue, 14 Feb 2017 09:47:31 +0000 (10:47 +0100)]
Same height on article/media boxes

8 years agoUpdate black page block style
Jérémy Fabre [Tue, 14 Feb 2017 09:31:07 +0000 (10:31 +0100)]
Update black page block style

8 years agoUpdate h3 style
Jérémy Fabre [Tue, 14 Feb 2017 09:28:59 +0000 (10:28 +0100)]
Update h3 style

8 years agoUpdate Instagram feed with a slider
Jérémy Fabre [Tue, 14 Feb 2017 09:24:51 +0000 (10:24 +0100)]
Update Instagram feed with a slider

8 years agoAutoplay video when overlay opens
Jérémy Fabre [Tue, 14 Feb 2017 08:49:31 +0000 (09:49 +0100)]
Autoplay video when overlay opens

8 years ago[Home] : instagram ok
Emilie [Mon, 13 Feb 2017 15:44:08 +0000 (16:44 +0100)]
[Home] : instagram ok