]>
git.parisson.com Git - mezzo.git/log
Jérémy Fabre [Mon, 17 Oct 2016 15:15:07 +0000 (17:15 +0200)]
Add tournees banner and menu link
Jérémy Fabre [Mon, 17 Oct 2016 13:34:39 +0000 (15:34 +0200)]
Lazyload fix
Jérémy Fabre [Mon, 17 Oct 2016 13:33:45 +0000 (15:33 +0200)]
Add lazyload on cards
Jérémy Fabre [Mon, 17 Oct 2016 12:53:01 +0000 (14:53 +0200)]
Card templates full refactoring
Guillaume Pellerin [Mon, 17 Oct 2016 09:04:31 +0000 (11:04 +0200)]
Finally use 8020 port in prod (2nd nginx will be in front)
Emilie [Fri, 14 Oct 2016 17:08:39 +0000 (19:08 +0200)]
Install : log dir creation for cron
Emilie [Fri, 14 Oct 2016 16:28:30 +0000 (18:28 +0200)]
Install : update cron command
Emilie [Fri, 14 Oct 2016 16:24:49 +0000 (18:24 +0200)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev
Emilie [Fri, 14 Oct 2016 16:23:48 +0000 (18:23 +0200)]
Merge branch 'search' into dev
Emilie [Fri, 14 Oct 2016 16:03:10 +0000 (18:03 +0200)]
Search : deleting useless migrations
Emilie [Fri, 14 Oct 2016 15:59:27 +0000 (17:59 +0200)]
Search : adapt to playlist
Guillaume Pellerin [Fri, 14 Oct 2016 15:19:03 +0000 (17:19 +0200)]
Pull local branch only
Guillaume Pellerin [Fri, 14 Oct 2016 15:14:28 +0000 (17:14 +0200)]
Regression from master branch
Guillaume Pellerin [Fri, 14 Oct 2016 14:55:26 +0000 (16:55 +0200)]
herge branch 'dev'
Guillaume Pellerin [Fri, 14 Oct 2016 14:55:11 +0000 (16:55 +0200)]
Fix links
Guillaume Pellerin [Fri, 14 Oct 2016 14:49:54 +0000 (16:49 +0200)]
Merge branch 'dev'
Guillaume Pellerin [Fri, 14 Oct 2016 14:49:23 +0000 (16:49 +0200)]
Product bugfix
Guillaume Pellerin [Fri, 14 Oct 2016 14:10:19 +0000 (16:10 +0200)]
pull master only on master branch
Guillaume Pellerin [Fri, 14 Oct 2016 14:09:16 +0000 (16:09 +0200)]
Merge branch 'dev'
Guillaume Pellerin [Fri, 14 Oct 2016 14:09:02 +0000 (16:09 +0200)]
Bugfix autocomplete
Emilie [Fri, 14 Oct 2016 13:23:42 +0000 (15:23 +0200)]
Search : deleting useless Video / Audio call
Guillaume Pellerin [Fri, 14 Oct 2016 13:14:34 +0000 (15:14 +0200)]
Merge branch 'dev'
Guillaume Pellerin [Fri, 14 Oct 2016 13:13:13 +0000 (15:13 +0200)]
Merge branch 'master' of git+ssh://git.forge.ircam.fr/ircam-www
Guillaume Pellerin [Fri, 14 Oct 2016 13:13:03 +0000 (15:13 +0200)]
Merge branch 'dev'
Jérémy Fabre [Fri, 14 Oct 2016 13:04:01 +0000 (15:04 +0200)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev
Jérémy Fabre [Fri, 14 Oct 2016 13:03:58 +0000 (15:03 +0200)]
Sticky menu
Emilie [Fri, 14 Oct 2016 12:56:36 +0000 (14:56 +0200)]
Search : merging
cri [Fri, 14 Oct 2016 12:33:32 +0000 (14:33 +0200)]
Merge branch 'master' of ssh://git.forge.ircam.fr/ircam-www
Guillaume Pellerin [Fri, 14 Oct 2016 12:32:25 +0000 (14:32 +0200)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev
Guillaume Pellerin [Fri, 14 Oct 2016 12:32:10 +0000 (14:32 +0200)]
Cleanup person_detail
Jérémy Fabre [Fri, 14 Oct 2016 12:02:00 +0000 (14:02 +0200)]
Fix links in bullet lists
Jérémy Fabre [Fri, 14 Oct 2016 11:56:57 +0000 (13:56 +0200)]
Fix bold font in tables
Jérémy Fabre [Fri, 14 Oct 2016 11:46:13 +0000 (13:46 +0200)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev
Jérémy Fabre [Fri, 14 Oct 2016 11:46:05 +0000 (13:46 +0200)]
Filters style
Guillaume Pellerin [Fri, 14 Oct 2016 11:05:34 +0000 (13:05 +0200)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev
Guillaume Pellerin [Fri, 14 Oct 2016 11:04:55 +0000 (13:04 +0200)]
cleanup
Emilie [Fri, 14 Oct 2016 10:52:52 +0000 (12:52 +0200)]
Search: cleaning
Jérémy Fabre [Fri, 14 Oct 2016 10:36:39 +0000 (12:36 +0200)]
Scrollspy implementation
Jérémy Fabre [Fri, 14 Oct 2016 10:36:30 +0000 (12:36 +0200)]
New events filters (sidebar)
Guillaume Pellerin [Fri, 14 Oct 2016 10:17:15 +0000 (12:17 +0200)]
Fix playlist management, simplify and validate all playlist inclusions in various pages
Emilie [Fri, 14 Oct 2016 10:08:28 +0000 (12:08 +0200)]
Search : gather selected Pages in search result
Jérémy Fabre [Fri, 14 Oct 2016 09:29:47 +0000 (11:29 +0200)]
Network page with infowindows
Guillaume Pellerin [Thu, 13 Oct 2016 20:52:27 +0000 (22:52 +0200)]
Fix playlist templates architecture
Guillaume Pellerin [Thu, 13 Oct 2016 16:34:42 +0000 (18:34 +0200)]
Update media templates
Guillaume Pellerin [Thu, 13 Oct 2016 16:16:22 +0000 (18:16 +0200)]
Merge branch 'playlist' of git+ssh://git.forge.ircam.fr/ircam-www into playlist
Emilie [Thu, 13 Oct 2016 16:16:11 +0000 (18:16 +0200)]
Playlist : add autocomplete on media
Guillaume Pellerin [Thu, 13 Oct 2016 16:16:06 +0000 (18:16 +0200)]
Prepare playlist templates
Guillaume Pellerin [Thu, 13 Oct 2016 15:02:08 +0000 (17:02 +0200)]
Minor fixes
Guillaume Pellerin [Thu, 13 Oct 2016 14:58:11 +0000 (16:58 +0200)]
Unify Audio and Video into Media, then generic Playlist everywhere
Emilie [Thu, 13 Oct 2016 10:19:09 +0000 (12:19 +0200)]
Search : creating page, video, audio, event subtemplate
Emilie [Thu, 13 Oct 2016 09:36:02 +0000 (11:36 +0200)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into search
Emilie [Thu, 13 Oct 2016 09:35:56 +0000 (11:35 +0200)]
mergin
Guillaume Pellerin [Thu, 13 Oct 2016 09:31:42 +0000 (11:31 +0200)]
Fix br
Guillaume Pellerin [Thu, 13 Oct 2016 09:29:51 +0000 (11:29 +0200)]
Add event list date line
Emilie [Thu, 13 Oct 2016 08:17:19 +0000 (10:17 +0200)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into search
Emilie [Wed, 12 Oct 2016 15:11:56 +0000 (17:11 +0200)]
Network : add css class on organization type
Emilie [Wed, 12 Oct 2016 14:58:59 +0000 (16:58 +0200)]
Network : list organizations type + per orga
Emilie [Wed, 12 Oct 2016 14:25:33 +0000 (16:25 +0200)]
Search : get name class
Emilie [Wed, 12 Oct 2016 07:54:10 +0000 (09:54 +0200)]
Search: only page
Guillaume Pellerin [Tue, 11 Oct 2016 15:42:25 +0000 (17:42 +0200)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev
Guillaume Pellerin [Tue, 11 Oct 2016 15:41:35 +0000 (17:41 +0200)]
Add (temporary) audio views, DE-ACTIVATE Audio.SearchableManager (bug adding link in editor)
Jérémy Fabre [Tue, 11 Oct 2016 15:33:21 +0000 (17:33 +0200)]
Fix pagination on home slider
Jérémy Fabre [Tue, 11 Oct 2016 15:01:29 +0000 (17:01 +0200)]
Remove event subtitle from home slider
Jérémy Fabre [Tue, 11 Oct 2016 14:50:46 +0000 (16:50 +0200)]
Fix circle persons list
Jérémy Fabre [Tue, 11 Oct 2016 14:34:57 +0000 (16:34 +0200)]
Circle person style in event details
Jérémy Fabre [Tue, 11 Oct 2016 14:29:21 +0000 (16:29 +0200)]
Reduce the global margins when the screen is smaller than 900 pixels.
Jérémy Fabre [Tue, 11 Oct 2016 13:13:54 +0000 (15:13 +0200)]
Events filters
Jérémy Fabre [Tue, 11 Oct 2016 12:25:32 +0000 (14:25 +0200)]
Fix the labels on network page
Jérémy Fabre [Tue, 11 Oct 2016 12:25:20 +0000 (14:25 +0200)]
Fix JS error
Guillaume Pellerin [Tue, 11 Oct 2016 11:29:48 +0000 (13:29 +0200)]
Fix project list
Guillaume Pellerin [Tue, 11 Oct 2016 10:18:06 +0000 (12:18 +0200)]
Fix double links
Guillaume Pellerin [Tue, 11 Oct 2016 10:14:54 +0000 (12:14 +0200)]
cleanup
Guillaume Pellerin [Tue, 11 Oct 2016 10:07:54 +0000 (12:07 +0200)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev
Guillaume Pellerin [Tue, 11 Oct 2016 09:47:12 +0000 (11:47 +0200)]
Simplify models
Jérémy Fabre [Tue, 11 Oct 2016 09:10:54 +0000 (11:10 +0200)]
Rounded images in candidacy boxes
Jérémy Fabre [Tue, 11 Oct 2016 09:07:12 +0000 (11:07 +0200)]
Add the lead organization logo to the project details
Jérémy Fabre [Tue, 11 Oct 2016 08:59:35 +0000 (10:59 +0200)]
Add the event category to the event details header
Jérémy Fabre [Tue, 11 Oct 2016 08:52:08 +0000 (10:52 +0200)]
Add partners to summary
Guillaume Pellerin [Mon, 10 Oct 2016 15:37:59 +0000 (17:37 +0200)]
Use event.parent images
Jérémy Fabre [Mon, 10 Oct 2016 15:04:06 +0000 (17:04 +0200)]
Add small-text paragraph style to TinyMCE
Jérémy Fabre [Mon, 10 Oct 2016 15:00:53 +0000 (17:00 +0200)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev
Jérémy Fabre [Mon, 10 Oct 2016 15:00:19 +0000 (17:00 +0200)]
Focus on search modal
Guillaume Pellerin [Mon, 10 Oct 2016 14:58:19 +0000 (16:58 +0200)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev
Conflicts:
app/templates/agenda/event_list.html
Guillaume Pellerin [Mon, 10 Oct 2016 14:57:26 +0000 (16:57 +0200)]
Add excluded tag filter
Jérémy Fabre [Mon, 10 Oct 2016 14:52:06 +0000 (16:52 +0200)]
Remove event count from filters
Jérémy Fabre [Mon, 10 Oct 2016 14:45:22 +0000 (16:45 +0200)]
Internal project display
Jérémy Fabre [Mon, 10 Oct 2016 14:31:20 +0000 (16:31 +0200)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev
Jérémy Fabre [Mon, 10 Oct 2016 14:31:16 +0000 (16:31 +0200)]
Events update (list and details)
Guillaume Pellerin [Mon, 10 Oct 2016 14:20:07 +0000 (16:20 +0200)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev
Guillaume Pellerin [Mon, 10 Oct 2016 14:19:40 +0000 (16:19 +0200)]
Add default tag exclude list setting
Jérémy Fabre [Mon, 10 Oct 2016 13:31:30 +0000 (15:31 +0200)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev
Jérémy Fabre [Mon, 10 Oct 2016 13:31:26 +0000 (15:31 +0200)]
Update project list template
Guillaume Pellerin [Mon, 10 Oct 2016 13:26:41 +0000 (15:26 +0200)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev
Guillaume Pellerin [Mon, 10 Oct 2016 13:26:31 +0000 (15:26 +0200)]
Add gitpython
Jérémy Fabre [Mon, 10 Oct 2016 10:59:21 +0000 (12:59 +0200)]
Network page
Emilie [Mon, 10 Oct 2016 09:29:17 +0000 (11:29 +0200)]
merge conflict
Emilie [Mon, 10 Oct 2016 09:24:01 +0000 (11:24 +0200)]
Media : media shutter on home
Jérémy Fabre [Mon, 10 Oct 2016 08:37:21 +0000 (10:37 +0200)]
Add an empty media shutter template
Guillaume Pellerin [Mon, 10 Oct 2016 08:12:15 +0000 (10:12 +0200)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev
Guillaume Pellerin [Mon, 10 Oct 2016 08:11:52 +0000 (10:11 +0200)]
Fix event list, add product list circled style
projects / mezzo.git / log