PYROS-IRAP / pyros | GitLab

29 Mar, 2016

6 commits

eebdd3b9 Merge branch 'master' of https://gitlab.irap.omp.eu/epallier/pyros.git ... Browse Dir »
```
Conflicts:
	src/pyrosapp/migrations/0001_initial.py
```
Etienne Pallier
2016-03-29 11:53:16 +0200
a958bda2 ignore Browse Dir »

Etienne Pallier
2016-03-29 11:49:55 +0200
be3c4b48 ignore migrations Browse Dir »

Etienne Pallier
2016-03-29 11:49:08 +0200
ef84dfb8 use global settings.DEBUG (instead of private DEBUG) Browse Dir »

Etienne Pallier
2016-03-29 11:44:54 +0200
0b51a2e3 Merge branch 'master' of https://gitlab.irap.omp.eu/epallier/pyros.git ... Browse Dir »
```
Conflicts:
	src/pyrosapp/models.py
```
haribo
2016-03-29 11:10:00 +0200
4072580f merge Browse Dir »

haribo
2016-03-29 11:08:44 +0200

26 Mar, 2016

1 commit

9a55de81 static files collected with ... Browse Dir »
```
./manage.py collectstatic
```
Etienne Pallier
2016-03-26 08:23:37 +0100

25 Mar, 2016

2 commits

480c0c02 bugfix Browse Dir »

Etienne Pallier
2016-03-25 18:23:47 +0100
c0c999f3 admin : view or edit mode Browse Dir »

Etienne Pallier
2016-03-25 17:51:12 +0100

24 Mar, 2016

5 commits

925c4ccc Merge branch 'master' of https://gitlab.irap.omp.eu/epallier/pyros.git Browse Dir »

Etienne Pallier
2016-03-24 17:51:35 +0100
bc76e5cc modifs Browse Dir »

Etienne Pallier
2016-03-24 17:51:09 +0100
fde1bc96 Link User (now PyrosUser) model to django existing one Browse Dir »

haribo
2016-03-24 17:36:00 +0100
7b3a0a8f Merge branch 'master' of https://gitlab.irap.omp.eu/epallier/pyros.git ... Browse Dir »
```
Conflicts:
	.project
	.pydevproject
```
Etienne Pallier
2016-03-24 16:39:48 +0100
509509a8 Replacing admin.py and models.py by customized versions (post-install ... Browse Dir »
```
configuration)
```
haribo
2016-03-24 12:53:07 +0100

21 Mar, 2016

1 commit

64501c9d first full project commit Browse Dir »

Etienne Pallier
2016-03-21 16:54:13 +0100