Commit Graph

263 Commits (f0d686bc87baf6e1dcc2943cb7bf9523ab5fab59)
 

Author SHA1 Message Date
Schlabonski 6a85729f38 Merge pull request #20 from Schlabonski/member_lists
Member lists
9 years ago
Schlabonski 8aabfdf4a4 Merge branch 'master' into member_lists 9 years ago
Schlabonski d5d8ae4099 Merge branch 'master' into member_lists 9 years ago
Schlabonski 201323214d implements klettertreff basic model 9 years ago
relnod b7c3b44827 Merge pull request #19 from Schlabonski/member_model
updated member model
9 years ago
Christian Merten 330259289c Merge pull request #18 from Schlabonski/subscribe
add subscribe option
9 years ago
Christian Merten 42fed9ed67 add subscribe option 9 years ago
Paul Schiffers deca8dcb84 updated member model 9 years ago
Christian Merten 8b970095aa Merge pull request #17 from Schlabonski/subscribe
add gets_newsletter field to members
9 years ago
relnod a07c0f1bf2 Merge pull request #16 from Schlabonski/material
add real quantity
9 years ago
Paul Schiffers ab2868db41 add real quantity 9 years ago
Christian Merten 222b9ab428 add gets_newsletter field to members 9 years ago
Christian Merten 90b2d29f9b Merge branch 'newsletter_self' 9 years ago
Christian Merten 44fd6dfdde merge master into newsletter 9 years ago
Christian Merten e5b0085f3a Merge branch 'newsletter_self' of https://github.com/Schlabonski/jdav_lb_webapp into newsletter_self 9 years ago
Christian Merten e2751b22b1 group select now many to many field 9 years ago
Schlabonski f9d85d0337 Merge branch 'master' of https://github.com/Schlabonski/jdav_lb_webapp 9 years ago
Schlabonski cb7d77f0da Merge branch 'newsletter_self' of https://github.com/Schlabonski/jdav_lb_webapp into newsletter_self 9 years ago
Schlabonski 6a011dfd1b implement the funcitonality of creating member lists in the member app 9 years ago
relnod 46877e7f17 Merge pull request #13 from Schlabonski/material
Material
9 years ago
Christian Merten 4ce74c2efc fix template overriding 9 years ago
Paul Schiffers eb5b466c9f add not too old filter 9 years ago
Christian Merten 87c5847e24 fix message admin 9 years ago
Christian Merten febdff7602 add newsletter send button 9 years ago
Schlabonski 8ab6694f7f Update README.md 9 years ago
Christian Merten 0b9d363931 not working send button, confirm send message 9 years ago
Christian Merten 59f7139c52 update requirements 9 years ago
Paul Schiffers 300dd68684 added file for default fields in database 9 years ago
Schlabonski 31b99057f4 update gitignore 9 years ago
Schlabonski 5b25ae7a80 Merge pull request #7 from Schlabonski/development
Merge development into master

The issues with regards to member and material app as well as localization are solved, so this is a good time for a merge.
10 years ago
Schlabonski 6d4b3c8360 Merge branch 'master' into development 10 years ago
Christian Merten 52d0431ce3 add newsletter views 10 years ago
Christian Merten a826849031 enable mailing and add translations 10 years ago
Christian Merten 98c24dc926 add mailer system 10 years ago
Christian Merten d7409daa7a add translations of startpage 10 years ago
Christian Merten 1e465b823f add translations to models 10 years ago
Christian Merten 96eabed66b remove manual formatting 10 years ago
Christian Merten 8c95c045c6 remove print statement 10 years ago
Christian Merten 780e17c811 localization in url 10 years ago
Christian Merten 14f8255bd7 added localization 10 years ago
Schlabonski 2d1f013e5c allow european date format input in MaterialPart form 10 years ago
Christian Merten 35aca36420 add group filter to members list 10 years ago
Schlabonski 0a5f4f74e1 implement image upload for material app 10 years ago
Schlabonski c359aac93a merge .gitignore into master 10 years ago
Schlabonski dd7d98dacf add migrations to .gitignore 10 years ago
Schlabonski bc139c1710 add migrations to .gitignore 10 years ago
Schlabonski 20a7dbe7d0 change MaterialPart.should_be_replaced to .not_too_old
It is more convenient to show the logical negation of should_be_replaced
as booleans are shown as little green or red items by django. Having
a green tick when the item is NOT okay seems a bit counterintuitive.
10 years ago
Schlabonski 1b815ec4fe make lifetime a specific attribute of each material part 10 years ago
Christian Merten 0f02570657 combined member and material system 10 years ago
Christian Merten 6dd141b3fa added member system 10 years ago