Commit graph

129 commits

Author SHA1 Message Date
b32465e85f disabled access control for indoor pin 2018-09-07 11:41:23 +02:00
1ab9f05b2f bootstrap updated 2018-02-14 16:25:15 +01:00
07be8bfbc8 updated settings 2018-02-14 15:59:03 +01:00
f08d98eadb updated guni.sh 2018-02-14 15:58:25 +01:00
4c7d8e75cc temporarily disabled cteward 2018-02-14 15:57:28 +01:00
6934a9eacc bug fix for django 1.8 update ldap group checks 2015-12-01 23:46:36 +01:00
Uwe Kamper
a8ea7e2237 migrations 2015-12-01 22:13:21 +01:00
Uwe Kamper
a153ca8d1c Use e-mail field, add preferred email to main navigation menu #8 2015-12-01 00:42:55 +01:00
Uwe Kamper
eacbb841a7 added preferred email view, added possibility to delete ldap keys (when a None is provided as value 2015-12-01 00:32:51 +01:00
2986d395b2 Merge pull request #7 from baccenfutter/master
add requests to requirememts
2015-10-09 21:48:37 +02:00
036fb7420a add requests to requirememts 2015-10-09 21:47:42 +02:00
78bc4a1e04 fixed bug in admin form due to django upgrade 2015-09-30 09:25:26 +02:00
Uwe Kamper
7dc04063d8 merging bump-django1.8 2015-09-29 21:48:02 +02:00
Uwe Kamper
ebe3a3a7e1 upgrade templates to named urls for django-1.8 2015-09-29 21:34:54 +02:00
43260fb59f first efforts bumping to django-1.8.4
- most things are working
- I had to throw away the db and run `manage.py migrate`
- the top-nav in once logged in is still broken
2015-09-26 19:22:25 +02:00
6748dcc4b7 added uidNumner to admin user list 2015-09-26 17:54:04 +02:00
cd6f655deb added mote details from cteward 2015-09-26 17:24:52 +02:00
ac372412fd indoor pin and cteward integration 2015-09-24 21:40:54 +02:00
0c7b3b9d62 cey members can now also set a c-lab pin 2015-02-25 21:29:25 +01:00
c687310024 Merge pull request #3 from berlincount/bugfix
Bugfix: wrong mailaddress, broken c-portal submodule
2014-11-28 23:53:17 +01:00
Andreas 'count' Kotes
071af9f084 fix some language fuzzyness and adjust some phrases 2014-11-28 21:52:36 +01:00
Andreas 'count' Kotes
9d10168a2d ignore backup files 2014-11-28 21:37:33 +01:00
Andreas 'count' Kotes
950bf17c64 fix mailaddress for buerocratic stuff, remove broken link to balance 2014-11-28 21:03:45 +01:00
Andreas 'count' Kotes
9229206530 fix submodule c-base-bootstrap 2014-11-28 21:00:38 +01:00
5717a10402 Merge branch 'release/0.2.21' 2014-02-13 23:58:05 +01:00
Uwe Kamper
afe6655e84 Resolve an error that corrupts the local database when a user logs in with a mixed-case username 2014-02-13 23:20:20 +01:00
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