|
|
7fbc951a5a
|
Merge branch 'release/0.2.0'
|
2013-10-26 23:07:47 +02:00 |
|
Uwe Kamper
|
6bc87b605c
|
added star to admin tab, changed form order in admin tab
|
2013-10-26 22:56:47 +02:00 |
|
Uwe Kamper
|
1f75194fad
|
c-lab view now requires c-lab-cey group
|
2013-10-26 22:45:02 +02:00 |
|
|
|
643305886d
|
Merge branch 'develop' of github.com:c-base/cbmi into develop
|
2013-10-26 22:41:29 +02:00 |
|
|
|
56c684d355
|
added admin password setting function
|
2013-10-26 22:40:47 +02:00 |
|
|
|
5597676bb5
|
added admin pasword setting function
|
2013-10-26 22:38:57 +02:00 |
|
|
|
0bb8b03fcb
|
add submodule support to dev_setup script
|
2013-10-26 22:25:26 +02:00 |
|
|
|
d24e853fcd
|
show landingpage even if there are no groups, yet
|
2013-10-26 21:35:25 +02:00 |
|
|
|
1ed3f3f4b9
|
add crispy forms to requirements
|
2013-10-26 21:16:41 +02:00 |
|
|
|
4e41472428
|
Merge branch 'hotfix/0.1.3'
|
2013-10-26 20:31:11 +02:00 |
|
|
|
8757f61763
|
fix missing argument
|
2013-10-26 20:30:48 +02:00 |
|
|
|
8e7d266750
|
Merge branch 'hotfix/0.1.2'
|
2013-10-26 20:29:25 +02:00 |
|
|
|
9362b37940
|
fix typo
|
2013-10-26 20:29:18 +02:00 |
|
|
|
b6202300df
|
Merge branch 'hotfix/0.1.1'
|
2013-10-26 20:26:29 +02:00 |
|
|
|
7c74b4c524
|
migration to github
|
2013-10-26 20:26:01 +02:00 |
|
|
|
bbdb446b9b
|
Merge branch 'release/0.1.0'
|
2013-10-26 20:08:25 +02:00 |
|
Uwe Kamper
|
5558882b9a
|
everything except admin works
|
2013-10-26 20:06:42 +02:00 |
|
Uwe Kamper
|
5691659fe1
|
gastropin works
|
2013-10-25 23:15:30 +02:00 |
|
Uwe Kamper
|
c74b6565f9
|
i18n
|
2013-10-25 20:55:36 +02:00 |
|
Uwe Kamper
|
1fc9e1f75d
|
logo and username in menu
|
2013-10-25 20:18:28 +02:00 |
|
Uwe Kamper
|
48698d2679
|
Merge branch 'develop' of dev.c-base.org:cbmi/cbmi into develop
|
2013-10-25 19:35:51 +02:00 |
|
Uwe Kamper
|
7ecf520ec3
|
small error corrections in the templates and forms
|
2013-10-25 19:35:32 +02:00 |
|
|
|
6a1fce091f
|
Merge branch 'develop' of dev.c-base.org:cbmi/cbmi into develop
|
2013-10-25 19:35:01 +02:00 |
|
|
|
0238970f5d
|
c-base-bootstrap added
|
2013-10-25 19:34:07 +02:00 |
|
Uwe Kamper
|
847eb691fe
|
make it pretty
|
2013-10-25 04:24:26 +02:00 |
|
Uwe Kamper
|
96ff186913
|
clean templates, add userdetail and proper landing page
|
2013-10-25 01:03:16 +02:00 |
|
|
|
62443314d9
|
Merge branch 'develop' of dev.c-base.org:cbmi/cbmi into develop
|
2013-10-24 21:46:18 +02:00 |
|
Uwe Kamper
|
413728b24f
|
added nrf24 form and changed message color to blue
|
2013-10-24 21:44:53 +02:00 |
|
|
|
376f0cb9be
|
Merge branch 'develop' of dev.c-base.org:cbmi/cbmi into develop
Conflicts:
.gitignore
cbmi/settings.py
|
2013-10-24 21:35:25 +02:00 |
|
|
|
683b5bcdcf
|
added c-base-bootstrap
|
2013-10-24 21:32:52 +02:00 |
|
|
|
c4d3fb505b
|
added .gitmodules
|
2013-10-24 21:31:37 +02:00 |
|
|
|
623d5131b7
|
moved c-base-bootstrap to its own directory and use submodule
|
2013-10-24 21:28:17 +02:00 |
|
Uwe Kamper
|
8fdc6064fa
|
forms work and are saved to ldap correctly, added RFID form
|
2013-10-24 21:27:15 +02:00 |
|
Uwe Kamper
|
0aade5be94
|
setting wifi presence
|
2013-10-24 01:49:46 +02:00 |
|
Uwe Kamper
|
032bc5acaa
|
added form and view for changing gastro-PINs
|
2013-10-23 00:27:31 +02:00 |
|
|
|
afe60cadb9
|
added smiles local_settings.py
|
2013-10-22 22:32:22 +02:00 |
|
|
|
83d7f19294
|
added local_settings.py
|
2013-10-22 22:31:12 +02:00 |
|
Uwe Kamper
|
e0f53cd529
|
local_settings.py wird ignoriert
|
2013-10-22 22:26:22 +02:00 |
|
|
|
9eca98c1d4
|
sample api app
|
2013-10-20 20:42:13 +02:00 |
|
|
|
0d49874df1
|
bail out on errors
|
2013-10-19 01:38:50 +02:00 |
|
|
|
63ea1be2c8
|
add dev_env_setup.sh
|
2013-10-19 01:09:56 +02:00 |
|
|
|
a5b7dfc60c
|
Init
|
2013-10-19 00:47:24 +02:00 |
|
