Thomas Steen Rasmussen
58d670b57f
get websocket scheme from window.location.protocol
2019-01-22 09:01:53 +01:00
Thomas Steen Rasmussen
d38453c745
CommonMark -> commonmark rename
2019-01-22 08:57:24 +01:00
Thomas Steen Rasmussen
050540c355
upgrade all pip packages to latest versions
2019-01-21 23:37:55 +01:00
Thomas Steen Rasmussen
3ca3631136
upgrade django, hax
2019-01-21 23:22:30 +01:00
Thomas Steen Rasmussen
58f3035927
switch from ws:// to wss://
2019-01-21 20:06:52 +01:00
Thomas Steen Rasmussen
b8fb36d346
add reimbursement_user to description of expense
2019-01-20 17:15:33 +01:00
Thomas Steen Rasmussen
c93b38a98b
make invoice_date a datefield not a datetimefield
2019-01-20 16:42:50 +01:00
Thomas Steen Rasmussen
d14708bee1
add invoice_date to django admin list display
2019-01-20 15:58:10 +01:00
Thomas Steen Rasmussen
51f8854a6c
show user on expense and revenue list and detail views
2019-01-20 15:50:54 +01:00
Thomas Steen Rasmussen
864a7e6673
add invoice_date to revenue and expense forms and templates
2019-01-20 15:39:59 +01:00
Thomas Steen Rasmussen
e8edb24233
add invoice_date field to Expense and Revenue models
2019-01-20 15:33:05 +01:00
Thomas Steen Rasmussen
29c468ab4a
show 2018 and 2019 in the camp menu dropdown
2019-01-20 09:47:47 +01:00
Thomas Steen Rasmussen
090a3b1e28
show both users on reimbursements
2019-01-20 09:38:18 +01:00
Thomas Steen Rasmussen
b4698f3fdc
fix case sensitive irc channel uniqueness check
2019-01-19 14:22:30 +01:00
Thomas Steen Rasmussen
1b9566ee02
make channel uniqueness check case insensitive
2019-01-19 13:49:51 +01:00
Thomas Steen Rasmussen
acfe658ab6
update location on frontpage
2019-01-13 17:21:57 +01:00
Thomas Steen Rasmussen
5e95133267
update help_text on a reimbursement field, and count reimbursement total with the right user field
2018-11-20 18:36:06 +01:00
Thomas Steen Rasmussen
733731ecf9
take camp into account when showing economy stats
2018-11-20 18:14:16 +01:00
Thomas Steen Rasmussen
fd1850dd98
use psycopg2-binary and close #271
2018-11-20 17:24:19 +01:00
Thomas Steen Rasmussen
a057bd6464
Revenue and economy revamp ( #285 )
...
* rework economy stuff, add revenue model, unfinished code!
* part 2 of economy overhaul. add views for dealing with revenue. rework expense views.
2018-11-20 17:12:32 +01:00
Thomas Steen Rasmussen
a8051783cb
upgrade requests due to vulnerability
2018-11-20 17:11:50 +01:00
Thomas Steen Rasmussen
9f28435256
upgrade django
2018-11-20 01:09:27 +01:00
Víðir Valberg Guðmundsson
0a81a88e93
Introduce wrapt and monkeypatch django.views.View so we have a setup method to override. ( #279 )
2018-11-20 00:22:43 +01:00
Thomas Flummer
9b2640ea07
changed sponsor logo to be filename only ( #280 )
...
* changed sponsor logo to be filename only
fixes issue #151
* changed to load logo correctly on sponsor tickets
related to fix of issue #151
2018-11-20 00:20:37 +01:00
Thomas Flummer
95cd376f36
added danish bank transfer info ( #281 )
...
fixes issue #237
2018-11-20 00:19:32 +01:00
Thomas Flummer
aafe9de44e
added a bit more margin in the botton to prevent footer from covering stuff on mobile devices ( #282 )
...
fixes issue #228
2018-11-20 00:18:14 +01:00
Thomas Steen Rasmussen
16a838a3cf
upgrade django
2018-10-03 23:41:18 +02:00
Thomas Steen Rasmussen
348c73323d
make sure expense attachments open in a new window
2018-09-16 11:23:32 +02:00
Thomas Steen Rasmussen
794e905050
show both user and reimbursement_user for reimbursements
2018-09-13 14:09:17 +02:00
Thomas Steen Rasmussen
ffe2fc056a
show the correct name when creating reimbursement
2018-09-13 13:53:49 +02:00
Thomas Steen Rasmussen
3bd821373f
make CampRedirectView handle cases where there is no next or no previous camp with a bit more grace
2018-09-13 13:42:31 +02:00
Thomas Steen Rasmussen
1cd0551d5e
the amount of an expense can NOT be negative
2018-09-01 10:25:45 +02:00
Thomas Steen Rasmussen
4123c2eb91
clarify that expense amount can be negative
2018-09-01 09:56:22 +02:00
Víðir Valberg Guðmundsson
4c124a978d
Upgrade django to newest bugfix version
...
https://docs.djangoproject.com/en/2.1/releases/2.1.1/
2018-08-31 11:41:49 +02:00
Thomas Steen Rasmussen
ac54e4cb16
show unapproved expenses seperately in backoffice, crosslink expenses and reimbursements in list and detailviews on main page and in backoffice
2018-08-30 19:32:23 +02:00
Thomas Steen Rasmussen
698beaaffd
refactor email functionality into seperate functions in economy.email module
2018-08-30 17:54:31 +02:00
Thomas Steen Rasmussen
8d32170422
derive mimetype from attachment content rather than hardcoding application/pdf as we've done until now (we have non-pdf attachments going to economic now)
2018-08-30 17:32:24 +02:00
Thomas Steen Rasmussen
435f95b70b
only use base filename, not full path lol
2018-08-30 17:31:43 +02:00
Thomas Steen Rasmussen
b753d05b5c
include expense uuid in subject of email to economic
2018-08-30 15:22:23 +02:00
Thomas Steen Rasmussen
fca7bd3721
filter on reimbursement_user not user
2018-08-30 13:24:23 +02:00
Thomas Steen Rasmussen
b56b9c27b4
include the actual attachment when sending to e-conomic
2018-08-30 13:17:52 +02:00
Thomas Steen Rasmussen
db73051a23
enable admin for Reimbursement model
2018-08-30 13:17:34 +02:00
Thomas Steen Rasmussen
fc3a993547
do not show the expense which represents the actual reimbursement, and do not count it towards the total
2018-08-30 12:39:43 +02:00
Thomas Steen Rasmussen
93b0bff50b
permit PDF as well as images for invoice uploads for expenses
2018-08-30 12:18:56 +02:00
Thomas Steen Rasmussen
ed736938cc
small markup fix
2018-08-30 01:42:45 +02:00
Thomas Steen Rasmussen
4d6a69d50a
remove stray pk_url_kwarg
2018-08-30 01:40:39 +02:00
Thomas Steen Rasmussen
8b3e00d9d4
make it impossible for users to approve expenses they submitted themselves
2018-08-30 01:35:37 +02:00
Víðir Valberg Guðmundsson
b2fa1dc92c
WIP Reimbursement feature ( #278 )
...
* Almost done, need the send to economic part.
* Add a way to approve/reject an reimbursement and send mails accordingly.
* finish work on custom invoice address
* add textfield notes to Order for internal orga notes about the order
* Almost done, need the send to economic part.
* Add a way to approve/reject an reimbursement and send mails accordingly.
* economy commit of doom.. replace reimbursement app with an economy app, add Expense and Reimbursement models, add management of expenses and reimbursements to backoffice. Rework and cleanup permissions stuff, add Camp.Permissions pseudo model to hold all our non-model permissions. still experimental, expect rough edges, but basic functionality should work.
2018-08-30 00:52:32 +02:00
Thomas Steen Rasmussen
2c1e5f12fe
add textfield notes to Order for internal orga notes about the order
2018-08-27 12:44:53 +02:00
Thomas Steen Rasmussen
f396708156
finish work on custom invoice address
2018-08-27 11:52:42 +02:00
Víðir Valberg Guðmundsson
80e9c01f87
Merge pull request #277 from pwelzel/feature_custom_invoice_address
...
add custom address field to shop.models.Order and invoice template
2018-08-22 19:27:23 +02:00
Patrick Welzel
8b8191e16d
add custom address field to shop.models.Order and invoice template
2018-08-22 15:41:24 +02:00
Thomas Steen Rasmussen
af794e6a2f
fix dates for 2019
2018-08-22 14:32:10 +02:00
Víðir Valberg Guðmundsson
f7d17883be
Display feedback a bit better.
2018-08-22 12:59:53 +02:00
Víðir Valberg Guðmundsson
09e916571e
Use the existing event type if there is one and one is not defined.
2018-08-21 13:47:56 +02:00
Víðir Valberg Guðmundsson
f2b7ad63ca
Ooops.
2018-08-20 15:57:00 +02:00
Víðir Valberg Guðmundsson
98433be365
Should be a CampRelatedModel.
2018-08-20 15:52:11 +02:00
Víðir Valberg Guðmundsson
0aa198ba6c
Save it!
2018-08-20 15:39:08 +02:00
Víðir Valberg Guðmundsson
2d58695ee4
Adding feedback functionality.
2018-08-20 15:13:51 +02:00
Víðir Valberg Guðmundsson
d605abcb40
Use col-xs- instead of col-sm- to get a slightly better dayview.
2018-08-20 12:43:33 +02:00
Víðir Valberg Guðmundsson
2ef3c45bc1
Fix bootstrap script.
2018-08-19 19:52:00 +02:00
Víðir Valberg Guðmundsson
b871613d24
Fix proposal submission.
2018-08-19 19:52:00 +02:00
Thomas Steen Rasmussen
52d3e827c8
show a message when all tokens have been found
2018-08-19 18:53:40 +02:00
Thomas Steen Rasmussen
387e4c1d87
filter on the correct id
2018-08-19 18:48:48 +02:00
Thomas Steen Rasmussen
a6e12868b3
fix order of columns
2018-08-19 18:35:40 +02:00
Thomas Steen Rasmussen
f408b0955a
add missing <tr> tags
2018-08-19 18:33:31 +02:00
Thomas Steen Rasmussen
fe4fdd06b0
show missing tokens, and show category/hint
2018-08-19 18:30:25 +02:00
Thomas Steen Rasmussen
df34d3edf3
add category field, and add unique_together constraint to TokenFind model until I figure out why it is creating duplicates
2018-08-19 17:56:04 +02:00
Víðir Valberg Guðmundsson
97ba725ba2
Add missing migrations.
2018-08-19 17:40:33 +02:00
Thomas Steen Rasmussen
62d172f6c2
add secret token to base.html
2018-08-19 16:22:02 +02:00
Víðir Valberg Guðmundsson
014e962a3f
use .get because it might not be there.
2018-08-19 00:06:25 +02:00
Víðir Valberg Guðmundsson
b50f368dea
Add a slides field to talk and lightning talk forms.
2018-08-18 20:43:24 +02:00
Víðir Valberg Guðmundsson
c8f6f76689
Make email mandatory and show that on the event proposal admin site.
2018-08-18 20:04:15 +02:00
Víðir Valberg Guðmundsson
428cee3cd7
Making event proposal admin slightly better.
2018-08-18 20:04:15 +02:00
Thomas Steen Rasmussen
7dd52c78ee
make the colours more visible on the camp list page, set camp colours in bootstrap script, add a light_text property to Camp model
2018-08-18 17:45:33 +02:00
Víðir Valberg Guðmundsson
84fff61ddb
Forgot something.
2018-08-18 16:55:33 +02:00
Víðir Valberg Guðmundsson
f15f878508
Add a proposal edit permission.
2018-08-18 16:37:20 +02:00
Benjamin Bach
2673cd86e2
Add a development default settings file and modify instructions
2018-08-18 16:02:35 +02:00
Thomas Steen Rasmussen
016bfdc1a1
add secret token game code
2018-08-18 15:26:49 +02:00
Benjamin Bach
0b3d8dafb8
Update psycopg2 to latest version
2018-08-18 15:06:27 +02:00
Víðir Valberg Guðmundsson
1af78e6ff7
Add email to SpeakerProposal and Speaker models.
2018-08-18 14:11:30 +02:00
Víðir Valberg Guðmundsson
83fa993ed1
Show SpeakerProposal email.
2018-08-18 13:36:11 +02:00
Víðir Valberg Guðmundsson
b3ef1d7538
Add the ticket to the order admin.
2018-08-17 11:59:28 +02:00
Víðir Valberg Guðmundsson
932d6aaa90
Show only camp bar products.
2018-08-16 18:27:59 +02:00
Víðir Valberg Guðmundsson
ff6912fed8
Spice up event instance admin.
2018-08-16 18:25:33 +02:00
Víðir Valberg Guðmundsson
104968ed32
Nor email.
2018-08-16 14:55:29 +02:00
Víðir Valberg Guðmundsson
e7fd3d9986
Sponsor ticket has no name.
2018-08-16 14:53:58 +02:00
Víðir Valberg Guðmundsson
9fd5dc27bf
User should be superuser to access complete backoffice.
2018-08-15 23:47:25 +02:00
Víðir Valberg Guðmundsson
ccfb3d13d0
Fix access to backoffice with infodesk permissions.
2018-08-15 20:53:54 +02:00
Víðir Valberg Guðmundsson
c02a80553f
Actually use the boolean flag.
2018-08-15 11:48:24 +02:00
Víðir Valberg Guðmundsson
93d6525b29
Add missing non-db migrations.
2018-08-15 11:31:00 +02:00
Víðir Valberg Guðmundsson
47bf0fcdbf
Add a command to generate sponsor tickets.
2018-08-15 11:30:42 +02:00
Víðir Valberg Guðmundsson
32f4ae13e3
Add some more ordering to TeamTask.
2018-08-15 00:17:03 +02:00
Víðir Valberg Guðmundsson
fc3cc91ad4
Update 2019 logo with new dates.
2018-08-14 21:06:49 +02:00
Víðir Valberg Guðmundsson
d9b7668ea8
Comments on tasks.
2018-08-14 20:13:46 +02:00
Víðir Valberg Guðmundsson
3d5645a10e
Dumb error.
2018-08-13 19:06:30 +02:00
Víðir Valberg Guðmundsson
bd00ae3424
Fix menu in mobile.
2018-08-13 19:00:40 +02:00
Víðir Valberg Guðmundsson
231f1e54fa
Woops, need to use lazy.
2018-08-13 18:59:49 +02:00
Víðir Valberg Guðmundsson
44f4f97101
Add success url to rideshare delete.
2018-08-13 18:56:48 +02:00
Víðir Valberg Guðmundsson
5bd0f38249
Revert to using TZ anyway. Too many problems by disabling it by now.
2018-08-13 18:55:25 +02:00
Víðir Valberg Guðmundsson
d7e8e24361
Correct typo.
2018-08-12 22:51:41 +02:00
Víðir Valberg Guðmundsson
da639ff4cd
Add shortcut to users teams. Add a overview of users shifts, and prevent user from taking a shift which overlaps with one already assigned to the user.
2018-08-12 16:50:53 +02:00
Víðir Valberg Guðmundsson
a3bfd85604
Disable timezone support. Everything is in Europe/Copenhagen anyway.
2018-08-11 18:15:19 +02:00
Víðir Valberg Guðmundsson
084782b22d
Add channels_redis requirement.
2018-08-10 22:36:28 +02:00
Víðir Valberg Guðmundsson
630b2e55de
Re-add CHANNEL_LAYERS settings.
2018-08-10 22:25:50 +02:00
Víðir Valberg Guðmundsson
e21f596188
Add a help text to rideshare when field to show format for now.
2018-08-10 19:29:19 +02:00
Víðir Valberg Guðmundsson
426a3f56be
Merge pull request #260 from bornhack/feature/rideshare
...
Ridesharing functionality
2018-08-10 18:47:56 +02:00
Víðir Valberg Guðmundsson
b864a2cd56
Adding str representation anyway.
2018-08-10 18:46:54 +02:00
Víðir Valberg Guðmundsson
effe016b57
Ensure only the creator of the ride can edit and delete it.
2018-08-10 18:46:35 +02:00
Víðir Valberg Guðmundsson
d6321cf5e8
Use list_display instead.
2018-08-10 18:39:21 +02:00
Víðir Valberg Guðmundsson
c83ebfed08
Adding admin for rideshare.Ride
2018-08-10 18:37:34 +02:00
Víðir Valberg Guðmundsson
641f4dfc73
Upgrading various dependencies.
2018-08-10 18:02:16 +02:00
Víðir Valberg Guðmundsson
3229838d0a
Adding contact options.
2018-08-10 17:41:19 +02:00
Víðir Valberg Guðmundsson
56875732dd
Also show location on non-js event detail page.
2018-08-10 16:26:25 +02:00
Víðir Valberg Guðmundsson
5ae96cfa6d
Add location to events on schedule.
2018-08-10 16:22:17 +02:00
Víðir Valberg Guðmundsson
72f6d42ee2
Show description for team member for team responsible.
2018-08-10 10:14:03 +02:00
Víðir Valberg Guðmundsson
4043b609fd
Model should have a default of false, so things that are not defined as true will default to false.
2018-08-09 15:35:58 +02:00
Víðir Valberg Guðmundsson
0e3e6ae06f
Remove "this".
2018-08-09 15:30:24 +02:00
Víðir Valberg Guðmundsson
f2c5c26262
Fix video recording field and help text.
2018-08-09 15:28:46 +02:00
Víðir Valberg Guðmundsson
6aa37716d6
Fleshing out some templates.
2018-08-09 14:36:21 +02:00
Víðir Valberg Guðmundsson
6b0bc8b737
Add non-db migration which was forgotten.
2018-08-08 22:36:54 +02:00
Víðir Valberg Guðmundsson
1c8685d15e
Initial work on rideshare feature.
2018-08-08 22:19:28 +02:00
Víðir Valberg Guðmundsson
badd18cb1b
Fix apparently intentional off by one error when creating multiple shifts.
2018-08-08 14:41:20 +02:00
Víðir Valberg Guðmundsson
8076f0c380
Use assign/unassign on button.
2018-08-08 14:37:41 +02:00
Víðir Valberg Guðmundsson
ca33f8c5eb
Make it possible to drop a shift.
2018-08-08 14:36:31 +02:00
Víðir Valberg Guðmundsson
25f40b381b
Fix filter in link to schedule from event list.
2018-08-06 21:11:39 +02:00
Víðir Valberg Guðmundsson
2ac86d661c
Forgot a spot.
2018-08-06 10:17:22 +02:00
Víðir Valberg Guðmundsson
88152776e3
Include buildup and teardown in available shifts days.
2018-08-05 18:48:58 +02:00
Víðir Valberg Guðmundsson
86ed7a82e8
Forgot to mark shift views as shift views so the menu pick it up
2018-08-05 18:36:57 +02:00
Víðir Valberg Guðmundsson
db5a2e1d92
Hide shifts for non-members.
2018-08-05 18:31:43 +02:00
Víðir Valberg Guðmundsson
a33e932858
Small representation fix.
2018-08-05 18:21:30 +02:00
Víðir Valberg Guðmundsson
6593d16966
Merge branch 'master' into feature/shift_planning
2018-08-05 17:46:45 +02:00
Víðir Valberg Guðmundsson
e482b63c14
Fixing video icon and using another icon for non-recording.
2018-08-05 12:42:18 +02:00
Víðir Valberg Guðmundsson
fe974e469b
Show email for users when user is team responsible.
2018-08-05 12:23:33 +02:00
Víðir Valberg Guðmundsson
214026dfd7
Integrate into new teams structure.
2018-08-05 12:18:10 +02:00
Víðir Valberg Guðmundsson
f5b80d9ac7
Merge branch 'master' into feature/shift_planning
2018-08-05 11:26:15 +02:00
Víðir Valberg Guðmundsson
2ad0568f64
Merge pull request #257 from bornhack/feature/team_refactor
...
Team site refactor
2018-08-05 11:18:03 +02:00
Thomas Steen Rasmussen
458ce45198
add village gear sections to backoffice
2018-08-05 09:29:58 +02:00
Víðir Valberg Guðmundsson
14c88cc9e4
Update the compiled version of the scedule.
2018-08-05 00:22:16 +02:00
Víðir Valberg Guðmundsson
d6a2151cdf
Rename placeholder for DateTimeRangeField - it is not the most elegant API to work with.
2018-08-05 00:18:51 +02:00
Víðir Valberg Guðmundsson
ddd2d5d5dd
Forgot this for previous commit.
2018-08-04 18:24:13 +02:00
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
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
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
Thomas Steen Rasmussen
9bfc206b53
define model on all Village views, remove Villages custom manager
2018-06-21 12:32:02 +02:00
Víðir Valberg Guðmundsson
43f076262b
Fix some outstanding issues with the team controlled info categories functionality.
2018-06-21 09:19:09 +02:00
Víðir Valberg Guðmundsson
635e57b7f9
Merge branch 'master' into feature/team_controlled_info
2018-06-21 08:53:47 +02:00
Víðir Valberg Guðmundsson
4c60415336
Make each model which inherit from CampRelatedModel but doesn not have a direct relation, define a camp_filter. ( #240 )
2018-06-20 22:03:29 +02:00
Thomas Steen Rasmussen
b94e737e09
add new bornfiber sponsor logo
2018-06-19 19:24:46 +02:00
Thomas Steen Rasmussen
f5be4d68d1
info and shop should use the |trustedcommonmark filter
2018-06-04 08:28:09 +02:00
Thomas Steen Rasmussen
4ad58188b2
change the default for link icons, move import for speakerproposalmodel earlier in dode, and add mark_as_rejected() method on eventproposal model
2018-06-03 23:36:07 +02:00
Thomas Steen Rasmussen
23c42985ae
hide url action buttons when not inside the program app, and change urltype icons to include the 'fas' bit of the fontawesome class
2018-06-03 23:34:40 +02:00
Thomas Steen Rasmussen
2305416461
only show tables when at least one proposal is found
2018-06-03 23:24:50 +02:00
Thomas Steen Rasmussen
a7a9a24c6c
move debug logging so channel messages are not logged, the bot doesn't handle any channel messages anyway and we dont want the data
2018-06-03 22:39:05 +02:00
Thomas Steen Rasmussen
02a7af6303
Make content submission form stuff much nicer. More DRY and more nice. Use one class with a form __init__ kwargs which sets eventtype
2018-06-03 19:41:49 +02:00
Thomas Steen Rasmussen
3180ec457d
switch backoffice to use the regular CampViewMixin
2018-06-03 18:33:51 +02:00
Thomas Steen Rasmussen
9c9edff4f7
check for empty duration when cleaning duration field
2018-06-03 17:20:45 +02:00
Thomas Steen Rasmussen
3fb2f44e94
add eventtype icons to event list and event detail views in program
2018-06-03 17:16:35 +02:00
Thomas Steen Rasmussen
64f4eebac3
handle cached_property as well as regular properties in our camp filtering on @property in CampViewMixin
2018-06-03 17:16:00 +02:00
Thomas Steen Rasmussen
bff5bb292e
add debate as eventtype in bootstrap-devsite, and fix commonmark templatefilter a few places I missed
2018-06-03 16:29:28 +02:00
Thomas Steen Rasmussen
811b8171af
working on #232 , this commit changes backoffice to be camp specific (although many of the actual functions are camp independent). Add backoffice/mixins.py with BackofficeViewMixin to keep it DRY. Add backoffice views to manage proposals. Move SpeakerProposal and EventProposal detail template to includes to they can be used from backoffice. Rename our commonmark templatetags so the names are more intuitive.
2018-06-03 15:34:04 +02:00
Thomas Steen Rasmussen
b34fe62118
small visual fixes, add a button to remove speakerproposal from eventproposal
2018-05-27 17:19:19 +02:00
Thomas Steen Rasmussen
2ba8d153fe
fix CFP url on bornhack 2020 frontpage
2018-05-27 16:31:57 +02:00
Thomas Steen Rasmussen
3d100c2f8a
hide buttons that modify stuff when CFP is not open or camp is readonly
2018-05-27 16:27:41 +02:00
Víðir Valberg Guðmundsson
183da3d161
Add tagline to small logo for 2018.
2018-05-26 20:22:10 +02:00
Víðir Valberg Guðmundsson
6226417ad7
Fix lookups that were forgotten.
2018-05-26 20:14:48 +02:00
Thomas Steen Rasmussen
8e7dc4f80a
move call for sponsors view to the database
2018-05-26 15:22:45 +02:00
Thomas Steen Rasmussen
7d9c730752
remove a couple of mixins that are not needed
2018-05-26 14:53:39 +02:00
Thomas Steen Rasmussen
53fa204455
Merge branch 'master' of github.com:bornhack/bornhack-website
2018-05-26 14:42:28 +02:00
Thomas Steen Rasmussen
9052526264
remove action buttons from proposal list, they can be found in the detail views, helps a lot with the width issues when things have long names
2018-05-26 10:48:38 +02:00
Thomas Steen Rasmussen
24371b629a
reenable mails to Content team when speaker/eventproposals are created/updated, change so proposal URLs are opened in new window, add a message in browser when proposals are approved in the admin
2018-05-26 10:24:52 +02:00
Thomas Steen Rasmussen
eb807a6853
move call for participation from template to the database, prepare to move call for sponsors in the same way. This commit means we will need to copy the content of the old templates to the prod db after deploy
2018-05-25 14:27:53 +02:00
Thomas Steen Rasmussen
157050d30e
make it possible to remove a speakerproposal from an eventproposal, move proposal delete buttons to the proposal detail pages, fix a button here and there
2018-05-24 11:43:46 +02:00
Thomas Steen Rasmussen
1f58471927
default allow_video_recording to checked
2018-05-24 10:23:42 +02:00
Thomas Steen Rasmussen
3e12c98b95
for some reason all our test users were is_staff=True users
2018-05-23 23:34:54 +02:00
Thomas Steen Rasmussen
18c33383b7
add url support for speakerproposals and eventproposals, including new models Url and UrlType. Also switch to Django 2.0 path() syntax in various urls.py files getting rid of a lot of ugly regex \o/
2018-05-23 23:28:27 +02:00
Víðir Valberg Guðmundsson
5b77cb5aa2
Implement a catchall for the remaining infocategories.
2018-05-20 22:27:41 +02:00
Víðir Valberg Guðmundsson
decfa29659
Remove obsolete check.
2018-05-20 22:25:19 +02:00
Víðir Valberg Guðmundsson
a8df8f0cee
Make team a mandatory field on infocategory.g
2018-05-20 22:11:39 +02:00
Víðir Valberg Guðmundsson
317a1c0b1c
Remove camp from infocategory and derive it from team.
2018-05-20 22:10:38 +02:00
Thomas Steen Rasmussen
df783168c6
filter speakerproposals by user, and redirect directly to combined submit view if no existing speakerproposals was found
2018-05-20 21:54:36 +02:00
Thomas Steen Rasmussen
1fb4eb7e28
remove help box with status explanations, no room :(
2018-05-20 21:42:11 +02:00
Thomas Steen Rasmussen
84c19d01c1
remove tooltip, add missing update button on speakerproposal detail page
2018-05-20 21:36:33 +02:00
Thomas Steen Rasmussen
4720b34021
link to detail view rather than update view in the tables, shine up the detail views a bit
2018-05-20 21:32:05 +02:00
Thomas Steen Rasmussen
743cf25476
add abstract field for music acts
2018-05-20 21:29:37 +02:00
Thomas Steen Rasmussen
5dc3e17d66
if one or more speakerproposals exist show a list so the user can pick an existing or choose to add a new; use the multimodelform stuff only when the user wants to add a new speakerproposal
2018-05-20 21:11:53 +02:00
Víðir Valberg Guðmundsson
733fdbf4ba
Add lists of events/speakers til speaker/event detail template.
2018-05-20 20:53:28 +02:00
Víðir Valberg Guðmundsson
c8ab0230cd
Add detail view for speaker and event proposals.
2018-05-20 20:29:56 +02:00
Víðir Valberg Guðmundsson
b172d678fa
Add filter for tracks to the schedule
2018-05-20 20:08:25 +02:00
Víðir Valberg Guðmundsson
03b536ff26
Fix channels consumer for program for the new content flow.
2018-05-20 19:32:51 +02:00
Thomas Steen Rasmussen
039af44a92
new content submission flow monster commit of doom. fixes a large part of #191 . Split out /program/ urls into a seperate program/urls.py file in the program: URL namespace. Change call for speakers to call for participation everywhere (I think). Add boolean fields call_for_participation_open and call_for_sponsors_open to Camp model. Switch to font-awesome 5.0.13 and update <i> tags everywhere accordingly. Introduce Tracks so all Events belong to a Track, which in turn belongs to a Camp. Add seperate forms for submitting SpeakerProposals and EventProposals so we can set labels and help_text according to EventType, and remove fields we dont need. Remove Pictures from Speaker and SpeakerProposals, it was almost never used, and was a lot of code/complexity. Remove a few PROPOSAL_STATUS namely DRAFT and MODIFIED_AFTER_APPROVAL to simplify the workflow for submitters. Add description, icon and host_title fields to EventType. Add a CombinedProposalSubmitView which allows users to submit a SpeakerProposal and EventProposal from the same page, introducing a new requirements.txt dependency for django-betterforms==1.1.4. Update bootstrap-devsite to match the new reality.
2018-05-20 18:16:20 +02:00
Víðir Valberg Guðmundsson
d3273eb1bb
Small fix.
2018-05-20 18:07:42 +02:00
Víðir Valberg Guðmundsson
31f74fa010
Fix stupid mistakes.
2018-05-20 16:43:53 +02:00
Víðir Valberg Guðmundsson
63e34ce387
Food team deals with food.
2018-05-08 17:10:11 +02:00
Víðir Valberg Guðmundsson
650de5c067
Adding "add_teams_to_categories" migration.
2018-05-08 17:06:14 +02:00
Víðir Valberg Guðmundsson
280dd5785f
Adding the compiled version of the schedule without speaker pictures.
2018-05-06 22:10:20 +02:00
Víðir Valberg Guðmundsson
91519e8b43
Remove speaker pictures from schedule.
2018-05-06 22:09:19 +02:00
Víðir Valberg Guðmundsson
642c452984
Add option to delete info item.
2018-05-06 21:55:50 +02:00
Stephan Telling
4ad568bb97
update 2018 logo
2018-05-06 20:29:19 +02:00
Stephan Telling
3846ebd3c3
Merge pull request #224 from bornhack/st/add-2020-boilerplate
...
add 2020 boilerplate
2018-05-06 17:06:16 +02:00
Stephan Telling
a94eb6b610
fix dates in camp detail for 2019
2018-05-06 17:05:23 +02:00
Stephan Telling
752dcf99f0
show call for sponsors on sponsors page ( #223 )
2018-05-06 16:36:07 +02:00
Stephan Telling
1198b6c558
add zibra wireless logo
2018-05-06 16:31:47 +02:00
Stephan Telling
789b2b7cc8
fix copy paste errors in 2019 and 2020 camp templates
2018-05-06 15:19:52 +02:00
Stephan Telling
3bc9c36cb0
improve 2019 call for speakers page
2018-05-06 15:11:10 +02:00
Stephan Telling
c67feb3d34
add boilerplate for 2020 camp
2018-05-06 15:10:02 +02:00
Víðir Valberg Guðmundsson
9d5a9daab4
Add what team is responsible for a category.
2018-05-06 13:24:20 +02:00