Commit Graph

53 Commits

Author SHA1 Message Date
0b05b7d513 merged 2020-09-13 08:22:45 +00:00
c0285001d5 agenda api 2020-09-13 08:20:12 +00:00
5e37fd3da9 small changes (wording+word wrap) 2020-09-09 11:18:33 +00:00
4a22a27248 fix master 2020-09-08 16:14:35 +00:00
dc032e014e merge 2020-09-08 11:55:05 +00:00
5bf1ba3807 protocol & grid post show 2020-09-08 11:52:10 +00:00
bc65cfdcbc add protocoll link if available 2020-09-08 11:35:18 +00:00
f9dbd97a87 Datebox für Posts 2020-09-08 05:53:34 +00:00
6ab25da5c7 add 'show only jobs with active members'; add 'hide subitem if no members' 2020-09-07 11:16:54 +00:00
5026fb1ff8 add 'show members when searching for the correspondent hashtag' 2020-09-07 10:20:05 +00:00
a8af49264e update anchor tags 2020-09-06 10:26:10 +00:00
6fb036d0f1 add anchor tags to jobs, add http404 response 2020-09-06 10:00:34 +00:00
b21402f7ae fix 'go next' in articles and meeting-posts and member image url in posts 2020-09-05 18:20:47 +00:00
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
cb5e50502c Merge branch 'ldap_auth' of bofh/fet2020 into master 2020-09-03 10:51:04 +02: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
cdba99b038 fix member missing error 2020-09-02 19:35:55 +00:00
8d93b8c113 fix for tag page 2020-09-02 17:31:14 +00:00
df958fdded author wieder zurück & events filter 2020-08-30 17:56:33 +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
6440af89b9 diverse verbesserungen posts 2020-08-29 11:45:47 +00:00
02260e7470 update admin views 2020-08-28 18:27:27 +00:00
605feafa48 add cancel button in the admin view 2020-08-28 01:30:12 +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
18d519c157 add profile view of a member 2020-08-27 16:55:55 +00:00
859176d91c merge 2020-08-26 20:17:34 +00:00
9164f13c6a layout events 2020-08-26 20:11:57 +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
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
4aad5bbaec post hero link 2020-08-14 20:42:36 +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
e52739890e added documents as a app and model 2020-07-23 07:44:21 +00:00
8deb701204 Merge remote-tracking branch 'origin' 2020-07-16 16:10:40 +00:00