Commit graph

Select branches

Hide pull requests

main

Mono Color

• 35b4313ad1 update dependencies, replace pycrypto with cryptography main smile 2025-04-11 21:44:34 +02:00
• 2623444b11 update requirements smile 2025-04-04 23:52:00 +02:00
• 50d2c402ad remove accounting details from landing page smile 2025-04-04 23:32:38 +02:00
• a9cbe37e9b Merge branch 'django3' of https://github.com/c-base/cbmi into django3 smile 2022-09-27 20:54:38 +02:00
• 7ed4a39b36 upgrade django smile 2022-09-27 20:54:21 +02:00
• e6deff28c4 Merge branch 'django3' of https://github.com/c-base/cbmi into django3 cmile 2022-09-27 20:52:36 +02:00
• 3589cd0c48 get ldap admins directly from ldap cmile 2022-09-27 20:51:40 +02:00
• e8fa8f6d13 django4 fixes smile 2022-06-11 21:10:41 +02:00
• 4bd1b62e64 upgrade to django3.2 cmile 2022-05-25 23:38:10 +02:00
• 191eed1aa4 update ldap url and requirements smile 2021-10-14 10:56:03 +02:00
• 09af25761c
  Fixes IndexError on save with removed member forwarding email (#11) Matthias 2020-12-05 23:23:19 +01:00
• 4f093c0899 fix bug in PIN hash Uwe Kamper 2018-11-07 23:35:27 +01:00
• e502ea7493 fix bug in login page Uwe Kamper 2018-11-07 23:17:18 +01:00
• f7daa526be fixed indoor pin bug smile 2018-11-07 23:05:58 +01:00
• c7cfe9f719 encode bla... cmile 2018-10-05 22:02:08 +02:00
• 3dcd65d7de cleanup cmile 2018-10-04 08:42:58 +02:00
• 3160f5e696 removed debug output smile 2018-10-03 22:21:49 +02:00
• 1c51a7197f fixed loading local_settings and django version in requirements smile 2018-10-03 22:17:33 +02:00
• bd00bc03ce removed cbmi.db cmile 2018-10-03 00:39:43 +02:00
• bc0258ea8f upgrade to django 1.11.16 and python3.6 cmile 2018-10-03 00:16:28 +02:00
• b32465e85f disabled access control for indoor pin smile 2018-09-07 11:41:23 +02:00
• 1ab9f05b2f bootstrap updated smile 2018-02-14 16:25:03 +01:00
• 07be8bfbc8 updated settings smile 2018-02-14 15:59:03 +01:00
• f08d98eadb updated guni.sh smile 2018-02-14 15:58:25 +01:00
• 4c7d8e75cc temporarily disabled cteward smile 2018-02-14 15:57:28 +01:00
• 6934a9eacc bug fix for django 1.8 update ldap group checks smile 2015-12-01 23:46:36 +01:00
• a8ea7e2237 migrations Uwe Kamper 2015-12-01 22:13:21 +01:00
• a153ca8d1c Use e-mail field, add preferred email to main navigation menu #8 Uwe Kamper 2015-12-01 00:42:55 +01:00
• eacbb841a7 added preferred email view, added possibility to delete ldap keys (when a None is provided as value Uwe Kamper 2015-12-01 00:32:51 +01:00
• 2986d395b2 Merge pull request #7 from baccenfutter/master Brian Wiborg 2015-10-09 21:48:37 +02:00
• 036fb7420a add requests to requirememts Brian Wiborg 2015-10-09 21:47:42 +02:00
• 78bc4a1e04 fixed bug in admin form due to django upgrade smile 2015-09-30 09:23:19 +02:00
• 7dc04063d8 merging bump-django1.8 Uwe Kamper 2015-09-29 21:48:02 +02:00
• ebe3a3a7e1 upgrade templates to named urls for django-1.8 Uwe Kamper 2015-09-29 21:34:54 +02:00
• 43260fb59f first efforts bumping to django-1.8.4 Brian Wiborg 2015-09-26 19:22:25 +02:00
• 6748dcc4b7 added uidNumner to admin user list smile 2015-09-26 17:54:04 +02:00
• cd6f655deb added mote details from cteward smile 2015-09-26 17:24:52 +02:00
• ac372412fd indoor pin and cteward integration smile 2015-09-24 21:40:54 +02:00
• 0c7b3b9d62 cey members can now also set a c-lab pin smile 2015-02-25 21:29:25 +01:00
• c687310024 Merge pull request #3 from berlincount/bugfix Brian Wiborg 2014-11-28 23:53:17 +01:00
• 071af9f084 fix some language fuzzyness and adjust some phrases Andreas 'count' Kotes 2014-11-28 21:52:36 +01:00
• 9d10168a2d ignore backup files Andreas 'count' Kotes 2014-11-28 21:37:33 +01:00
• 950bf17c64 fix mailaddress for buerocratic stuff, remove broken link to balance Andreas 'count' Kotes 2014-11-28 21:03:45 +01:00
• 9229206530 fix submodule c-base-bootstrap Andreas 'count' Kotes 2014-11-28 21:00:38 +01:00
• 5717a10402 Merge branch 'release/0.2.21' Brian Wiborg 2014-02-13 23:58:05 +01:00
• afe6655e84 Resolve an error that corrupts the local database when a user logs in with a mixed-case username Uwe Kamper 2014-02-13 23:20:20 +01:00
• 1cbeb07b1e fixed username case sensitivity problems smile 2014-02-08 20:39:08 +01:00
• a07c196929 Fix typo in german translation cketti 2013-12-17 01:19:37 +01:00
• 6892ec2e0b Merge branch 'hotfix/0.2.20' Brian Wiborg 2013-12-01 00:48:28 +01:00
• 0a5be1626b refactoring localization de Brian Wiborg 2013-12-01 00:47:24 +01:00
• a18d89bb74 Merge branch 'hotfix/0.2.19' Brian Wiborg 2013-11-30 23:37:41 +01:00
• f967460e0c fix typo Brian Wiborg 2013-11-30 23:36:50 +01:00
• 1ac9214892 refactored l10n de Brian Wiborg 2013-11-30 23:36:10 +01:00
• 15364e48d5 fix usage information Brian Wiborg 2013-11-25 22:50:40 +01:00
• 8ed9ffc4ec add usage information Brian Wiborg 2013-11-25 22:49:37 +01:00
• ab5d6b51d5 Merge branch 'hotfix/0.2.18' Brian Wiborg 2013-11-25 22:46:46 +01:00
• 56ffaffe86 pop_members.py - this closes #22 Brian Wiborg 2013-11-25 22:45:42 +01:00
• 980af131ac add link to github/issues (closes #21) Brian Wiborg 2013-11-25 17:55:39 +01:00
• 8c5aacd66f Merge branch 'hotfix/0.2.17' Brian Wiborg 2013-11-25 00:15:25 +01:00
• f000503d79 fix bug in check_nickname feature Brian Wiborg 2013-11-25 00:15:13 +01:00
• 3fe459dd8d Merge branch 'hotfix/0.2.16' Brian Wiborg 2013-11-24 23:51:22 +01:00
• e66ba60bf1 check nickname feature - closes #20 Brian Wiborg 2013-11-24 23:49:12 +01:00
• 05f4514b5c cleaning up landing-page Brian Wiborg 2013-11-24 23:00:49 +01:00
• 062c45a92d adding is_ceymaster field to profile Brian Wiborg 2013-11-24 22:56:32 +01:00
• 91c2c5140b Merge branch 'hotfix/0.2.15' Brian Wiborg 2013-11-24 21:42:19 +01:00
• 99859a7c79 bumping admin view to use profile_flag filter Brian Wiborg 2013-11-24 21:41:30 +01:00
• 44e95f2638 fixing bug in syncing profile_flags Brian Wiborg 2013-11-24 21:35:01 +01:00
• 114572dac2 better aproach of limiting a view to c-lab group Brian Wiborg 2013-11-24 19:01:32 +01:00
• 745522ab4b Merge branch 'hotfix/0.2.14' Brian Wiborg 2013-11-24 18:11:32 +01:00
• 1ba9082a19 this closed #4 Brian Wiborg 2013-11-24 18:10:42 +01:00
• 8e3fc062ff Merge branch 'hotfix/0.2.13' Brian Wiborg 2013-11-23 20:50:53 +01:00
• b73b7d3d61 Merge branch 'develop' into hotfix/0.2.13 Brian Wiborg 2013-11-23 20:50:37 +01:00
• 87902e0024 including jquery-1.10.1 into sources Brian Wiborg 2013-11-23 20:50:20 +01:00
• f7fc9e8006 Merge branch 'hotfix/0.2.12' Brian Wiborg 2013-11-15 23:06:57 +01:00
• 58dbeac559 Merge branch 'develop' of github.com:c-base/cbmi into develop smile 2013-11-15 23:02:50 +01:00
• 4e25c4eb30 fixed i18n smile 2013-11-15 23:00:43 +01:00
• e7952df108 fixed i18n smile 2013-11-15 22:59:34 +01:00
• c8dad6f2b2 Merge branch 'hotfix/0.2.11' Brian Wiborg 2013-11-15 22:00:14 +01:00
• 8cd694c106 Revert "Revert "Update django.po: Moar german translations."" Brian Wiborg 2013-11-15 21:57:48 +01:00
• bf0525c06b Revert "Update django.po: Moar german translations." Brian Wiborg 2013-11-14 18:43:19 +01:00
• 95cf9a6f82 Update django.po: Moar german translations. jaseg 2013-11-14 12:24:23 -05:00
• 4c390e5d2e Merge branch 'hotfix/0.2.10' Brian Wiborg 2013-11-12 23:42:12 +01:00
• f127cab3eb Merge branch 'develop' of github.com:c-base/cbmi into develop smile 2013-11-12 21:28:22 +01:00
• a7d11a9f9d fixed typo smile 2013-11-12 21:28:11 +01:00
• 8bf6c36bcb added real names to admin user list combo smile 2013-11-12 21:28:00 +01:00
• 655adcbed6 Merge branch 'hotfix/0.2.9' Brian Wiborg 2013-11-12 20:59:09 +01:00
• 36b9cfa6f2 removed bug in form validation for PINs Uwe Kamper 2013-11-12 20:10:30 +01:00
• 2f7b13ac00 Merge branch 'hotfix/0.2.8' Brian Wiborg 2013-11-04 13:48:36 +01:00
• 661fbad1f8 Merge branch 'develop' of github.com:c-base/cbmi into develop Uwe Kamper 2013-11-04 00:15:47 +01:00
• 25e4b71461 Added Hammer Time view Uwe Kamper 2013-11-04 00:15:26 +01:00
• 810447572e Merge branch 'hotfix/0.2.7' Brian Wiborg 2013-11-01 20:13:56 +01:00
• df5bfbfd42 added fix for wifi-password to admin-function smile 2013-11-01 19:34:24 +01:00
• 59e9f2610d Merge branch 'hotfix/0.2.6' Brian Wiborg 2013-10-31 14:11:10 +01:00
• 53d1ad745c Merge branch 'develop' of github.com:c-base/cbmi into develop Uwe Kamper 2013-10-31 00:29:31 +01:00
• 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. Uwe Kamper 2013-10-31 00:28:34 +01:00
• a1882b812f Merge branch 'hotfix/0.2.5' Brian Wiborg 2013-10-29 23:11:35 +01:00
• 141b48a2c6 Merge branch 'develop' of github.com:c-base/cbmi into develop Uwe Kamper 2013-10-29 22:28:46 +01:00
• 839e5c7749 changed form for c-lab and gastro pin to allow 4-8 digits instead of 4-6 Uwe Kamper 2013-10-29 22:28:30 +01:00
• c55ab89ca2 Merge branch 'hotfix/0.2.4' Brian Wiborg 2013-10-29 19:54:10 +01:00
• f0f33a07d9 Fixed CSS for mobile devices Sven G. Brönstrup 2013-10-29 19:43:43 +01:00