]> git.parisson.com Git - mezzo.git/log
mezzo.git
8 years agoFix log paths
Guillaume Pellerin [Fri, 10 Mar 2017 13:04:53 +0000 (14:04 +0100)]
Fix log paths

8 years agofix PATH again
Guillaume Pellerin [Fri, 10 Mar 2017 13:02:05 +0000 (14:02 +0100)]
fix PATH again

8 years agoFix cron PATH
Guillaume Pellerin [Fri, 10 Mar 2017 13:00:46 +0000 (14:00 +0100)]
Fix cron PATH

8 years agoupdate cron chmod
Guillaume Pellerin [Fri, 10 Mar 2017 12:36:48 +0000 (13:36 +0100)]
update cron chmod

8 years agoAdd cron rules as a symlink to app own cron file
Guillaume Pellerin [Fri, 10 Mar 2017 12:29:31 +0000 (13:29 +0100)]
Add cron rules as a symlink to app own cron file

8 years agoAdd crontab commands
Guillaume Pellerin [Fri, 10 Mar 2017 12:13:48 +0000 (13:13 +0100)]
Add crontab commands

8 years agoMerge branch 'dev'
Guillaume Pellerin [Wed, 8 Mar 2017 17:34:41 +0000 (18:34 +0100)]
Merge branch 'dev'

8 years agoFix nginx paths
Guillaume Pellerin [Wed, 8 Mar 2017 17:34:27 +0000 (18:34 +0100)]
Fix nginx paths

8 years agoMerge branch 'dev'
Guillaume Pellerin [Wed, 8 Mar 2017 17:13:07 +0000 (18:13 +0100)]
Merge branch 'dev'

8 years agoFix media.urls, pin bleach==1.5.0
Guillaume Pellerin [Wed, 8 Mar 2017 17:12:36 +0000 (18:12 +0100)]
Fix media.urls, pin bleach==1.5.0

8 years agoFix urls
Guillaume Pellerin [Tue, 7 Mar 2017 16:31:15 +0000 (17:31 +0100)]
Fix urls

8 years agoMerge branch 'dev'
Guillaume Pellerin [Tue, 7 Mar 2017 15:53:40 +0000 (16:53 +0100)]
Merge branch 'dev'

8 years agoUpdate ProjectCall, add Residency and ProjectProducer, add related templates
Guillaume Pellerin [Tue, 7 Mar 2017 15:51:51 +0000 (16:51 +0100)]
Update ProjectCall, add Residency and ProjectProducer, add related templates

8 years agofix server_name, fix starts.eu logo
Guillaume Pellerin [Mon, 6 Mar 2017 12:12:14 +0000 (13:12 +0100)]
fix server_name, fix starts.eu logo

8 years agoMerge branch 'dev'
Guillaume Pellerin [Mon, 6 Mar 2017 11:55:54 +0000 (12:55 +0100)]
Merge branch 'dev'

8 years agoadd nginx redirect
Guillaume Pellerin [Mon, 6 Mar 2017 11:55:42 +0000 (12:55 +0100)]
add nginx redirect

8 years agouse www
Guillaume Pellerin [Mon, 6 Mar 2017 11:51:23 +0000 (12:51 +0100)]
use www

8 years agoMerge branch 'dev'
Guillaume Pellerin [Mon, 6 Mar 2017 09:53:29 +0000 (10:53 +0100)]
Merge branch 'dev'

8 years agoNo logo width constraints
Guillaume Pellerin [Mon, 6 Mar 2017 09:53:03 +0000 (10:53 +0100)]
No logo width constraints

8 years agoMerge branch 'dev'
Guillaume Pellerin [Fri, 3 Mar 2017 17:44:36 +0000 (18:44 +0100)]
Merge branch 'dev'

8 years agono cron container ATM
Guillaume Pellerin [Fri, 3 Mar 2017 17:44:24 +0000 (18:44 +0100)]
no cron container ATM

8 years agoMerge branch 'dev'
Guillaume Pellerin [Fri, 3 Mar 2017 17:28:16 +0000 (18:28 +0100)]
Merge branch 'dev'

8 years agoNo ProjectCall ATM
Guillaume Pellerin [Fri, 3 Mar 2017 17:28:06 +0000 (18:28 +0100)]
No ProjectCall ATM

8 years agoMerge branch 'dev'
Guillaume Pellerin [Fri, 3 Mar 2017 17:25:25 +0000 (18:25 +0100)]
Merge branch 'dev'

8 years agoadd Project ICT data and related content, first version of ICT Project form, take...
Guillaume Pellerin [Fri, 3 Mar 2017 17:22:29 +0000 (18:22 +0100)]
add Project ICT data and related content, first version of ICT Project form, take host organization from current site

