]>
git.parisson.com Git - mezzo.git/log
Guillaume Pellerin [Tue, 22 Mar 2016 17:08:27 +0000 (18:08 +0100)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/Manifeste into dev
Conflicts:
app/templates/agenda/includes/event_metainfo.html
Guillaume Pellerin [Tue, 22 Mar 2016 17:07:29 +0000 (18:07 +0100)]
add slider metadata
Philippe Barbosa [Tue, 22 Mar 2016 17:01:26 +0000 (18:01 +0100)]
fix conflict
Philippe Barbosa [Tue, 22 Mar 2016 17:00:33 +0000 (18:00 +0100)]
Updates for metainfo styles, added calendar
Guillaume Pellerin [Tue, 22 Mar 2016 16:57:55 +0000 (17:57 +0100)]
fix event description
Guillaume Pellerin [Tue, 22 Mar 2016 16:51:17 +0000 (17:51 +0100)]
add photo credits
Guillaume Pellerin [Tue, 22 Mar 2016 12:24:50 +0000 (13:24 +0100)]
add featured events in slider, add edito,
fix dropdown spaces, add /styles/
Guillaume Pellerin [Tue, 22 Mar 2016 00:29:40 +0000 (01:29 +0100)]
add event featured images
Guillaume Pellerin [Tue, 22 Mar 2016 00:02:15 +0000 (01:02 +0100)]
add Playlist
Guillaume Pellerin [Tue, 22 Mar 2016 01:13:19 +0000 (02:13 +0100)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/Manifeste into dev
Guillaume Pellerin [Mon, 21 Mar 2016 23:35:07 +0000 (00:35 +0100)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/Manifeste into dev
Guillaume Pellerin [Mon, 21 Mar 2016 23:34:41 +0000 (00:34 +0100)]
add abstract Media and Audio models with automatic URL retrieval
Philippe Barbosa [Fri, 18 Mar 2016 17:56:29 +0000 (18:56 +0100)]
event update, nav complementary
Philippe Barbosa [Fri, 18 Mar 2016 15:20:42 +0000 (16:20 +0100)]
Video sizes
Philippe Barbosa [Fri, 18 Mar 2016 15:20:00 +0000 (16:20 +0100)]
Added favicon
Philippe Barbosa [Fri, 18 Mar 2016 15:12:29 +0000 (16:12 +0100)]
Slider auto loop
Guillaume Pellerin [Fri, 18 Mar 2016 14:59:16 +0000 (15:59 +0100)]
fix calendar link placeholder
Guillaume Pellerin [Fri, 18 Mar 2016 14:49:18 +0000 (15:49 +0100)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/Manifeste into dev
Conflicts:
app/templates/agenda/event_detail.html
Guillaume Pellerin [Fri, 18 Mar 2016 14:47:01 +0000 (15:47 +0100)]
add calendar link to event detail
Philippe Barbosa [Fri, 18 Mar 2016 14:40:05 +0000 (15:40 +0100)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/Manifeste into dev
Philippe Barbosa [Fri, 18 Mar 2016 14:39:58 +0000 (15:39 +0100)]
Sidebar styles, program list update
Guillaume Pellerin [Fri, 18 Mar 2016 14:39:18 +0000 (15:39 +0100)]
add calendar link to base.html, add festival_tags
Guillaume Pellerin [Fri, 18 Mar 2016 13:51:53 +0000 (14:51 +0100)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/Manifeste into dev
Guillaume Pellerin [Fri, 18 Mar 2016 13:51:28 +0000 (14:51 +0100)]
add edito and festival tags, cleanup
Philippe Barbosa [Fri, 18 Mar 2016 13:40:42 +0000 (14:40 +0100)]
Sidebar fixes
Philippe Barbosa [Fri, 18 Mar 2016 13:28:05 +0000 (14:28 +0100)]
Revert to gold styles
Guillaume Pellerin [Thu, 17 Mar 2016 21:03:33 +0000 (22:03 +0100)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/Manifeste into dev
Philippe Barbosa [Thu, 17 Mar 2016 16:54:22 +0000 (17:54 +0100)]
New style, from pdf program
Guillaume Pellerin [Mon, 14 Mar 2016 14:01:00 +0000 (15:01 +0100)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/Manifeste into dev
Guillaume Pellerin [Mon, 14 Mar 2016 12:27:01 +0000 (13:27 +0100)]
add pyquery, maps domain
Guillaume Pellerin [Thu, 10 Mar 2016 12:13:21 +0000 (13:13 +0100)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/Manifeste into dev
Guillaume Pellerin [Thu, 10 Mar 2016 10:44:26 +0000 (11:44 +0100)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/Manifeste into dev
Guillaume Pellerin [Thu, 10 Mar 2016 00:24:09 +0000 (01:24 +0100)]
add special dev compose conf
Guillaume Pellerin [Thu, 10 Mar 2016 00:02:49 +0000 (01:02 +0100)]
ignore naive TZ warnings for the moment, super clean log!
Guillaume Pellerin [Thu, 10 Mar 2016 00:02:49 +0000 (01:02 +0100)]
ignore naive TZ warnings for the moment
Guillaume Pellerin [Wed, 9 Mar 2016 23:57:16 +0000 (00:57 +0100)]
fix deprecated in 1.10
Guillaume Pellerin [Wed, 9 Mar 2016 23:26:28 +0000 (00:26 +0100)]
fix footer
Guillaume Pellerin [Wed, 9 Mar 2016 23:05:58 +0000 (00:05 +0100)]
readd footer page menu
Guillaume Pellerin [Wed, 9 Mar 2016 22:47:15 +0000 (23:47 +0100)]
fix time
Guillaume Pellerin [Wed, 9 Mar 2016 22:35:48 +0000 (23:35 +0100)]
add children events, add related event links, add l10n setting
Guillaume Pellerin [Wed, 9 Mar 2016 17:32:21 +0000 (18:32 +0100)]
fix readme
Guillaume Pellerin [Wed, 9 Mar 2016 17:31:43 +0000 (18:31 +0100)]
deinit mezzanine-agenda (again)
Guillaume Pellerin [Wed, 9 Mar 2016 17:29:59 +0000 (18:29 +0100)]
fix sign, add map link
Guillaume Pellerin [Wed, 9 Mar 2016 16:43:34 +0000 (17:43 +0100)]
update event images path
Guillaume Pellerin [Wed, 9 Mar 2016 15:55:29 +0000 (16:55 +0100)]
fix path
Guillaume Pellerin [Wed, 9 Mar 2016 15:53:04 +0000 (16:53 +0100)]
add mezzanine_agenda as submodule
Guillaume Pellerin [Wed, 9 Mar 2016 15:46:02 +0000 (16:46 +0100)]
use agenda fork for extending event metadata, add playlist test
Guillaume Pellerin [Tue, 8 Mar 2016 19:03:28 +0000 (20:03 +0100)]
all model search
Guillaume Pellerin [Tue, 8 Mar 2016 19:00:30 +0000 (20:00 +0100)]
add models to model search
Guillaume Pellerin [Tue, 8 Mar 2016 18:42:41 +0000 (19:42 +0100)]
use live master branch of Mezzanine (use fix of #1516)
Guillaume Pellerin [Tue, 8 Mar 2016 19:22:33 +0000 (20:22 +0100)]
update DB and media
Guillaume Pellerin [Fri, 4 Mar 2016 17:52:35 +0000 (18:52 +0100)]
setup video cards
Philippe Barbosa [Fri, 4 Mar 2016 17:45:57 +0000 (18:45 +0100)]
Added video card list
Philippe Barbosa [Fri, 4 Mar 2016 17:12:51 +0000 (18:12 +0100)]
Toggle menu button fix
Philippe Barbosa [Fri, 4 Mar 2016 17:10:30 +0000 (18:10 +0100)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/Manifeste into dev
Philippe Barbosa [Fri, 4 Mar 2016 17:10:25 +0000 (18:10 +0100)]
submenu styles for header
Guillaume Pellerin [Fri, 4 Mar 2016 15:29:47 +0000 (16:29 +0100)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/Manifeste into dev
Guillaume Pellerin [Fri, 4 Mar 2016 15:27:53 +0000 (16:27 +0100)]
bugfix
Philippe Barbosa [Fri, 4 Mar 2016 15:27:25 +0000 (16:27 +0100)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/Manifeste into dev
Philippe Barbosa [Fri, 4 Mar 2016 15:27:22 +0000 (16:27 +0100)]
Form fix, for sidebar search
Guillaume Pellerin [Fri, 4 Mar 2016 15:18:30 +0000 (16:18 +0100)]
use artist.photo_featured by default
Philippe Barbosa [Fri, 4 Mar 2016 14:38:50 +0000 (15:38 +0100)]
Sidebar styles
Philippe Barbosa [Fri, 4 Mar 2016 11:29:33 +0000 (12:29 +0100)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/Manifeste into dev
Philippe Barbosa [Fri, 4 Mar 2016 11:29:30 +0000 (12:29 +0100)]
Slider for homepage
Guillaume Pellerin [Fri, 4 Mar 2016 10:29:59 +0000 (11:29 +0100)]
rm double selector (fix #48)
Philippe Barbosa [Fri, 4 Mar 2016 10:21:36 +0000 (11:21 +0100)]
Language selector in banner navigation
Guillaume Pellerin [Fri, 4 Mar 2016 09:32:43 +0000 (10:32 +0100)]
make lang button
Guillaume Pellerin [Fri, 4 Mar 2016 09:29:24 +0000 (10:29 +0100)]
language list in place of selector
Guillaume Pellerin [Fri, 4 Mar 2016 08:35:54 +0000 (09:35 +0100)]
fix video url
Guillaume Pellerin [Fri, 4 Mar 2016 08:32:58 +0000 (09:32 +0100)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/Manifeste into dev
Philippe Barbosa [Thu, 3 Mar 2016 18:26:17 +0000 (19:26 +0100)]
General styles
Philippe Barbosa [Thu, 3 Mar 2016 18:25:47 +0000 (19:25 +0100)]
Sidebar, user styles
Philippe Barbosa [Thu, 3 Mar 2016 18:25:14 +0000 (19:25 +0100)]
general styles
Philippe Barbosa [Thu, 3 Mar 2016 18:24:37 +0000 (19:24 +0100)]
search form styles
Philippe Barbosa [Thu, 3 Mar 2016 18:23:56 +0000 (19:23 +0100)]
Event styles
Philippe Barbosa [Thu, 3 Mar 2016 18:23:12 +0000 (19:23 +0100)]
Artist detail styles
Philippe Barbosa [Thu, 3 Mar 2016 17:03:13 +0000 (18:03 +0100)]
Footer styles
Guillaume Pellerin [Thu, 3 Mar 2016 13:46:48 +0000 (14:46 +0100)]
bugfix
Guillaume Pellerin [Thu, 3 Mar 2016 13:42:51 +0000 (14:42 +0100)]
media id is charfield
Guillaume Pellerin [Thu, 3 Mar 2016 12:32:07 +0000 (13:32 +0100)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/Manifeste into dev
Guillaume Pellerin [Thu, 3 Mar 2016 12:31:36 +0000 (13:31 +0100)]
update model
Guillaume Pellerin [Thu, 3 Mar 2016 12:03:54 +0000 (13:03 +0100)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/Manifeste into dev
Philippe Barbosa [Thu, 3 Mar 2016 12:02:47 +0000 (13:02 +0100)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/Manifeste into dev
Guillaume Pellerin [Thu, 3 Mar 2016 13:10:11 +0000 (14:10 +0100)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/Manifeste into dev
Philippe Barbosa [Thu, 3 Mar 2016 12:02:43 +0000 (13:02 +0100)]
New general styles
Guillaume Pellerin [Thu, 3 Mar 2016 12:02:37 +0000 (13:02 +0100)]
add festival admin menu, add more related events
Philippe Barbosa [Thu, 3 Mar 2016 11:15:34 +0000 (12:15 +0100)]
minor fix
Guillaume Pellerin [Thu, 3 Mar 2016 11:05:44 +0000 (12:05 +0100)]
minor doc fix
Guillaume Pellerin [Thu, 3 Mar 2016 11:03:54 +0000 (12:03 +0100)]
fix backup command
Guillaume Pellerin [Thu, 3 Mar 2016 11:02:37 +0000 (12:02 +0100)]
update dev config and setup
Guillaume Pellerin [Thu, 3 Mar 2016 10:47:33 +0000 (11:47 +0100)]
add compose conf for dev
Guillaume Pellerin [Thu, 3 Mar 2016 10:28:39 +0000 (11:28 +0100)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/Manifeste
Philippe Barbosa [Thu, 3 Mar 2016 10:28:24 +0000 (11:28 +0100)]
Navigation fix
Guillaume Pellerin [Thu, 3 Mar 2016 10:25:53 +0000 (11:25 +0100)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/Manifeste
Philippe Barbosa [Thu, 3 Mar 2016 10:21:06 +0000 (11:21 +0100)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/Manifeste into dev
Philippe Barbosa [Thu, 3 Mar 2016 10:20:59 +0000 (11:20 +0100)]
style improvments, responsive menu
Guillaume Pellerin [Thu, 3 Mar 2016 09:44:13 +0000 (10:44 +0100)]
Merge branch 'master' of git+ssh://git.forge.ircam.fr/Manifeste
Guillaume Pellerin [Thu, 3 Mar 2016 09:34:58 +0000 (10:34 +0100)]
mv language selector script
Philippe Barbosa [Thu, 3 Mar 2016 09:20:29 +0000 (10:20 +0100)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/Manifeste into dev
Philippe Barbosa [Thu, 3 Mar 2016 09:20:20 +0000 (10:20 +0100)]
New general styles
projects / mezzo.git / log