Commit Graph

403 Commits

Author SHA1 Message Date
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
5f5369ac87 multiple changes 2020-08-26 05:37:49 +00:00
888500fca8 add a new app for ldap3-authentication (currently, it uses a testserver), login/logout from django, my own decorator 2020-08-25 17:09:08 +00:00
c83a5597fb documents_init 2020-08-24 17:57:00 +00:00
cc410ab78a fix merge conflict 2020-08-24 12:40:00 +00:00
cdf1b8c83a merge_andi 2020-08-24 06:33:19 +00:00
ff6473dddc view fixes 2020-08-24 06:32:03 +00:00
8288ee8766 update members templates and views
members layout is not finished
2020-08-23 18:00:49 +00:00
1311afad9b fixing post index template 2020-08-16 08:01:03 +00:00
9b150028d2 added thumbnails for members 2020-08-16 08:00:43 +00:00
7fa09b1351 Member filters and templates added 2020-08-16 07:05:45 +00:00
41deac2ee3 started templates for members and jobs 2020-08-15 14:56:31 +00:00
b5f632dffe del default value of post_type, update gitignore file 2020-08-15 12:39:48 +00:00
c542d2c45f Merge branch 'master' of https://git.fet.at/bofh/fet2020 2020-08-14 20:43:48 +00:00
eaf79ee823 post default news 2020-08-14 20:43:41 +00:00
4aad5bbaec post hero link 2020-08-14 20:42:36 +00:00
4f88a1f1a3 delete document test 2020-08-14 20:42:01 +00:00
e6d21a3640 fix the template 2020-08-14 20:29:44 +00:00
1845fe73af add ldap3 for authentification (use a testserver), login/logout from django, my own decorator and test-template for login 2020-08-11 14:25:38 +00:00
aad82d1a51 add accounts for login/logout 2020-08-03 23:45:27 +00:00
757f7e19d6 small changes 2020-08-03 23:43:33 +00:00
b31200ab5c Merge branch 'master' into etherpad 2020-07-24 10:44:57 +00:00
e52739890e added documents as a app and model 2020-07-23 07:44:21 +00:00
1e4f5dc850 order of the apps restored (django apps first, custom apps second) 2020-07-19 15:21:16 +00:00