Víðir Valberg Guðmundsson
df3751ecb8
Remove include since we have everything for tasks in one place now.
2018-08-04 18:13:51 +02:00
Víðir Valberg Guðmundsson
a4060c2815
Merge branch 'master' into feature/team_refactor
2018-08-04 18:11:32 +02:00
Thomas Steen Rasmussen
73ec701b06
add when and completed to teamtask model, move task list to an included file
2018-08-04 17:38:09 +02:00
Thomas Steen Rasmussen
eb8e548c3f
add Meetup eventtype in SpeakerProposalForm and EventProposalForm
2018-08-04 13:54:37 +02:00
Víðir Valberg Guðmundsson
da75660f0d
Final touches - I think.
2018-08-04 13:45:52 +02:00
Víðir Valberg Guðmundsson
d08c299e8d
Views can have an indirect relation to a team.
2018-08-04 13:27:05 +02:00
Víðir Valberg Guðmundsson
ef4262995f
Merge pull request #256 from fALKENdk/253-change-the-z-index-of-the-menu
...
Changed z-index of .sticky
2018-08-04 13:12:51 +02:00
Thomas Steen Rasmussen
eeab018a77
add dansk metal sponsor logo
2018-08-02 09:48:59 +02:00
Kasper Friis Christensen
a2b0d2980a
Minimized comment size
2018-08-01 21:27:02 +02:00
Kasper Friis Christensen
456d9377a6
Changed z-index of .sticky and added bootstrap z-indexes to bornhack.css as a comment
2018-08-01 21:15:43 +02:00
Stephan Telling
c5d8b2aca5
Merge pull request #255 from bornhack/st/merchandise-to-order
...
Backoffice: merchandise to order
2018-08-01 12:28:56 +02:00
Stephan Telling
d03af1c11e
use django.utils timezone rather than datetime
2018-08-01 12:25:43 +02:00
Stephan Telling
e04038e4a0
add backoffice pages for merchandise orders and what merchandise to order
2018-08-01 11:50:16 +02:00
Stephan Telling
e2ef635abc
overwrite get_queryset on ProductHandoutView and delete unused imports
2018-08-01 11:33:36 +02:00
Víðir Valberg Guðmundsson
81063e6182
Merge pull request #251 from fALKENdk/hotfix--body-bottom-margin
...
HOTFIX: Make content under "Add to order" in shop items visible on iphone.
2018-07-31 14:08:05 +02:00
Víðir Valberg Guðmundsson
a625cdd855
Merge pull request #252 from fALKENdk/master
...
Hotfix: Updated path for pip requirements
2018-07-31 14:04:02 +02:00
Kasper Christensen
29a232301e
Updated path for pip requirements
2018-07-31 14:00:33 +02:00
Kasper Christensen
c8e65b739d
Update bornhack.css
...
Made content under "Add to order" in shop items visible on iphone.
2018-07-31 13:43:39 +02:00
Víðir Valberg Guðmundsson
8f46897f0c
Add LetsGo logo.
2018-07-30 13:54:36 +02:00
Thomas Steen Rasmussen
b6a2ac07b1
crop pcbway logo a bit
2018-07-30 09:28:10 +02:00
Thomas Steen Rasmussen
6a62624355
add epson logo
2018-07-30 09:16:55 +02:00
Thomas Steen Rasmussen
ae14b759fa
add pcbway logo
2018-07-27 13:20:24 +02:00
Thomas Steen Rasmussen
6828807f2c
forgot to rename variable one place
2018-07-26 21:06:00 +02:00
Thomas Steen Rasmussen
9517fb25ea
pass request everywhere it is needed
2018-07-26 15:03:49 +02:00
Thomas Steen Rasmussen
016ac8adac
use hasattr() and clean up urls
2018-07-24 19:02:58 +02:00
Víðir Valberg Guðmundsson
02977acd5e
Some DRYing.
2018-07-23 23:12:57 +02:00
Víðir Valberg Guðmundsson
c68015fe26
Teams detail page was starting to get crowded. This is the start of a mostly visual, but also structural, refactor.
2018-07-22 23:18:50 +02:00
Thomas Steen Rasmussen
cf9e9ebd5a
remove debug print
2018-07-20 08:04:12 +02:00
Víðir Valberg Guðmundsson
2bdd172b92
Fix multiple shifts create. Add deletion. Add a way to take a shift.
2018-07-19 22:46:26 +02:00
Thomas Steen Rasmussen
11a94b477c
redirect to the events list if nothing is scheduled yet
2018-07-18 00:58:33 +02:00
Thomas Steen Rasmussen
d46ccc530b
handle empty results correctly in CampViewMixin, also add a text to the speaker list page when no speakers are found
2018-07-18 00:46:38 +02:00
Thomas Steen Rasmussen
025692d017
add icons to speaker list page
2018-07-18 00:15:14 +02:00
Thomas Steen Rasmussen
a6b0332c9f
small visual fixes, headline size and remove a stray </h4> and remove the text-container class from the speaker description markdown
2018-07-17 23:35:10 +02:00
Thomas Steen Rasmussen
00c053829e
fix copy paste error which makes urls not be shown on event detail page, and fix headline
2018-07-17 23:27:20 +02:00
Thomas Steen Rasmussen
340a3eb58c
only check for pk and slug when relevant
2018-07-17 22:47:14 +02:00
Thomas Steen Rasmussen
32e9b7c40b
Fix urls handling and other stuff ( #249 )
...
* update font-awesome to 5.1 and add fab- and fa-regular icons, fixed #244
* also handle slugs when dealing with SingleObjectMixin CBV views, fixes #248
* add missing trailing slash to bar/menu
* add missing trailing slash on event slugs, fixes #245
* fix a lot of stuff related to proposal URLs. actually display them on speaker and event detail pages. show the urltype icons. better messages on update and delete pages. fix 500 error when reapproving events. fix bug that made urls multiply when reapproving event. fixes #246 and fixes #247
2018-07-17 22:43:16 +02:00
Víðir Valberg Guðmundsson
b602e394fe
Fix CampViewMixin to deal properly with multiple camp_filters when dealing with SingleObjectMixin based CBVs
2018-07-17 20:46:30 +02:00
Víðir Valberg Guðmundsson
4f77b21a60
Add a way to create multiple shifts - needs a bit more work though.
2018-07-17 19:28:16 +02:00
Víðir Valberg Guðmundsson
8ac973bc61
Iterate over camo_filter and return the first one that returns results! ( #243 )
2018-07-16 16:07:38 +02:00
Víðir Valberg Guðmundsson
7f9dfdd6e1
Merge pull request #242 from graffen/saxologo
...
Add Saxo Bank logo
2018-07-13 14:42:03 +02:00
Thomas Steen Rasmussen
d3ba04b6f2
fix coinify callbacks by passing request argument to order.mark_as_paid()
2018-07-13 14:38:01 +02:00
Jesper Hess
6737515ad4
Add Saxo Bank logo
2018-07-13 14:36:20 +02:00
Víðir Valberg Guðmundsson
c103400046
Enable editing of shifts. With timezone rabbit hole.
2018-07-03 07:15:42 +02:00
Víðir Valberg Guðmundsson
102dfa7330
Initial work on shift planning.
2018-07-02 23:52:52 +02:00
Víðir Valberg Guðmundsson
9bfdc714f0
Merge pull request #222 from bornhack/feature/team_controlled_info
...
Make info categories team controlled
2018-07-01 17:34:22 +02:00
Thomas Steen Rasmussen
bf864cb5bd
also handle Slacking Off events in EventProposalForm
2018-06-26 23:37:39 +02:00
Thomas Steen Rasmussen
5493dbee47
change proposal status when the submitter adds or updates a URL
2018-06-26 23:37:20 +02:00
Thomas Steen Rasmussen
ea2bfc8498
hide action buttons when not on the proposal page
2018-06-26 23:31:56 +02:00
Víðir Valberg Guðmundsson
a42e23ebd5
Add slacking off to the if-elif-clause for creating a form for proposals.
2018-06-24 01:02:06 +02:00
Víðir Valberg Guðmundsson
5472dbb4b7
Fix village update view.
2018-06-24 00:41:58 +02:00
Víðir Valberg Guðmundsson
Kasper Friis Christensen
Jesper Hess