Commit graph

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