]>
git.parisson.com Git - mezzo.git/log
Emilie [Thu, 29 Dec 2016 17:24:23 +0000 (18:24 +0100)]
[Timesheet] : user dashboard + create form
Emilie [Thu, 29 Dec 2016 14:58:34 +0000 (15:58 +0100)]
[Timesheet] : calculate half days not worked in a week
Emilie [Thu, 29 Dec 2016 11:53:55 +0000 (12:53 +0100)]
[Timesheet] : take in account half days in WeeklyHourVolume
Emilie [Wed, 28 Dec 2016 15:58:53 +0000 (16:58 +0100)]
[Timesheet] : update model
Emilie [Wed, 28 Dec 2016 15:57:58 +0000 (16:57 +0100)]
[Timesheet] : calculate nb of leaved days
Emilie [Wed, 28 Dec 2016 13:51:10 +0000 (14:51 +0100)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into feature/timesheets
Conflicts:
app/organization/network/models.py
Emilie [Wed, 28 Dec 2016 11:31:37 +0000 (12:31 +0100)]
Merge branch 'feature/emilie-timesheet' into dev
Emilie [Wed, 28 Dec 2016 11:29:15 +0000 (12:29 +0100)]
[Timesheet] : clean + improve admin view
Emilie [Wed, 28 Dec 2016 10:39:48 +0000 (11:39 +0100)]
[Timesheet] : update translations
Emilie [Fri, 23 Dec 2016 19:15:09 +0000 (20:15 +0100)]
[Timesheet] : xlsx register id ircam
Emilie [Fri, 23 Dec 2016 18:06:57 +0000 (19:06 +0100)]
[Timesheet] : url to api
Emilie [Fri, 23 Dec 2016 18:03:04 +0000 (19:03 +0100)]
[Timesheet] : url to api
Emilie [Fri, 23 Dec 2016 17:52:03 +0000 (18:52 +0100)]
[Timesheet] : command to import figgo id's
Emilie [Fri, 23 Dec 2016 10:23:25 +0000 (11:23 +0100)]
Merge branch 'feature/emilie-timesheet' into dev
Emilie [Fri, 23 Dec 2016 10:01:53 +0000 (11:01 +0100)]
Merge branch 'feature/emilie-timesheet' of git+ssh://git.forge.ircam.fr/ircam-www into feature/emilie-timesheet
Conflicts:
app/organization/network/admin.py
Emilie [Fri, 23 Dec 2016 09:50:24 +0000 (10:50 +0100)]
[Timesheet] : adding fields in list_display
Emilie [Fri, 23 Dec 2016 09:50:43 +0000 (10:50 +0100)]
Merge branch 'feature/emilie-timesheet' into dev
Emilie [Fri, 23 Dec 2016 09:50:24 +0000 (10:50 +0100)]
[Timesheet] : adding fields in list_display
Emilie [Fri, 23 Dec 2016 09:37:14 +0000 (10:37 +0100)]
Merge branch 'feature/emilie-timesheet' into dev
Emilie [Thu, 22 Dec 2016 19:00:49 +0000 (20:00 +0100)]
[TimeSheet] delete model, change field type and add validator
Emilie [Thu, 22 Dec 2016 16:35:40 +0000 (17:35 +0100)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev
Emilie [Thu, 22 Dec 2016 16:34:52 +0000 (17:34 +0100)]
[Timesheet] add weekly hour management
Guillaume Pellerin [Thu, 22 Dec 2016 11:52:36 +0000 (12:52 +0100)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev
Guillaume Pellerin [Thu, 22 Dec 2016 11:52:23 +0000 (12:52 +0100)]
Fix git repo
Guillaume Pellerin [Wed, 21 Dec 2016 16:04:09 +0000 (17:04 +0100)]
Add first timesheets models
Emilie [Wed, 21 Dec 2016 10:23:49 +0000 (11:23 +0100)]
repair script path in install.py
Guillaume Pellerin [Fri, 16 Dec 2016 16:30:40 +0000 (17:30 +0100)]
Use generic service template, the app is now FULLY generic ! :P
Guillaume Pellerin [Fri, 16 Dec 2016 15:09:21 +0000 (16:09 +0100)]
Add OrganizationService and bio
Guillaume Pellerin [Fri, 16 Dec 2016 14:39:44 +0000 (15:39 +0100)]
Cleanup generic doc
Guillaume Pellerin [Fri, 16 Dec 2016 09:57:52 +0000 (10:57 +0100)]
Add license headers with copyrights
Guillaume Pellerin [Thu, 8 Dec 2016 17:29:38 +0000 (18:29 +0100)]
Fix price 0 display
Guillaume Pellerin [Thu, 8 Dec 2016 17:19:05 +0000 (18:19 +0100)]
re-update var
Guillaume Pellerin [Thu, 8 Dec 2016 17:14:19 +0000 (18:14 +0100)]
re-add var
Guillaume Pellerin [Thu, 8 Dec 2016 17:11:21 +0000 (18:11 +0100)]
Fix price==0 but reserve, de-ignore var (!)
Guillaume Pellerin [Thu, 8 Dec 2016 14:07:07 +0000 (15:07 +0100)]
Add touch app/wsgi.py to upgrade.sh
Emilie [Thu, 8 Dec 2016 12:05:44 +0000 (13:05 +0100)]
[Linked orga logo] : version 2 with auto completion on orga + list orga
Guillaume Pellerin [Thu, 8 Dec 2016 10:48:02 +0000 (11:48 +0100)]
Update doc, add gulp port
Guillaume Pellerin [Wed, 7 Dec 2016 09:59:45 +0000 (10:59 +0100)]
Add bower allow-root option
Guillaume Pellerin [Tue, 6 Dec 2016 17:53:27 +0000 (18:53 +0100)]
Increase content logo size
Guillaume Pellerin [Tue, 6 Dec 2016 09:36:46 +0000 (10:36 +0100)]
Fix organization order
Guillaume Pellerin [Mon, 5 Dec 2016 18:53:02 +0000 (19:53 +0100)]
Fix organization order, rename context variable (no caps plz!)
Guillaume Pellerin [Mon, 5 Dec 2016 17:15:37 +0000 (18:15 +0100)]
Use organization.order for content sorting
Guillaume Pellerin [Mon, 5 Dec 2016 17:10:04 +0000 (18:10 +0100)]
Fix --allow-root
Guillaume Pellerin [Mon, 5 Dec 2016 16:50:49 +0000 (17:50 +0100)]
Use external deb repo ATM
Guillaume Pellerin [Mon, 5 Dec 2016 14:39:28 +0000 (15:39 +0100)]
Add order field to Organization, add various migrations (mainly for image fields)
Guillaume Pellerin [Mon, 5 Dec 2016 14:33:34 +0000 (15:33 +0100)]
Add readme build script
Guillaume Pellerin [Mon, 5 Dec 2016 14:32:43 +0000 (15:32 +0100)]
Update README and doc build scripts
Guillaume Pellerin [Mon, 5 Dec 2016 14:26:04 +0000 (15:26 +0100)]
Reorder Dockerfile
Guillaume Pellerin [Mon, 5 Dec 2016 14:21:26 +0000 (15:21 +0100)]
Add all front tools to build it from app container, update doc
Guillaume Pellerin [Mon, 5 Dec 2016 12:25:07 +0000 (13:25 +0100)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev
Guillaume Pellerin [Mon, 5 Dec 2016 12:24:43 +0000 (13:24 +0100)]
Fix doc path
Emilie [Mon, 5 Dec 2016 11:26:51 +0000 (12:26 +0100)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev
Emilie [Mon, 5 Dec 2016 11:26:38 +0000 (12:26 +0100)]
[Linked organization] Reduce margin
Guillaume Pellerin [Mon, 5 Dec 2016 10:55:41 +0000 (11:55 +0100)]
doc: pip -U
Guillaume Pellerin [Mon, 5 Dec 2016 10:54:23 +0000 (11:54 +0100)]
Add doc deps
Guillaume Pellerin [Mon, 5 Dec 2016 10:52:57 +0000 (11:52 +0100)]
Add make doc path
Guillaume Pellerin [Mon, 5 Dec 2016 09:45:16 +0000 (10:45 +0100)]
Fix path, add doc build to upgrade
Guillaume Pellerin [Mon, 5 Dec 2016 09:37:36 +0000 (10:37 +0100)]
Rename scripts
Guillaume Pellerin [Mon, 5 Dec 2016 09:36:13 +0000 (10:36 +0100)]
Fix db restore path
Guillaume Pellerin [Mon, 5 Dec 2016 09:34:18 +0000 (10:34 +0100)]
Fix blocks in 500
Guillaume Pellerin [Mon, 5 Dec 2016 09:32:01 +0000 (10:32 +0100)]
Fix double block
Guillaume Pellerin [Mon, 5 Dec 2016 00:45:10 +0000 (01:45 +0100)]
Fix many pathsi and args, fix doc
Guillaume Pellerin [Mon, 5 Dec 2016 00:12:28 +0000 (01:12 +0100)]
Merge branch 'feature/package' into dev
Conflicts:
.gitignore
Guillaume Pellerin [Mon, 5 Dec 2016 00:11:49 +0000 (01:11 +0100)]
Add doc to web server
Guillaume Pellerin [Mon, 5 Dec 2016 00:09:13 +0000 (01:09 +0100)]
Add doc and sphix config, break README for the moment...
Guillaume Pellerin [Sun, 4 Dec 2016 22:58:26 +0000 (23:58 +0100)]
Update doc
Guillaume Pellerin [Sun, 4 Dec 2016 22:46:27 +0000 (23:46 +0100)]
Mv scripts to bin
Guillaume Pellerin [Sun, 4 Dec 2016 22:36:59 +0000 (23:36 +0100)]
Merge branch 'dev' into feature/package
Guillaume Pellerin [Fri, 2 Dec 2016 16:38:41 +0000 (17:38 +0100)]
Fix debian install commands
Emilie [Fri, 2 Dec 2016 16:18:05 +0000 (17:18 +0100)]
Linked Organizations : order ManyToMany + less top margin
Guillaume Pellerin [Thu, 1 Dec 2016 23:49:40 +0000 (00:49 +0100)]
mv data to var (apply scripts/fs_migrate.sh before start)
Emilie [Thu, 1 Dec 2016 18:42:29 +0000 (19:42 +0100)]
Designing login page
Emilie [Thu, 1 Dec 2016 17:59:17 +0000 (18:59 +0100)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev
Emilie [Thu, 1 Dec 2016 17:59:10 +0000 (18:59 +0100)]
Linked orga : add logo in custom page too
Guillaume Pellerin [Thu, 1 Dec 2016 17:46:58 +0000 (18:46 +0100)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev
Guillaume Pellerin [Thu, 1 Dec 2016 17:46:23 +0000 (18:46 +0100)]
Add cookie session management, add graphviz and django_extensions
Emilie [Thu, 1 Dec 2016 16:53:01 +0000 (17:53 +0100)]
Limit related organization to research
Emilie [Thu, 1 Dec 2016 15:37:56 +0000 (16:37 +0100)]
Linked orga : content + footer
Jérémy Fabre [Mon, 28 Nov 2016 14:27:16 +0000 (15:27 +0100)]
Fix for Add hover on shutter items
Jérémy Fabre [Mon, 28 Nov 2016 14:25:24 +0000 (15:25 +0100)]
Add hover on shutter items
Emilie [Fri, 25 Nov 2016 18:30:23 +0000 (19:30 +0100)]
Readme: add environments
Emilie [Fri, 25 Nov 2016 18:06:24 +0000 (19:06 +0100)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev
Emilie [Fri, 25 Nov 2016 18:06:04 +0000 (19:06 +0100)]
Deleting ircam ref
Guillaume Pellerin [Fri, 25 Nov 2016 14:17:02 +0000 (15:17 +0100)]
Use custom cartridge repo
Emilie [Thu, 24 Nov 2016 16:49:17 +0000 (17:49 +0100)]
Complete readme
Guillaume Pellerin [Thu, 24 Nov 2016 10:52:59 +0000 (11:52 +0100)]
Update doc, add licence
Guillaume Pellerin [Wed, 23 Nov 2016 19:18:29 +0000 (20:18 +0100)]
Update README sections
Emilie [Wed, 23 Nov 2016 18:23:43 +0000 (19:23 +0100)]
Readme : complete doc
Emilie [Wed, 23 Nov 2016 17:54:41 +0000 (18:54 +0100)]
Autocomplete : add event info while searching : is_parent + date
Emilie [Wed, 23 Nov 2016 11:15:42 +0000 (12:15 +0100)]
Playlists: error var name
Emilie [Wed, 23 Nov 2016 11:08:45 +0000 (12:08 +0100)]
Event : correcting no price comments
Emilie [Wed, 23 Nov 2016 10:52:00 +0000 (11:52 +0100)]
Event : correct date on detail page
Guillaume Pellerin [Tue, 22 Nov 2016 10:05:22 +0000 (11:05 +0100)]
Fix blog post url resolving for displayable_links.js, partially re-add media detail view as a diplayable object
Emilie [Fri, 18 Nov 2016 11:55:30 +0000 (12:55 +0100)]
Clean url / create sitemap / delete festival
Emilie [Fri, 18 Nov 2016 08:48:21 +0000 (09:48 +0100)]
update translations
Emilie [Thu, 17 Nov 2016 16:42:58 +0000 (17:42 +0100)]
Event date : request optimization + home display
Emilie [Thu, 17 Nov 2016 15:08:15 +0000 (16:08 +0100)]
Event : correctin EN date
Emilie [Thu, 17 Nov 2016 14:20:12 +0000 (15:20 +0100)]
Separator hr missing > resolved
Emilie [Thu, 17 Nov 2016 11:51:07 +0000 (12:51 +0100)]
Event : format date FR / EN
Guillaume Pellerin [Tue, 15 Nov 2016 12:41:14 +0000 (13:41 +0100)]
Fix safe content
projects / mezzo.git / log