|
|
745522ab4b
|
Merge branch 'hotfix/0.2.14'
|
2013-11-24 18:11:32 +01:00 |
|
|
|
1ba9082a19
|
this closed #4
|
2013-11-24 18:10:42 +01:00 |
|
|
|
8e3fc062ff
|
Merge branch 'hotfix/0.2.13'
|
2013-11-23 20:50:53 +01:00 |
|
|
|
b73b7d3d61
|
Merge branch 'develop' into hotfix/0.2.13
|
2013-11-23 20:50:37 +01:00 |
|
|
|
87902e0024
|
including jquery-1.10.1 into sources
|
2013-11-23 20:50:20 +01:00 |
|
|
|
f7fc9e8006
|
Merge branch 'hotfix/0.2.12'
|
2013-11-15 23:06:57 +01:00 |
|
|
|
58dbeac559
|
Merge branch 'develop' of github.com:c-base/cbmi into develop
Conflicts:
account/conf/locale/de/LC_MESSAGES/django.po
|
2013-11-15 23:02:50 +01:00 |
|
|
|
4e25c4eb30
|
fixed i18n
|
2013-11-15 23:00:43 +01:00 |
|
|
|
e7952df108
|
fixed i18n
|
2013-11-15 22:59:34 +01:00 |
|
|
|
c8dad6f2b2
|
Merge branch 'hotfix/0.2.11'
|
2013-11-15 22:00:14 +01:00 |
|
|
|
8cd694c106
|
Revert "Revert "Update django.po: Moar german translations.""
This reverts commit bf0525c06b.
|
2013-11-15 21:57:48 +01:00 |
|
|
|
bf0525c06b
|
Revert "Update django.po: Moar german translations."
This reverts commit 95cf9a6f82.
|
2013-11-14 18:43:19 +01:00 |
|
jaseg
|
95cf9a6f82
|
Update django.po: Moar german translations.
Did I do this right? Was this even the correct file to edit? Please, somebody review this.
|
2013-11-14 12:24:23 -05:00 |
|
|
|
4c390e5d2e
|
Merge branch 'hotfix/0.2.10'
|
2013-11-12 23:42:12 +01:00 |
|
|
|
f127cab3eb
|
Merge branch 'develop' of github.com:c-base/cbmi into develop
|
2013-11-12 21:28:22 +01:00 |
|
|
|
a7d11a9f9d
|
fixed typo
|
2013-11-12 21:28:11 +01:00 |
|
|
|
8bf6c36bcb
|
added real names to admin user list combo
|
2013-11-12 21:28:00 +01:00 |
|
|
|
655adcbed6
|
Merge branch 'hotfix/0.2.9'
|
2013-11-12 20:59:09 +01:00 |
|
Uwe Kamper
|
36b9cfa6f2
|
removed bug in form validation for PINs
|
2013-11-12 20:10:30 +01:00 |
|
|
|
2f7b13ac00
|
Merge branch 'hotfix/0.2.8'
|
2013-11-04 13:48:36 +01:00 |
|
Uwe Kamper
|
661fbad1f8
|
Merge branch 'develop' of github.com:c-base/cbmi into develop
|
2013-11-04 00:15:47 +01:00 |
|
Uwe Kamper
|
25e4b71461
|
Added Hammer Time view
|
2013-11-04 00:15:26 +01:00 |
|
|
|
810447572e
|
Merge branch 'hotfix/0.2.7'
|
2013-11-01 20:13:56 +01:00 |
|
|
|
df5bfbfd42
|
added fix for wifi-password to admin-function
|
2013-11-01 19:34:24 +01:00 |
|
|
|
59e9f2610d
|
Merge branch 'hotfix/0.2.6'
|
2013-10-31 14:11:10 +01:00 |
|
Uwe Kamper
|
53d1ad745c
|
Merge branch 'develop' of github.com:c-base/cbmi into develop
|
2013-10-31 00:29:31 +01:00 |
|
Uwe Kamper
|
7c124bed31
|
Fix 2 Bugs: Password-View did not return a response, Wifi-Password was not set yet. Users had to login with their old password which caused confusion.
|
2013-10-31 00:28:34 +01:00 |
|
|
|
a1882b812f
|
Merge branch 'hotfix/0.2.5'
|
2013-10-29 23:11:35 +01:00 |
|
Uwe Kamper
|
141b48a2c6
|
Merge branch 'develop' of github.com:c-base/cbmi into develop
|
2013-10-29 22:28:46 +01:00 |
|
Uwe Kamper
|
839e5c7749
|
changed form for c-lab and gastro pin to allow 4-8 digits instead of 4-6
|
2013-10-29 22:28:30 +01:00 |
|
|
|
c55ab89ca2
|
Merge branch 'hotfix/0.2.4'
|
2013-10-29 19:54:10 +01:00 |
|
Sven G. Brönstrup
|
f0f33a07d9
|
Fixed CSS for mobile devices
|
2013-10-29 19:43:43 +01:00 |
|
|
|
ca822adb52
|
Merge branch 'hotfix/0.2.3'
|
2013-10-29 19:38:47 +01:00 |
|
Uwe Kamper
|
30e9b85be1
|
Show user's groups in ordered form. Before groups were shown in random order.
|
2013-10-29 18:51:04 +01:00 |
|
|
|
a4e2598e44
|
Merge branch 'hotfix/0.2.2'
|
2013-10-29 18:18:01 +01:00 |
|
|
|
cfd8d0c15d
|
Merge branch 'develop' into hotfix/0.2.2
|
2013-10-29 18:17:43 +01:00 |
|
Uwe Kamper
|
e61e2bda91
|
#14 Number of total active crew members is now on homepage after the login.
|
2013-10-29 04:20:52 +01:00 |
|
Uwe Kamper
|
2b0407eaf6
|
changed testcases to use the functions from password_encryption module
|
2013-10-27 21:14:30 +01:00 |
|
Uwe Kamper
|
5e29478516
|
#11 passwords are now stored with aes-128 encryption
|
2013-10-27 21:13:41 +01:00 |
|
|
|
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 |
|
