PYROS-IRAP / pyros | GitLab

30 Mar, 2016

12 commits

28f78bde updated requirements Browse Code »

Etienne Pallier
2016-03-30 22:53:43 +0200
ec53ef17 Merge branch 'master' of https://gitlab.irap.omp.eu/epallier/pyros.git Browse Code »

Etienne Pallier
2016-03-30 18:16:14 +0200
90db2cdb commented the last lines Browse Code »

Etienne Pallier
2016-03-30 18:16:07 +0200
8d15936a Merge branch 'master' of https://gitlab.irap.omp.eu/epallier/pyros.git Browse Code »

haribo
2016-03-30 17:48:18 +0200
62229d51 began dashboard (mainpage & empty secondary pages) Browse Code »

haribo
2016-03-30 17:48:08 +0200
f4df5401 ignore migrations Browse Code »

Etienne Pallier
2016-03-30 17:46:31 +0200
f00fcf33 Merge branch 'master' of https://gitlab.irap.omp.eu/epallier/pyros.git ... Browse Code »
```
Conflicts:
	src/pyrosapp/migrations/0001_initial.py
```
Etienne Pallier
2016-03-30 17:44:45 +0200
58fb93c1 delete migrations from git repo Browse Code »

Etienne Pallier
2016-03-30 17:39:33 +0200
9665f7a2 Merge branch 'master' of https://gitlab.irap.omp.eu/epallier/pyros.git Browse Code »

haribo
2016-03-30 14:35:12 +0200
cae4b343 deleted conflicting migrations ... Browse Code »
```
created dashboard application
```
haribo
2016-03-30 14:35:06 +0200
1a8abf18 updated install doc Browse Code »

Etienne Pallier
2016-03-30 12:02:39 +0200
3cc75c0f other tests ... Browse Code »
```
sqlite support (#3415)
default values for booleans (#3404)
```
haribo
2016-03-30 11:22:15 +0200

29 Mar, 2016

9 commits

278d0174 Merge branch 'master' of https://gitlab.irap.omp.eu/epallier/pyros.git Browse Code »

haribo
2016-03-29 18:20:24 +0200
6d86da1b fix #3400, #3401, #3402 ... Browse Code »
```
Tests done in pyrosapp.test.py (#3406)
```
haribo
2016-03-29 18:20:16 +0200
b19bc2d1 is_alert default false Browse Code »

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

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

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

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

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

26 Mar, 2016

1 commit

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

25 Mar, 2016

2 commits

480c0c02 bugfix Browse Code »

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

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

24 Mar, 2016

11 commits

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

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

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

haribo
2016-03-24 17:36:00 +0100
62b32d47 Merge branch 'master' of https://gitlab.irap.omp.eu/epallier/pyros.git Browse Code »

haribo
2016-03-24 16:47:08 +0100
6a5b7e66 update .pydevproject Browse Code »

Etienne Pallier
2016-03-24 16:45:33 +0100
5e5f0d2e Merge branch 'master' of https://gitlab.irap.omp.eu/epallier/pyros.git Browse Code »

haribo
2016-03-24 16:41:25 +0100
7b3a0a8f Merge branch 'master' of https://gitlab.irap.omp.eu/epallier/pyros.git ... Browse Code »
```
Conflicts:
	.project
	.pydevproject
```
Etienne Pallier
2016-03-24 16:39:48 +0100
1ff79f8d .project and .pydev Browse Code »

Etienne Pallier
2016-03-24 16:33:59 +0100
29bcce36 test pull Browse Code »

haribo
2016-03-24 16:23:48 +0100
6bbc662a ignore .project and .pydevproject Browse Code »

Etienne Pallier
2016-03-24 16:18:58 +0100
509509a8 Replacing admin.py and models.py by customized versions (post-install ... Browse Code »
```
configuration)
```
haribo
2016-03-24 12:53:07 +0100

22 Mar, 2016

1 commit

e649dbb9 INSTALLATION DOC and REQUIREMENTS Browse Code »

Etienne Pallier
2016-03-22 18:15:54 +0100

21 Mar, 2016

2 commits

64501c9d first full project commit Browse Code »

Etienne Pallier
2016-03-21 16:54:13 +0100
9c7128ce first commit Browse Code »

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