]>
git.parisson.com Git - mezzo.git/log
Guillaume Pellerin [Thu, 26 Jan 2017 17:01:02 +0000 (18:01 +0100)]
no local grappelli-safe
Guillaume Pellerin [Thu, 26 Jan 2017 14:57:43 +0000 (15:57 +0100)]
Merge branch 'master' of git+ssh://git.forge.ircam.fr/ircam-www
Conflicts:
docker-compose.yml
lib/mezzanine-agenda
var
Emilie Zawadzki [Thu, 26 Jan 2017 14:54:49 +0000 (15:54 +0100)]
Merge branch 'dev'
Emilie Zawadzki [Thu, 26 Jan 2017 14:54:41 +0000 (15:54 +0100)]
Dockerfile : add -y to install apt-transport-https
Emilie Zawadzki [Thu, 19 Jan 2017 20:15:00 +0000 (21:15 +0100)]
Merge branch 'dev'
Emilie Zawadzki [Thu, 19 Jan 2017 20:14:14 +0000 (21:14 +0100)]
[Timesheet] : add holidays + leave days fix
Emilie Zawadzki [Thu, 19 Jan 2017 16:03:11 +0000 (17:03 +0100)]
oMerge branch 'dev'
Emilie Zawadzki [Thu, 19 Jan 2017 16:02:15 +0000 (17:02 +0100)]
[Timesheet] : layout xls
Emilie Zawadzki [Wed, 18 Jan 2017 13:28:28 +0000 (14:28 +0100)]
Merge branch 'master' of git+ssh://git.forge.ircam.fr/ircam-www
Emilie Zawadzki [Wed, 18 Jan 2017 13:27:54 +0000 (14:27 +0100)]
Merge branch 'dev'
Emilie Zawadzki [Wed, 18 Jan 2017 13:26:03 +0000 (14:26 +0100)]
[Timesheet] : dashboard + style
Emilie Zawadzki [Tue, 17 Jan 2017 18:59:48 +0000 (19:59 +0100)]
[Timesheet] : export timesheet with leaved days
Emilie Zawadzki [Mon, 16 Jan 2017 16:16:56 +0000 (17:16 +0100)]
[Timesheet] : optimizing import
CRI - IRCAM [Mon, 16 Jan 2017 12:37:34 +0000 (13:37 +0100)]
Fix prod port, use build image
CRI - IRCAM [Mon, 16 Jan 2017 12:02:28 +0000 (13:02 +0100)]
Merge branch 'master' of git+ssh://git.forge.ircam.fr/ircam-www
Emilie Zawadzki [Mon, 16 Jan 2017 12:02:12 +0000 (13:02 +0100)]
Merge branch 'dev'
Guillaume Pellerin [Mon, 16 Jan 2017 11:16:14 +0000 (12:16 +0100)]
Fix lib volumes in dev mode, add front building in init.sh
Emilie Zawadzki [Fri, 13 Jan 2017 18:05:18 +0000 (19:05 +0100)]
[Timesheet] : export timesheet [WIP]
Emilie Zawadzki [Wed, 11 Jan 2017 16:58:34 +0000 (17:58 +0100)]
[Timesheet] : add pandas lib
Emilie Zawadzki [Wed, 11 Jan 2017 16:57:56 +0000 (17:57 +0100)]
[Timesheet] : cleaning
Emilie Zawadzki [Wed, 11 Jan 2017 16:24:20 +0000 (17:24 +0100)]
[Timesheet] : update network and project models
Emilie Zawadzki [Wed, 11 Jan 2017 16:23:07 +0000 (17:23 +0100)]
[Timesheet] : import projects > ok
Emilie Zawadzki [Wed, 11 Jan 2017 09:36:04 +0000 (10:36 +0100)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into feature/timesheets
Emilie Zawadzki [Fri, 6 Jan 2017 16:41:59 +0000 (17:41 +0100)]
[Timesheet] : project import + model updates
Emilie Zawadzki [Thu, 5 Jan 2017 18:03:05 +0000 (19:03 +0100)]
[Timesheet] : test case utils + util function to get nb of half days in worked week days
Guillaume Pellerin [Thu, 5 Jan 2017 17:16:47 +0000 (18:16 +0100)]
Fix ports
Guillaume Pellerin [Thu, 5 Jan 2017 17:13:55 +0000 (18:13 +0100)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www
Guillaume Pellerin [Thu, 5 Jan 2017 17:13:46 +0000 (18:13 +0100)]
Fix no newsletter
Guillaume Pellerin [Thu, 5 Jan 2017 17:10:01 +0000 (18:10 +0100)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www
Conflicts:
.gitignore
app/bin/app.sh
Guillaume Pellerin [Thu, 5 Jan 2017 17:06:20 +0000 (18:06 +0100)]
Merge branch 'dev' of git+ssh://git.forge.ircam.fr/ircam-www into dev
Guillaume Pellerin [Thu, 5 Jan 2017 17:05:28 +0000 (18:05 +0100)]
Fix init, add logo_header and logo_footer image property in order to feed header and footer logos
Emilie Zawadzki [Thu, 5 Jan 2017 15:41:06 +0000 (16:41 +0100)]
[Timesheet] : add validation + accounting date
CRI - IRCAM [Thu, 5 Jan 2017 14:52:38 +0000 (15:52 +0100)]
Merge branch 'master' of git+ssh://git.forge.ircam.fr/ircam-www
Emilie Zawadzki [Thu, 5 Jan 2017 14:52:13 +0000 (15:52 +0100)]
Merge branch 'dev'
Emilie Zawadzki [Thu, 5 Jan 2017 14:52:02 +0000 (15:52 +0100)]
re do relative url for eve
Emilie Zawadzki [Thu, 5 Jan 2017 12:11:59 +0000 (13:11 +0100)]
[Timesheet] : import ircam time sheet : add logging
CRI - IRCAM [Thu, 5 Jan 2017 11:40:02 +0000 (12:40 +0100)]
Merge branch 'master' of git+ssh://git.forge.ircam.fr/ircam-www
Emilie Zawadzki [Thu, 5 Jan 2017 11:39:49 +0000 (12:39 +0100)]
Merge branch 'dev'
Emilie Zawadzki [Thu, 5 Jan 2017 11:39:41 +0000 (12:39 +0100)]
add https to eve url
CRI - IRCAM [Thu, 5 Jan 2017 11:35:37 +0000 (12:35 +0100)]
Merge branch 'master' of git+ssh://git.forge.ircam.fr/ircam-www
Emilie Zawadzki [Thu, 5 Jan 2017 11:35:10 +0000 (12:35 +0100)]
Merge branch 'master' of git+ssh://git.forge.ircam.fr/ircam-www
Emilie Zawadzki [Thu, 5 Jan 2017 11:34:52 +0000 (12:34 +0100)]
relative eve url
CRI - IRCAM [Wed, 4 Jan 2017 17:47:29 +0000 (18:47 +0100)]
Merge branch 'master' of git+ssh://git.forge.ircam.fr/ircam-www
Guillaume Pellerin [Wed, 4 Jan 2017 17:47:23 +0000 (18:47 +0100)]
Merge branch 'dev'
Guillaume Pellerin [Wed, 4 Jan 2017 17:47:08 +0000 (18:47 +0100)]
Fix content
CRI - IRCAM [Wed, 4 Jan 2017 17:37:55 +0000 (18:37 +0100)]
Merge branch 'master' of git+ssh://git.forge.ircam.fr/ircam-www
Guillaume Pellerin [Wed, 4 Jan 2017 17:37:04 +0000 (18:37 +0100)]
Merge branch 'dev'
Guillaume Pellerin [Wed, 4 Jan 2017 17:35:32 +0000 (18:35 +0100)]
Add ProjectBlogPage and related views with login required content
Guillaume Pellerin [Wed, 4 Jan 2017 15:50:39 +0000 (16:50 +0100)]
Re-add init script including migration and fixture import
Guillaume Pellerin [Wed, 4 Jan 2017 12:33:52 +0000 (13:33 +0100)]
Empty
CRI - IRCAM [Wed, 4 Jan 2017 12:34:29 +0000 (13:34 +0100)]
Merge branch 'master' of git+ssh://git.forge.ircam.fr/ircam-www
Guillaume Pellerin [Wed, 4 Jan 2017 12:33:52 +0000 (13:33 +0100)]
Fix archive listing for current year #480
CRI - IRCAM [Wed, 4 Jan 2017 11:21:49 +0000 (12:21 +0100)]
Merge branch 'master' of git+ssh://git.forge.ircam.fr/ircam-www
Guillaume Pellerin [Tue, 3 Jan 2017 23:02:49 +0000 (00:02 +0100)]
Merge branch 'master' of git+ssh://git.forge.ircam.fr/ircam-www
Conflicts:
app/bin/app.sh
docker-compose.yml
var
Guillaume Pellerin [Tue, 3 Jan 2017 22:57:43 +0000 (23:57 +0100)]
Change ports
Guillaume Pellerin [Tue, 3 Jan 2017 22:56:44 +0000 (23:56 +0100)]
rename debian-requirements
Guillaume Pellerin [Tue, 3 Jan 2017 22:53:06 +0000 (23:53 +0100)]
Fix bowerrc
Guillaume Pellerin [Tue, 3 Jan 2017 22:33:59 +0000 (23:33 +0100)]
Add default organization creation command, cleanup
Guillaume Pellerin [Tue, 3 Jan 2017 17:03:17 +0000 (18:03 +0100)]
Fix account block
Guillaume Pellerin [Tue, 3 Jan 2017 15:59:31 +0000 (16:59 +0100)]
Add login for blocks, add project block template with login option
Guillaume Pellerin [Tue, 3 Jan 2017 11:02:00 +0000 (12:02 +0100)]
undo staging install
CRI - IRCAM [Mon, 2 Jan 2017 09:13:56 +0000 (10:13 +0100)]
Merge branch 'master' of git+ssh://git.forge.ircam.fr/ircam-www
Emilie [Mon, 2 Jan 2017 09:11:14 +0000 (10:11 +0100)]
Merge branch 'dev'
Emilie [Mon, 2 Jan 2017 09:10:36 +0000 (10:10 +0100)]
[Timesheet] : login required on timesheet
Emilie [Fri, 30 Dec 2016 18:31:42 +0000 (19:31 +0100)]
[Timesheet] : import timesheet ok, workpackage missing
Emilie [Fri, 30 Dec 2016 18:30:37 +0000 (19:30 +0100)]
[Timesheet] : improve model + admin
Emilie [Fri, 30 Dec 2016 16:16:36 +0000 (17:16 +0100)]
[Timesheet] : add filter on projects
Emilie [Fri, 30 Dec 2016 10:46:12 +0000 (11:46 +0100)]
[Timesheet] : strip value of register id
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
CRI - IRCAM [Thu, 29 Dec 2016 13:26:04 +0000 (14:26 +0100)]
Merge branch 'master' of git+ssh://git.forge.ircam.fr/ircam-www
CRI - IRCAM [Thu, 29 Dec 2016 13:25:41 +0000 (14:25 +0100)]
specify image to start to container app
Emilie [Thu, 29 Dec 2016 13:18:11 +0000 (14:18 +0100)]
Merge branch 'dev'
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:56 +0000 (12:31 +0100)]
Merge branch 'feature/emilie-timesheet'
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
Guillaume Pellerin [Thu, 22 Dec 2016 18:26:19 +0000 (19:26 +0100)]
Rm last unused submodules
Guillaume Pellerin [Thu, 22 Dec 2016 18:23:15 +0000 (19:23 +0100)]
Fix submodules
Guillaume Pellerin [Thu, 22 Dec 2016 18:17:48 +0000 (19:17 +0100)]
Fix mezzanine-agenda default address
Guillaume Pellerin [Thu, 22 Dec 2016 18:14:27 +0000 (19:14 +0100)]
rm modules
Guillaume Pellerin [Thu, 22 Dec 2016 18:12:40 +0000 (19:12 +0100)]
Remove unused modules
Guillaume Pellerin [Thu, 22 Dec 2016 17:34:19 +0000 (18:34 +0100)]
Merge branch 'master' of github.com:yomguy/mezzanine-organization
Guillaume Pellerin [Thu, 22 Dec 2016 17:34:03 +0000 (18:34 +0100)]
Cleanup submodules
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
projects / mezzo.git / log