]>
git.parisson.com Git - mezzo.git/log
Jérémy Fabre [Wed, 27 Jul 2016 15:32:35 +0000 (17:32 +0200)]
Add photo_card in page_card template
Jérémy Fabre [Wed, 27 Jul 2016 14:48:02 +0000 (16:48 +0200)]
Merge branch 'wip' into dev
Jérémy Fabre [Wed, 27 Jul 2016 14:43:43 +0000 (16:43 +0200)]
Implement the page_block style
Emilie [Wed, 27 Jul 2016 14:43:35 +0000 (16:43 +0200)]
Add Photo and BlockPage for Team, Department, Basic page + BooleanField into BlockPage
Jérémy Fabre [Wed, 27 Jul 2016 14:20:51 +0000 (16:20 +0200)]
Move the descendant pages in the page_content block
Jérémy Fabre [Wed, 27 Jul 2016 14:17:41 +0000 (16:17 +0200)]
Add a page_card template for descendant pages
Jérémy Fabre [Wed, 27 Jul 2016 14:04:57 +0000 (16:04 +0200)]
Add a template tag to fetch the childrens of a given page and update the BasicPage, Department and Team templates accordingly
Jérémy Fabre [Wed, 27 Jul 2016 14:02:48 +0000 (16:02 +0200)]
Add new footer menus (vertical and horizontal)
Guillaume Pellerin [Wed, 27 Jul 2016 09:29:33 +0000 (11:29 +0200)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev
Guillaume Pellerin [Wed, 27 Jul 2016 09:28:00 +0000 (11:28 +0200)]
add PageImage
Jérémy Fabre [Tue, 26 Jul 2016 14:46:06 +0000 (16:46 +0200)]
Fix sticky-kit bottomed elements
Jérémy Fabre [Tue, 26 Jul 2016 14:34:43 +0000 (16:34 +0200)]
Department title has now a dashed yellow line
Jérémy Fabre [Tue, 26 Jul 2016 14:33:30 +0000 (16:33 +0200)]
Department and Team templates update
Jérémy Fabre [Tue, 26 Jul 2016 14:33:11 +0000 (16:33 +0200)]
Update page.html
Jérémy Fabre [Tue, 26 Jul 2016 14:32:56 +0000 (16:32 +0200)]
Add pageblocks to basicpage
Jérémy Fabre [Tue, 26 Jul 2016 14:32:33 +0000 (16:32 +0200)]
Add body_class block to base.html
Jérémy Fabre [Tue, 26 Jul 2016 14:32:13 +0000 (16:32 +0200)]
JS Summary can now have multiple content block to scan
Jérémy Fabre [Tue, 26 Jul 2016 14:31:54 +0000 (16:31 +0200)]
Add some CSS helpers
Jérémy Fabre [Tue, 26 Jul 2016 14:31:43 +0000 (16:31 +0200)]
Refactor pattern-bg css class
Jérémy Fabre [Tue, 26 Jul 2016 10:55:00 +0000 (12:55 +0200)]
Refactor the page and basicpage templates
Guillaume Pellerin [Mon, 25 Jul 2016 21:10:41 +0000 (23:10 +0200)]
update team list and detail views (add pageblocks), fix urls
Guillaume Pellerin [Mon, 25 Jul 2016 20:38:29 +0000 (22:38 +0200)]
add department and team templates, ignore comments and blogposts in admin
Jérémy Fabre [Mon, 25 Jul 2016 15:20:47 +0000 (17:20 +0200)]
Truncate the article content in article card template
Jérémy Fabre [Mon, 25 Jul 2016 15:20:24 +0000 (17:20 +0200)]
Update sub-content block in page template
Jérémy Fabre [Mon, 25 Jul 2016 15:20:00 +0000 (17:20 +0200)]
Add subtitle to basicpage template
Jérémy Fabre [Mon, 25 Jul 2016 14:30:27 +0000 (16:30 +0200)]
Refactor page and base templates to work with patterns
Jérémy Fabre [Mon, 25 Jul 2016 14:05:16 +0000 (16:05 +0200)]
Article detail and article card first implementation
Jérémy Fabre [Mon, 25 Jul 2016 14:04:47 +0000 (16:04 +0200)]
Add sub-content to page template
Jérémy Fabre [Mon, 25 Jul 2016 14:04:27 +0000 (16:04 +0200)]
Add a dashed--center css modifier
Jérémy Fabre [Mon, 25 Jul 2016 12:32:42 +0000 (14:32 +0200)]
Add summary with JS implementation (track H2 in page content)
Jérémy Fabre [Mon, 25 Jul 2016 10:52:24 +0000 (12:52 +0200)]
Basicpage template now extends page template. Summary menu first implementation.
Jérémy Fabre [Mon, 25 Jul 2016 09:30:13 +0000 (11:30 +0200)]
Merge branch 'dev' into wip
Jérémy Fabre [Mon, 25 Jul 2016 09:25:36 +0000 (11:25 +0200)]
Add summary tree (no content for the moment)
Guillaume Pellerin [Mon, 25 Jul 2016 00:03:22 +0000 (02:03 +0200)]
ignore doc for the moment
Guillaume Pellerin [Mon, 25 Jul 2016 00:01:50 +0000 (02:01 +0200)]
add page blocks to team pages, add various translations
Guillaume Pellerin [Sun, 24 Jul 2016 23:45:28 +0000 (01:45 +0200)]
TeamAdmin and DepartmentAdmin, add content translations
Guillaume Pellerin [Sun, 24 Jul 2016 23:36:46 +0000 (01:36 +0200)]
add 4th footer menu position option
Guillaume Pellerin [Sun, 24 Jul 2016 23:31:31 +0000 (01:31 +0200)]
reorder admin menu
Guillaume Pellerin [Sun, 24 Jul 2016 23:25:51 +0000 (01:25 +0200)]
Merge branch 'pages' into dev
Guillaume Pellerin [Sun, 24 Jul 2016 23:25:06 +0000 (01:25 +0200)]
teams and departments as Pages
Guillaume Pellerin [Sun, 24 Jul 2016 23:21:26 +0000 (01:21 +0200)]
add migrations
Guillaume Pellerin [Sun, 24 Jul 2016 23:14:44 +0000 (01:14 +0200)]
temporaly fix str(organization)
Guillaume Pellerin [Sun, 24 Jul 2016 23:10:54 +0000 (01:10 +0200)]
more Page models, rebase core
Jérémy Fabre [Thu, 21 Jul 2016 12:49:59 +0000 (14:49 +0200)]
Merge branch 'wip' into dev
Jérémy Fabre [Thu, 21 Jul 2016 12:45:05 +0000 (14:45 +0200)]
Update README
cri [Thu, 21 Jul 2016 12:37:34 +0000 (14:37 +0200)]
update ruby version
Jérémy Fabre [Thu, 21 Jul 2016 12:27:42 +0000 (14:27 +0200)]
Merge branch 'wip' into dev
Jérémy Fabre [Thu, 21 Jul 2016 12:27:32 +0000 (14:27 +0200)]
Add Bundler
Jérémy Fabre [Thu, 21 Jul 2016 12:10:32 +0000 (14:10 +0200)]
Merge branch 'wip' into dev
Jérémy Fabre [Thu, 21 Jul 2016 12:10:05 +0000 (14:10 +0200)]
Fixed Basicpage submenu in responsive mode
Guillaume Pellerin [Thu, 21 Jul 2016 11:56:26 +0000 (13:56 +0200)]
use Slugged for various models
Jérémy Fabre [Thu, 21 Jul 2016 10:15:19 +0000 (12:15 +0200)]
Throttle the window resize event for better performances
Jérémy Fabre [Thu, 21 Jul 2016 10:12:44 +0000 (12:12 +0200)]
Add jQuery throttle-debounce
Jérémy Fabre [Thu, 21 Jul 2016 10:07:49 +0000 (12:07 +0200)]
Add responsive functionnality to Sticky-kit
Jérémy Fabre [Thu, 21 Jul 2016 09:38:34 +0000 (11:38 +0200)]
Basicpage submenu stick in parent
Jérémy Fabre [Thu, 21 Jul 2016 09:26:22 +0000 (11:26 +0200)]
Re-Fix Basicpage submenu
Jérémy Fabre [Thu, 21 Jul 2016 09:24:20 +0000 (11:24 +0200)]
Fix Basicpage submenu
Jérémy Fabre [Thu, 21 Jul 2016 09:23:09 +0000 (11:23 +0200)]
Add Sticky-kit
Jérémy Fabre [Thu, 21 Jul 2016 09:22:50 +0000 (11:22 +0200)]
Basicpage submenu implementation and style
Guillaume Pellerin [Thu, 21 Jul 2016 08:58:47 +0000 (10:58 +0200)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev
Guillaume Pellerin [Thu, 21 Jul 2016 08:58:30 +0000 (10:58 +0200)]
update install doc
Jérémy Fabre [Thu, 21 Jul 2016 07:56:23 +0000 (09:56 +0200)]
Merge branch 'wip' into dev
Guillaume Pellerin [Wed, 20 Jul 2016 19:36:46 +0000 (21:36 +0200)]
Organization.is_on_map = True by default, add migrations
Jérémy Fabre [Wed, 20 Jul 2016 14:36:10 +0000 (16:36 +0200)]
Add blockquote style
Jérémy Fabre [Wed, 20 Jul 2016 14:34:57 +0000 (16:34 +0200)]
Fix pre header width
Jérémy Fabre [Wed, 20 Jul 2016 14:04:42 +0000 (16:04 +0200)]
Update README
Jérémy Fabre [Wed, 20 Jul 2016 14:02:50 +0000 (16:02 +0200)]
Fix the search form
Jérémy Fabre [Wed, 20 Jul 2016 13:58:48 +0000 (15:58 +0200)]
Update styles page
Jérémy Fabre [Wed, 20 Jul 2016 13:46:47 +0000 (15:46 +0200)]
Fix footer scripts
Jérémy Fabre [Wed, 20 Jul 2016 13:44:40 +0000 (15:44 +0200)]
Bower added
Jérémy Fabre [Wed, 20 Jul 2016 13:27:06 +0000 (15:27 +0200)]
Update styles page
Jérémy Fabre [Wed, 20 Jul 2016 13:09:03 +0000 (15:09 +0200)]
Add Department description in header menu
Jérémy Fabre [Wed, 20 Jul 2016 13:04:21 +0000 (15:04 +0200)]
Fix header. Responsive footer implementation
Jérémy Fabre [Wed, 20 Jul 2016 12:12:30 +0000 (14:12 +0200)]
Fix z-index on search
Jérémy Fabre [Wed, 20 Jul 2016 12:11:53 +0000 (14:11 +0200)]
Header menu with submenu
Jérémy Fabre [Wed, 20 Jul 2016 10:07:58 +0000 (12:07 +0200)]
Fix a bug on language switcher
Jérémy Fabre [Wed, 20 Jul 2016 10:05:56 +0000 (12:05 +0200)]
Cleaning the pagination template
Jérémy Fabre [Wed, 20 Jul 2016 09:49:20 +0000 (11:49 +0200)]
Search results base implementation
Jérémy Fabre [Wed, 20 Jul 2016 09:45:27 +0000 (11:45 +0200)]
Search form implementation
Jérémy Fabre [Wed, 20 Jul 2016 09:00:30 +0000 (11:00 +0200)]
Header, footer and basicpage update
Jérémy Fabre [Tue, 19 Jul 2016 13:16:26 +0000 (15:16 +0200)]
Merge branch 'dev' into wip
Jérémy Fabre [Tue, 19 Jul 2016 13:15:56 +0000 (15:15 +0200)]
Update logo, language switcher and breadcrumb
Guillaume Pellerin [Fri, 15 Jul 2016 16:17:41 +0000 (18:17 +0200)]
rm nationalities, fix str in admin person
Guillaume Pellerin [Fri, 15 Jul 2016 16:12:44 +0000 (18:12 +0200)]
bugfix (no unicode in py3)
Guillaume Pellerin [Fri, 15 Jul 2016 16:07:57 +0000 (18:07 +0200)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev
Guillaume Pellerin [Fri, 15 Jul 2016 16:07:19 +0000 (18:07 +0200)]
add nationalities and first project context
Emilie [Fri, 15 Jul 2016 15:32:26 +0000 (17:32 +0200)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev
Emilie [Fri, 15 Jul 2016 15:32:17 +0000 (17:32 +0200)]
tiny mce js
Guillaume Pellerin [Fri, 15 Jul 2016 14:00:54 +0000 (16:00 +0200)]
add various organization views and templates
Jérémy Fabre [Fri, 15 Jul 2016 13:00:39 +0000 (15:00 +0200)]
Update .gitignore
Guillaume Pellerin [Fri, 15 Jul 2016 12:50:23 +0000 (14:50 +0200)]
update locales, gulp build
Guillaume Pellerin [Fri, 15 Jul 2016 12:31:53 +0000 (14:31 +0200)]
update locales
Jérémy Fabre [Fri, 15 Jul 2016 12:30:03 +0000 (14:30 +0200)]
Merge branch 'dev' into wip
Guillaume Pellerin [Fri, 15 Jul 2016 10:39:24 +0000 (12:39 +0200)]
fix debug toobar loading (only in debug mode)
Jérémy Fabre [Fri, 15 Jul 2016 10:26:18 +0000 (12:26 +0200)]
Merge branch 'dev' into wip
Emilie [Fri, 15 Jul 2016 10:14:13 +0000 (12:14 +0200)]
add PATH var in cron command
Emilie [Fri, 15 Jul 2016 09:48:57 +0000 (11:48 +0200)]
update cron + push script
Guillaume Pellerin [Thu, 14 Jul 2016 17:53:08 +0000 (19:53 +0200)]
add basicpage.content translation
Guillaume Pellerin [Thu, 14 Jul 2016 17:50:17 +0000 (19:50 +0200)]
simplify person model and admin field order
Guillaume Pellerin [Thu, 14 Jul 2016 16:57:47 +0000 (18:57 +0200)]
update agenda
projects / mezzo.git / log