Commit graph

103 commits

Author SHA1 Message Date
1cbeb07b1e fixed username case sensitivity problems 2014-02-08 20:39:08 +01:00
a07c196929 Fix typo in german translation 2013-12-17 01:19:37 +01:00
6892ec2e0b Merge branch 'hotfix/0.2.20' 2013-12-01 00:48:28 +01:00
0a5be1626b refactoring localization de 2013-12-01 00:47:24 +01:00
a18d89bb74 Merge branch 'hotfix/0.2.19' 2013-11-30 23:37:41 +01:00
f967460e0c fix typo 2013-11-30 23:36:50 +01:00
1ac9214892 refactored l10n de 2013-11-30 23:36:10 +01:00
15364e48d5 fix usage information 2013-11-25 22:50:40 +01:00
8ed9ffc4ec add usage information 2013-11-25 22:49:37 +01:00
ab5d6b51d5 Merge branch 'hotfix/0.2.18' 2013-11-25 22:46:46 +01:00
56ffaffe86 pop_members.py - this closes #22 2013-11-25 22:45:42 +01:00
980af131ac add link to github/issues (closes #21) 2013-11-25 17:55:39 +01:00
8c5aacd66f Merge branch 'hotfix/0.2.17' 2013-11-25 00:15:25 +01:00
f000503d79 fix bug in check_nickname feature 2013-11-25 00:15:13 +01:00
3fe459dd8d Merge branch 'hotfix/0.2.16' 2013-11-24 23:51:22 +01:00
e66ba60bf1 check nickname feature - closes #20 2013-11-24 23:49:12 +01:00
05f4514b5c cleaning up landing-page 2013-11-24 23:00:49 +01:00
062c45a92d adding is_ceymaster field to profile 2013-11-24 22:56:32 +01:00
91c2c5140b Merge branch 'hotfix/0.2.15' 2013-11-24 21:42:19 +01:00
99859a7c79 bumping admin view to use profile_flag filter 2013-11-24 21:41:40 +01:00
44e95f2638 fixing bug in syncing profile_flags 2013-11-24 21:35:01 +01:00
114572dac2 better aproach of limiting a view to c-lab group 2013-11-24 19:01:32 +01:00
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