]>
git.parisson.com Git - mezzo.git/log
Guillaume Pellerin [Fri, 24 Feb 2017 12:39:26 +0000 (13:39 +0100)]
Fix zoom
Guillaume Pellerin [Thu, 23 Feb 2017 22:55:41 +0000 (23:55 +0100)]
Merge branch 'feature/themes' into dev
Guillaume Pellerin [Thu, 23 Feb 2017 22:53:49 +0000 (23:53 +0100)]
Add organization.site to allow host orga filtering by site
Guillaume Pellerin [Thu, 23 Feb 2017 22:45:23 +0000 (23:45 +0100)]
Fix themes init, fix page placeholder names
Guillaume Pellerin [Thu, 23 Feb 2017 17:28:49 +0000 (18:28 +0100)]
Add starts_eu theme
Guillaume Pellerin [Thu, 23 Feb 2017 16:46:04 +0000 (17:46 +0100)]
Get first host_theme for vertigo.starts.eu, adapt front builder to new paths
Guillaume Pellerin [Thu, 23 Feb 2017 15:48:31 +0000 (16:48 +0100)]
Merge branch 'dev' into feature/themes
Guillaume Pellerin [Thu, 23 Feb 2017 15:47:49 +0000 (16:47 +0100)]
Add themes modules plus custom base.html and page.html
Guillaume Pellerin [Wed, 22 Feb 2017 14:17:20 +0000 (15:17 +0100)]
update locales
Guillaume Pellerin [Wed, 22 Feb 2017 14:13:42 +0000 (15:13 +0100)]
Merge branch 'patch-3' into dev
Conflicts:
app/locale/fr/LC_MESSAGES/django.po
Guillaume Pellerin [Wed, 22 Feb 2017 14:10:29 +0000 (15:10 +0100)]
Merge branch 'dev' of gitlab.com:yomguy/vertigo into dev
Guillaume Pellerin [Wed, 22 Feb 2017 14:09:39 +0000 (14:09 +0000)]
Merge branch 'patch-2' into 'dev'
Update django.po
See merge request !2
Jérémy Fabre [Wed, 22 Feb 2017 13:30:22 +0000 (14:30 +0100)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/vertigo into dev
Jérémy Fabre [Wed, 22 Feb 2017 13:30:11 +0000 (14:30 +0100)]
Exclude events from related content, move them to another container
Guillaume Pellerin [Wed, 22 Feb 2017 12:36:29 +0000 (13:36 +0100)]
Fix spaces
Guillaume Pellerin [Wed, 22 Feb 2017 12:35:40 +0000 (13:35 +0100)]
Add twitter user links
Guillaume Pellerin [Wed, 22 Feb 2017 12:30:44 +0000 (13:30 +0100)]
Use retweet when available
Emilie [Wed, 22 Feb 2017 12:01:47 +0000 (13:01 +0100)]
[CustomPage] : separate events from other dynamic content
Emilie [Wed, 22 Feb 2017 10:40:25 +0000 (11:40 +0100)]
[Event] : keep admin view
Emilie [Wed, 22 Feb 2017 10:27:54 +0000 (11:27 +0100)]
[Docker] : add volume mezzanine-agenda
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
Emilie [Wed, 22 Feb 2017 10:22:35 +0000 (11:22 +0100)]
[Event] : move ranking into mezzanine agenda + deleting custom list view
Guillaume Pellerin [Wed, 22 Feb 2017 10:04:50 +0000 (11:04 +0100)]
Merge branch 'dev' into feature/themes
Guillaume Pellerin [Wed, 22 Feb 2017 10:04:37 +0000 (11:04 +0100)]
Add various blocks
Guillaume Pellerin [Wed, 22 Feb 2017 09:51:56 +0000 (10:51 +0100)]
Prepare themes
Jérémy Fabre [Wed, 22 Feb 2017 08:58:33 +0000 (09:58 +0100)]
Fix the top margin of the main container
Emilie [Tue, 21 Feb 2017 19:00:05 +0000 (20:00 +0100)]
[Event] : try another url on list events
Guillaume Pellerin [Tue, 21 Feb 2017 18:50:52 +0000 (19:50 +0100)]
Try to fix agenda urls
Delacour [Tue, 21 Feb 2017 17:40:15 +0000 (17:40 +0000)]
Update django.po
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
Emilie [Tue, 21 Feb 2017 16:12:39 +0000 (17:12 +0100)]
[Media] : update url
Emilie [Tue, 21 Feb 2017 16:11:55 +0000 (17:11 +0100)]
[Event] : order by rank
Jérémy Fabre [Tue, 21 Feb 2017 15:35:56 +0000 (16:35 +0100)]
Dispose video player when closing overlay
Jérémy Fabre [Tue, 21 Feb 2017 14:58:33 +0000 (15:58 +0100)]
Detach sidebar at 1171
Jérémy Fabre [Tue, 21 Feb 2017 14:40:55 +0000 (15:40 +0100)]
Fix label and submit button on the forms
Emilie [Tue, 21 Feb 2017 11:10:22 +0000 (12:10 +0100)]
[Search] : add person
Emilie [Tue, 21 Feb 2017 10:25:18 +0000 (11:25 +0100)]
[Article] : correcting url article cards
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
Delacour [Fri, 17 Feb 2017 10:33:57 +0000 (10:33 +0000)]
Update django.po
Guillaume Pellerin [Wed, 15 Feb 2017 17:55:41 +0000 (18:55 +0100)]
update lang
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
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
Delacour [Wed, 15 Feb 2017 17:35:04 +0000 (17:35 +0000)]
Update django.po
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
Emilie [Wed, 15 Feb 2017 16:49:08 +0000 (17:49 +0100)]
[Event] : create event_base template to invert block text and persons list
Jérémy Fabre [Wed, 15 Feb 2017 16:46:18 +0000 (17:46 +0100)]
Change the zoom level on network map
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
Jérémy Fabre [Wed, 15 Feb 2017 16:13:54 +0000 (17:13 +0100)]
Remove unstyled related from person page
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
Emilie Zawadzki [Wed, 15 Feb 2017 14:36:26 +0000 (15:36 +0100)]
[#454] : resolving 23:59
Jérémy Fabre [Wed, 15 Feb 2017 15:09:24 +0000 (16:09 +0100)]
Fix map info windows overflow
Jérémy Fabre [Wed, 15 Feb 2017 14:49:14 +0000 (15:49 +0100)]
Increase date size on homepage
Jérémy Fabre [Wed, 15 Feb 2017 14:32:24 +0000 (15:32 +0100)]
Fix highlighted paragraphs on main page blocks
Jérémy Fabre [Wed, 15 Feb 2017 14:29:49 +0000 (15:29 +0100)]
Add person cards on home to responsive devices
Jérémy Fabre [Wed, 15 Feb 2017 14:29:36 +0000 (15:29 +0100)]
Fix media box title text align
Jérémy Fabre [Wed, 15 Feb 2017 14:22:19 +0000 (15:22 +0100)]
Fix padding on media boxes on responsive devices
Jérémy Fabre [Wed, 15 Feb 2017 14:20:43 +0000 (15:20 +0100)]
Fix overlay on responsive devices
Jérémy Fabre [Wed, 15 Feb 2017 14:16:35 +0000 (15:16 +0100)]
Add medias to home slider
Jérémy Fabre [Wed, 15 Feb 2017 14:10:20 +0000 (15:10 +0100)]
Audio details page. Darken the audio media box placeholder.
Guillaume Pellerin [Wed, 15 Feb 2017 13:30:26 +0000 (14:30 +0100)]
Add gettext and build_messages.sh, build messages
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
Jérémy Fabre [Wed, 15 Feb 2017 12:57:36 +0000 (13:57 +0100)]
Audio overlay
Emilie [Wed, 15 Feb 2017 11:49:51 +0000 (12:49 +0100)]
resolving conflicts
Emilie [Wed, 15 Feb 2017 11:39:35 +0000 (12:39 +0100)]
[Home] : add media on home | [Media] : add image block
Jérémy Fabre [Wed, 15 Feb 2017 10:57:10 +0000 (11:57 +0100)]
Updates and fixes for 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
Jérémy Fabre [Wed, 15 Feb 2017 10:24:32 +0000 (11:24 +0100)]
Linked events and articles in person details
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
Emilie [Wed, 15 Feb 2017 10:08:56 +0000 (11:08 +0100)]
[Person] : events and other objects
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
Jérémy Fabre [Wed, 15 Feb 2017 10:00:23 +0000 (11:00 +0100)]
Fix the width of page blocks
Jérémy Fabre [Wed, 15 Feb 2017 09:58:20 +0000 (10:58 +0100)]
Add booking button
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
Jérémy Fabre [Wed, 15 Feb 2017 09:45:57 +0000 (10:45 +0100)]
Fix a bug in card titles
Emilie [Wed, 15 Feb 2017 09:25:45 +0000 (10:25 +0100)]
[Media] : separating overlay for audio and video
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
Emilie [Tue, 14 Feb 2017 17:12:57 +0000 (18:12 +0100)]
[Person] : separate related objects
Jérémy Fabre [Tue, 14 Feb 2017 17:03:17 +0000 (18:03 +0100)]
Update links title
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
Jérémy Fabre [Tue, 14 Feb 2017 17:00:08 +0000 (18:00 +0100)]
Person page first implementation
Jérémy Fabre [Tue, 14 Feb 2017 16:59:55 +0000 (17:59 +0100)]
Add slider to related content dynamic template
Jérémy Fabre [Tue, 14 Feb 2017 16:59:36 +0000 (17:59 +0100)]
Fix event list
Jérémy Fabre [Tue, 14 Feb 2017 16:58:25 +0000 (17:58 +0100)]
Update select form style
Jérémy Fabre [Tue, 14 Feb 2017 16:18:22 +0000 (17:18 +0100)]
Fix h3 again -_-
Jérémy Fabre [Tue, 14 Feb 2017 16:15:56 +0000 (17:15 +0100)]
Fix event line box and h3
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
Jérémy Fabre [Tue, 14 Feb 2017 16:10:35 +0000 (17:10 +0100)]
Update h3 style
Jérémy Fabre [Tue, 14 Feb 2017 16:06:19 +0000 (17:06 +0100)]
Forms template
Emilie [Tue, 14 Feb 2017 15:46:52 +0000 (16:46 +0100)]
[Page Block] : add white style
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
Emilie [Tue, 14 Feb 2017 15:20:42 +0000 (16:20 +0100)]
[Person] : list related Article, Events and CustomPage
Jérémy Fabre [Tue, 14 Feb 2017 15:14:33 +0000 (16:14 +0100)]
Favicon update
Jérémy Fabre [Tue, 14 Feb 2017 15:10:37 +0000 (16:10 +0100)]
Fix the back to events link
Jérémy Fabre [Tue, 14 Feb 2017 15:07:31 +0000 (16:07 +0100)]
3 columns person list on events
Jérémy Fabre [Tue, 14 Feb 2017 14:14:58 +0000 (15:14 +0100)]
Add description to network page
Jérémy Fabre [Tue, 14 Feb 2017 14:05:02 +0000 (15:05 +0100)]
Update highlighted paragraph style on green page blocks
Jérémy Fabre [Tue, 14 Feb 2017 13:55:04 +0000 (14:55 +0100)]
Update times on event line card
Jérémy Fabre [Tue, 14 Feb 2017 13:40:07 +0000 (14:40 +0100)]
Remove the height on the person cards
Jérémy Fabre [Tue, 14 Feb 2017 13:34:27 +0000 (14:34 +0100)]
Remove media description in overlay
Jérémy Fabre [Tue, 14 Feb 2017 13:32:48 +0000 (14:32 +0100)]
Remove the video description in the video player