|
|
2cf7108236
|
Merge branch 'master' of https://git.fet.at/bofh/fet2020
|
2020-09-05 09:57:04 +00:00 |
|
|
|
b578f7679c
|
update member view (add jobs for each member, delete one grid style)
|
2020-09-05 09:51:47 +00:00 |
|
|
|
36761ac4d5
|
Design Job Grid
|
2020-09-05 07:48:45 +00:00 |
|
|
|
992ddcced1
|
update meeting show at home (shows last and next one), update clean function of meeting
|
2020-09-03 13:58:39 +00:00 |
|
|
|
05aa3ddf5d
|
make master pep8-ready again
|
2020-09-03 09:02:14 +00:00 |
|
|
|
cb5e50502c
|
Merge branch 'ldap_auth' of bofh/fet2020 into master
|
2020-09-03 10:51:04 +02:00 |
|
|
|
3304464294
|
Merge branch 'ldap_auth' of https://git.fet.at/bofh/fet2020 into ldap_auth
|
2020-09-03 08:47:27 +00:00 |
|
|
|
b6bb067068
|
fix permission
|
2020-09-03 08:46:18 +00:00 |
|
|
|
ee2c846a41
|
ldap3-authentication works now with fet server
|
2020-09-03 08:46:18 +00:00 |
|
|
|
be572eedeb
|
add login/logout to home, add 'only authenticated users are allowed to go to admin view'
|
2020-09-03 08:46:18 +00:00 |
|
|
|
ffa248ce03
|
add a new app for ldap3-authentication (currently, it uses a testserver), login/logout from django, my own decorator
|
2020-09-03 08:46:18 +00:00 |
|
|
|
290791465c
|
is fetsitzung field removed from api
|
2020-09-03 05:54:51 +00:00 |
|
|
|
9f1aa76708
|
fix permission
|
2020-09-03 00:04:04 +00:00 |
|
|
|
f50d6680e9
|
ldap3-authentication works now with fet server
|
2020-09-02 23:41:05 +00:00 |
|
|
|
cdba99b038
|
fix member missing error
|
2020-09-02 19:35:55 +00:00 |
|
|
|
099cb8a987
|
public_date
|
2020-09-02 19:35:29 +00:00 |
|
|
|
dc1e402e4d
|
Merge branch 'master' of https://git.fet.at/bofh/fet2020
|
2020-09-02 17:31:32 +00:00 |
|
|
|
8d93b8c113
|
fix for tag page
|
2020-09-02 17:31:14 +00:00 |
|
|
|
43f2ccf8d5
|
Merge branch 'ldap_auth' of https://git.fet.at/bofh/fet2020 into ldap_auth
|
2020-08-30 22:10:20 +00:00 |
|
|
|
8fe9d7cfc0
|
add login/logout to home, add 'only authenticated users are allowed to go to admin view'
|
2020-08-30 22:06:36 +00:00 |
|
|
|
dfdd9625fd
|
add a new app for ldap3-authentication (currently, it uses a testserver), login/logout from django, my own decorator
|
2020-08-30 20:02:41 +00:00 |
|
|
|
a8cd21b930
|
fix master AGAIN!
|
2020-08-30 19:59:47 +00:00 |
|
|
|
4a8ea13645
|
make master pep8-ready again
|
2020-08-30 19:55:37 +00:00 |
|
|
|
df958fdded
|
author wieder zurück & events filter
|
2020-08-30 17:56:33 +00:00 |
|
|
|
a74675ed2f
|
recognize internal links job
|
2020-08-30 17:54:59 +00:00 |
|
|
|
7f8bd2240b
|
small fix
|
2020-08-29 13:01:07 +00:00 |
|
|
|
04e7bb911b
|
fix some merge errors
|
2020-08-29 12:00:58 +00:00 |
|
|
|
beec3bf3e7
|
merged
|
2020-08-29 11:49:54 +00:00 |
|
|
|
8eb7f6a1a2
|
ep verbesserung
|
2020-08-29 11:46:07 +00:00 |
|
|
|
6440af89b9
|
diverse verbesserungen posts
|
2020-08-29 11:45:47 +00:00 |
|
|
|
7fff88d167
|
update admin view of event
|
2020-08-28 20:02:55 +00:00 |
|
|
|
02260e7470
|
update admin views
|
2020-08-28 18:27:27 +00:00 |
|
|
|
2dbc08f361
|
delete migrations folder
|
2020-08-28 01:37:07 +00:00 |
|
|
|
605feafa48
|
add cancel button in the admin view
|
2020-08-28 01:30:12 +00:00 |
|
|
|
3c697e3e93
|
add a check if a slug of Fachschaftssitzung exists already
|
2020-08-28 00:25:29 +00:00 |
|
|
|
41a75f16f4
|
add a minimum size of image of members (150x150)
|
2020-08-27 23:30:15 +00:00 |
|
|
|
764bee63f6
|
change image of member from ImageField to ThumbnailerImageField
|
2020-08-27 22:43:04 +00:00 |
|
|
|
37dff3b310
|
calendar is now only future events; posts include members and images
|
2020-08-27 20:01:24 +00:00 |
|
|
|
7faddf6468
|
added local login from django database
|
2020-08-27 20:00:24 +00:00 |
|
|
|
18d519c157
|
add profile view of a member
|
2020-08-27 16:55:55 +00:00 |
|
|
|
c9491f4d43
|
fix merge conflict
|
2020-08-27 15:54:21 +00:00 |
|
|
|
488ef97ba6
|
Merge branch 'master' of https://git.fet.at/bofh/fet2020
|
2020-08-26 20:18:09 +00:00 |
|
|
|
859176d91c
|
merge
|
2020-08-26 20:17:34 +00:00 |
|
|
|
27a55e42e4
|
merge
|
2020-08-26 20:15:01 +00:00 |
|
|
|
9164f13c6a
|
layout events
|
2020-08-26 20:11:57 +00:00 |
|
|
|
e847a2bfc6
|
ep_cookie fixed
|
2020-08-26 20:11:39 +00:00 |
|
|
|
a9b7ca5fae
|
delete app accounts because it is not ready for master, make master pep8-ready again
|
2020-08-26 09:39:11 +00:00 |
|
|
|
037d06f6f7
|
merge 2
|
2020-08-26 05:57:35 +00:00 |
|
|
|
a275ece558
|
merge broken branches
|
2020-08-26 05:55:49 +00:00 |
|
|
|
730604bad0
|
small fixes for ep
|
2020-08-26 05:38:24 +00:00 |
|