8 years agoMerge branch 'dev' of git+ssh://git.forge.ircam.fr/vertigo into dev
David Palomares [Thu, 2 Mar 2017 16:43:50 +0000 (17:43 +0100)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/vertigo into dev

8 years agoICTProject model and admin
David Palomares [Thu, 2 Mar 2017 16:42:56 +0000 (17:42 +0100)]
ICTProject model and admin

8 years agoFix dev modules
Guillaume Pellerin [Tue, 28 Feb 2017 17:38:41 +0000 (18:38 +0100)]
Fix dev modules

8 years agoadd (empty) crontab
Guillaume Pellerin [Mon, 27 Feb 2017 14:13:25 +0000 (15:13 +0100)]
add (empty) crontab

8 years agoadd (empty) crontab
Guillaume Pellerin [Mon, 27 Feb 2017 14:13:25 +0000 (15:13 +0100)]
add (empty) crontab

8 years agoFull media update, not only on creation (fix #135)
Guillaume Pellerin [Mon, 27 Feb 2017 10:01:47 +0000 (11:01 +0100)]
Full media update, not only on creation (fix #135)

8 years agostatic files in host dir
Guillaume Pellerin [Fri, 24 Feb 2017 12:45:13 +0000 (13:45 +0100)]
static files in host dir

8 years agoFix zoom
Guillaume Pellerin [Fri, 24 Feb 2017 12:39:26 +0000 (13:39 +0100)]
Fix zoom

8 years agoMerge branch 'feature/themes' into dev
Guillaume Pellerin [Thu, 23 Feb 2017 22:55:41 +0000 (23:55 +0100)]
Merge branch 'feature/themes' into dev

8 years agoAdd organization.site to allow host orga filtering by site
Guillaume Pellerin [Thu, 23 Feb 2017 22:53:49 +0000 (23:53 +0100)]
Add organization.site to allow host orga filtering by site

8 years agoFix themes init, fix page placeholder names
Guillaume Pellerin [Thu, 23 Feb 2017 22:45:23 +0000 (23:45 +0100)]
Fix themes init, fix page placeholder names

8 years agoAdd starts_eu theme
Guillaume Pellerin [Thu, 23 Feb 2017 17:28:49 +0000 (18:28 +0100)]
Add starts_eu theme

8 years agoGet first host_theme for vertigo.starts.eu, adapt front builder to new paths
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

8 years agoMerge branch 'dev' into feature/themes
Guillaume Pellerin [Thu, 23 Feb 2017 15:48:31 +0000 (16:48 +0100)]
Merge branch 'dev' into feature/themes

8 years agoAdd themes modules plus custom base.html and page.html
Guillaume Pellerin [Thu, 23 Feb 2017 15:47:49 +0000 (16:47 +0100)]
Add themes modules plus custom base.html and page.html

8 years agoupdate locales
Guillaume Pellerin [Wed, 22 Feb 2017 14:17:20 +0000 (15:17 +0100)]
update locales

8 years agoMerge branch 'patch-3' into dev
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

8 years agoMerge branch 'dev' of gitlab.com:yomguy/vertigo into dev
Guillaume Pellerin [Wed, 22 Feb 2017 14:10:29 +0000 (15:10 +0100)]
Merge branch 'dev' of gitlab.com:yomguy/vertigo into dev

8 years agoMerge branch 'patch-2' 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

8 years agoMerge branch 'dev' of git+ssh://git.forge.ircam.fr/vertigo into dev
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

8 years agoExclude events from related content, move them to another container
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

8 years agoFix spaces
Guillaume Pellerin [Wed, 22 Feb 2017 12:36:29 +0000 (13:36 +0100)]
Fix spaces

8 years agoAdd twitter user links
Guillaume Pellerin [Wed, 22 Feb 2017 12:35:40 +0000 (13:35 +0100)]
Add twitter user links

8 years agoUse retweet when available
Guillaume Pellerin [Wed, 22 Feb 2017 12:30:44 +0000 (13:30 +0100)]
Use retweet when available

8 years ago[CustomPage] : separate events from other dynamic content
Emilie [Wed, 22 Feb 2017 12:01:47 +0000 (13:01 +0100)]
[CustomPage] : separate events from other dynamic content

8 years ago[Event] : keep admin view
Emilie [Wed, 22 Feb 2017 10:40:25 +0000 (11:40 +0100)]
[Event] : keep admin view

8 years ago[Docker] : add volume mezzanine-agenda
Emilie [Wed, 22 Feb 2017 10:27:54 +0000 (11:27 +0100)]
[Docker] : add volume mezzanine-agenda

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 agoMerge branch 'dev' into feature/themes
Guillaume Pellerin [Wed, 22 Feb 2017 10:04:50 +0000 (11:04 +0100)]
Merge branch 'dev' into feature/themes

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

8 years agoPrepare themes
Guillaume Pellerin [Wed, 22 Feb 2017 09:51:56 +0000 (10:51 +0100)]
Prepare themes

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 agoUpdate django.po
Delacour [Tue, 21 Feb 2017 17:40:15 +0000 (17:40 +0000)]
Update django.po

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 django.po
Delacour [Fri, 17 Feb 2017 10:33:57 +0000 (10:33 +0000)]
Update django.po

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