 Víðir Valberg Guðmundsson
|
c20771da8a
|
Fixed some stuff for ya' @tykling
|
2017-11-24 22:19:17 +01:00 |
|
Thomas Steen Rasmussen
|
f725a5c941
|
more work on tasks
|
2017-11-24 22:06:23 +01:00 |
|
Stephan Telling
|
d028c16966
|
add teamtasks in bootstrap script
|
2017-11-24 17:40:10 +01:00 |
|
|
Thomas Steen Rasmussen
|
142afa5ead
|
add teamtask support
|
2017-11-23 23:09:14 +01:00 |
|
|
Víðir Valberg Guðmundsson
|
d4265edaa0
|
Remove docker compose setup, not working optimal. Might return later.
|
2017-11-23 21:47:10 +01:00 |
|
|
Thomas Steen Rasmussen
|
2e4a44271d
|
filter unpaid, cancelled and refunded orders from backoffice view
|
2017-11-23 08:35:30 +01:00 |
|
|
Thomas Steen Rasmussen
|
adbf1f4280
|
a few more changes to the shop order detail page related to 2017 merch batch 2 sale
|
2017-11-22 01:10:44 +01:00 |
|
|
Thomas Steen Rasmussen
|
ead22bc0a7
|
disable credit card payments for now
|
2017-11-21 18:50:52 +01:00 |
|
|
Thomas Steen Rasmussen
|
40a76fa986
|
show in t&c that we only permit card payments on some products
|
2017-11-14 15:57:55 +01:00 |
|
|
Víðir Valberg Guðmundsson
|
1d4cfe7927
|
Merge pull request #182 from bornhack/docker-compose
Docker compose
|
2017-11-05 18:07:31 +01:00 |
|
|
Víðir Valberg Guðmundsson
|
c3ebb6ebd3
|
Make sure that the enviroment_setting.py file is there.
|
2017-11-05 17:41:37 +01:00 |
|
|
Víðir Valberg Guðmundsson
|
44d2ce22ab
|
Got the site up running using docker-compose. Also added a Makefile for convenience.
|
2017-11-05 17:26:20 +01:00 |
|
|
Stephan Telling
|
8b25a4ceb4
|
fix #169
|
2017-11-05 17:14:34 +01:00 |
|
|
Stephan Telling
|
eb9f531b77
|
fix #165
|
2017-11-05 16:13:50 +01:00 |
|
|
Stephan Telling
|
5dd4eaf7f1
|
fix #170
|
2017-11-05 15:29:23 +01:00 |
|
|
Thomas Steen Rasmussen
|
e957942181
|
remove old has_tickets context_processors
|
2017-10-04 00:25:19 +02:00 |
|
|
Thomas Steen Rasmussen
|
66014811a4
|
remove the old Ticket model, move irc notification signal handler to the new Tickets app, various cleanup, fixes #168
|
2017-10-04 00:06:49 +02:00 |
|
|
Thomas Steen Rasmussen
|
e0e65212bc
|
mark orderproductrelations as handed_out=True when Ticket objects have been created
|
2017-10-03 23:45:22 +02:00 |
|
|
Thomas Steen Rasmussen
|
c914c23117
|
add datatables.net jquery table plugin to infodesk page
|
2017-10-03 23:09:11 +02:00 |
|
Thomas Steen Rasmussen
|
803c8c7ff3
|
Backoffice first steps + add 403.html (#173)
* start working on backoffice
* add 403.html
|
2017-10-03 21:14:07 +02:00 |
|
|
Vidir Valberg Gudmundsson
|
a4930af92a
|
Removed svgs (which are now in assets repo).
|
2017-10-01 16:56:36 +02:00 |
|
|
Thomas Steen Rasmussen
|
7eb8d2d6d2
|
copy paste error
|
2017-09-17 15:27:47 +02:00 |
|
|
Thomas Steen Rasmussen
|
d14d67496d
|
add danish_vat field to creditnote model and template
|
2017-09-17 15:00:38 +02:00 |
|
|
Thomas Steen Rasmussen
|
0064d69d90
|
maintain linebreaks in customer info in credit notes
|
2017-09-17 14:40:05 +02:00 |
|
|
Thomas Steen Rasmussen
|
88cb7934c1
|
only send to customer for credit notes linked to a user object
|
2017-09-17 14:32:21 +02:00 |
|
|
Thomas Steen Rasmussen
|
c0f2478819
|
add customer field to credit notes for when they are not related to a user directly
|
2017-09-17 14:20:21 +02:00 |
|
|
Vidir Valberg Gudmundsson
|
7cf8085829
|
Fix #161.
|
2017-09-16 21:29:44 +02:00 |
|
|
Thomas Steen Rasmussen
|
ae0571bece
|
redo logo
|
2017-09-16 10:13:17 +02:00 |
|
|
Thomas Steen Rasmussen
|
e3e574298e
|
limit sponsor images to 300px wide
|
2017-09-16 10:08:23 +02:00 |
|
|
Thomas Steen Rasmussen
|
0a049b3b6d
|
add logo for bornholmske spritfabrikker
|
2017-09-16 09:59:29 +02:00 |
|
|
Thomas Steen Rasmussen
|
c2cfc0cdb4
|
add updated to list view
|
2017-09-14 22:58:45 +02:00 |
|
|
Thomas Steen Rasmussen
|
21184c9c67
|
add created and updated to order list and detail
|
2017-09-14 22:52:08 +02:00 |
|
|
Thomas Steen Rasmussen
|
4c621aed4b
|
make it possible to have customorders and invoices without Danish VAT
|
2017-09-14 21:02:59 +02:00 |
|
|
Víðir Valberg Guðmundsson
|
a1f30ccad5
|
Merge pull request #158 from reynir/ical-abstract-description
Add event abstract to iCal
|
2017-09-12 22:58:31 +02:00 |
|
Reynir Björnsson
|
68cba4659a
|
Add event abstract to iCal
Testing, what is testing?!
|
2017-09-02 00:50:45 +02:00 |
|
 Benjamin Bach
|
a93a66b8ac
|
Should set mapping to empty dict, not empty string
asgi_layer = backend_class(**config)
TypeError: type object argument after ** must be a mapping, not str
|
2017-08-28 21:56:58 +02:00 |
|
|
Benjamin Bach
|
ceef9bbd55
|
Calling manage outside of src/
|
2017-08-28 21:54:04 +02:00 |
|
|
Vidir Valberg Gudmundsson
|
ee4c0819e4
|
Order categories and products alphabetically.
|
2017-08-26 20:28:11 +02:00 |
|
|
Vidir Valberg Gudmundsson
|
9be3e62842
|
Hiding sidebars.
|
2017-08-26 17:34:14 +02:00 |
|
|
Vidir Valberg Gudmundsson
|
3f18b59a6b
|
HACKER THEME!
|
2017-08-26 17:31:46 +02:00 |
|
|
Vidir Valberg Gudmundsson
|
84672dff7c
|
Smaller text!
|
2017-08-26 17:27:24 +02:00 |
|
|
Vidir Valberg Gudmundsson
|
2341658e59
|
Reload every 5 seconds.
|
2017-08-26 16:11:45 +02:00 |
|
|
Vidir Valberg Gudmundsson
|
3c83a6f70d
|
Adding title and only showing products in stock.
|
2017-08-26 16:03:26 +02:00 |
|
|
Vidir Valberg Gudmundsson
|
a9f1e4553b
|
Initial bar app.
|
2017-08-26 03:49:30 +02:00 |
|
|
Thomas Steen Rasmussen
|
365827805c
|
check that slugify has returned anything
|
2017-08-24 20:28:53 +02:00 |
|
|
Thomas Steen Rasmussen
|
6e3b6002c2
|
resize logo
|
2017-08-23 18:32:16 +02:00 |
|
|
Thomas Steen Rasmussen
|
e574f97566
|
add varnish software sponsor logo
|
2017-08-23 18:29:24 +02:00 |
|
|
Vidir Valberg Gudmundsson
|
3885bad0c8
|
Last minute addition for badge registration.
|
2017-08-23 12:32:08 +02:00 |
|
|
Thomas Steen Rasmussen
|
f952370280
|
typo
|
2017-08-23 03:09:41 +02:00 |
|
|
Thomas Steen Rasmussen
|
ccfdfa1ba5
|
unfuck name fuck, well done swedes
|
2017-08-23 03:04:33 +02:00 |
|
|
Vidir Valberg Gudmundsson
|
3a984acf57
|
Fixing stuff
|
2017-08-22 20:09:26 +02:00 |
|
|
Vidir Valberg Gudmundsson
|
4e036cdbe2
|
Adding wether ticket is paid or not.
|
2017-08-22 20:02:17 +02:00 |
|
|
Vidir Valberg Gudmundsson
|
001bbd5dc0
|
More ticket admin tweaks.
|
2017-08-22 19:59:26 +02:00 |
|
|
Vidir Valberg Gudmundsson
|
c0159cfecb
|
Filter by camp.
|
2017-08-22 19:48:18 +02:00 |
|
|
Vidir Valberg Gudmundsson
|
fabf8959d6
|
Move checked in to the front.
|
2017-08-22 19:45:01 +02:00 |
|
|
Vidir Valberg Gudmundsson
|
f06a00db69
|
Adding search to admin for tickets.
|
2017-08-22 19:37:02 +02:00 |
|
|
Thomas Steen Rasmussen
|
65201831da
|
add arrow ecs logo
|
2017-08-22 19:22:57 +02:00 |
|
|
Vidir Valberg Gudmundsson
|
dd9ef2380a
|
Camp redirect has to account for an ongoing camp.
|
2017-08-22 14:35:49 +02:00 |
|
|
Vidir Valberg Gudmundsson
|
385e98d84f
|
Use | as delimiters.
|
2017-08-22 13:05:49 +02:00 |
|
|
Vidir Valberg Gudmundsson
|
0cdee23b30
|
Very basic CSV "export"
|
2017-08-22 13:00:42 +02:00 |
|
|
Vidir Valberg Gudmundsson
|
0edcaeb11e
|
Adding inital version of program control center.
|
2017-08-22 11:48:51 +02:00 |
|
|
Vidir Valberg Gudmundsson
|
6a413cdd3c
|
Fix too long event titles in day view.
|
2017-08-21 08:45:05 +02:00 |
|
|
Thomas Steen Rasmussen
|
659cfd4a37
|
resize logo
|
2017-08-20 02:14:35 +02:00 |
|
|
Thomas Steen Rasmussen
|
4e064967ba
|
add dansk it logo
|
2017-08-20 02:13:33 +02:00 |
|
|
Thomas Steen Rasmussen
|
c846f4e462
|
fix logo
|
2017-08-20 02:07:15 +02:00 |
|
|
Thomas Steen Rasmussen
|
bd01070710
|
add f-secure logo
|
2017-08-20 02:00:27 +02:00 |
|
|
Thomas Steen Rasmussen
|
c0d8e22ff6
|
inherit from CampRelatedModel
|
2017-08-20 01:05:30 +02:00 |
|
|
Thomas Steen Rasmussen
|
042a335269
|
fixup admin for Ticket models
|
2017-08-20 01:01:44 +02:00 |
|
|
Thomas Steen Rasmussen
|
3cde4af189
|
syntax
|
2017-08-20 00:44:55 +02:00 |
|
|
Thomas Steen Rasmussen
|
ab22a6de4a
|
fix filename in download view too
|
2017-08-20 00:39:59 +02:00 |
|
|
Thomas Steen Rasmussen
|
c6ee407751
|
include ticket type in filename
|
2017-08-20 00:25:48 +02:00 |
|
|
Stephan Telling
|
3dcb43e575
|
fix detail template and add text to ticket if checked in
|
2017-08-20 00:02:05 +02:00 |
|
|
Stephan Telling
|
c0c9e77532
|
Merge branch 'master' of github.com:bornhack/bornhack-website
|
2017-08-19 23:53:00 +02:00 |
|
|
Stephan Telling
|
15cc999e55
|
fix proper urls for ticket app
|
2017-08-19 23:49:55 +02:00 |
|
|
Thomas Steen Rasmussen
|
7f017b416c
|
finally fix qr code method
|
2017-08-19 23:36:16 +02:00 |
|
|
Thomas Steen Rasmussen
|
3581e4d32d
|
str() please
|
2017-08-19 23:30:25 +02:00 |
|
|
Thomas Steen Rasmussen
|
b6c79a9cdd
|
this is a function
|
2017-08-19 23:27:31 +02:00 |
|
|
Stephan Telling
|
13efe137b8
|
Merge branch 'master' of github.com:bornhack/bornhack-website
|
2017-08-19 23:17:25 +02:00 |
|
|
Thomas Steen Rasmussen
|
5f4e9d16e9
|
remove save method frm ShopTicket
|
2017-08-19 23:14:01 +02:00 |
|
|
Thomas Steen Rasmussen
|
e6ca8a5c71
|
calculate qrcode_base64 on the fly
|
2017-08-19 23:10:13 +02:00 |
|
|
Thomas Steen Rasmussen
|
bf56a1624c
|
py3 syntax
|
2017-08-19 23:01:16 +02:00 |
|
|
Thomas Steen Rasmussen
|
b790b84d6c
|
not so super
|
2017-08-19 23:00:49 +02:00 |
|
|
Thomas Steen Rasmussen
|
a07e74180e
|
redo migrations for Tickets app again, fix BaseTicket to be abstract
|
2017-08-19 22:22:54 +02:00 |
|
|
Stephan Telling
|
984b82ba11
|
update tickets app with list and detail views
Also this commit allows users to download their ticket as PDF.
|
2017-08-19 22:06:32 +02:00 |
|
|
Thomas Steen Rasmussen
|
410905f3ce
|
redo migrations completely
|
2017-08-19 21:33:13 +02:00 |
|
|
Thomas Steen Rasmussen
|
b49ecb87b0
|
redo migrations for tickets app
|
2017-08-19 21:27:07 +02:00 |
|
|
Thomas Steen Rasmussen
|
89aa6bfa22
|
make baseticket inherit directly from uuidmodel and createdupdatedmodel
|
2017-08-19 21:11:07 +02:00 |
|
|
Thomas Steen Rasmussen
|
086578d3b8
|
show on event list when and if it has any instances
|
2017-08-19 20:44:07 +02:00 |
|
|
Thomas Steen Rasmussen
|
8f352d8191
|
put tickets page under maintenance for now
|
2017-08-19 12:48:54 +02:00 |
|
|
Stephan Telling
|
6d5a7522d8
|
move checked_in field to baseticket
|
2017-08-18 13:04:13 +02:00 |
|
|
Stephan Telling
|
ac5fb77c7a
|
update bootstrap script with camps for tickettype
|
2017-08-17 21:18:43 +02:00 |
|
|
Stephan Telling
|
fc87a13c05
|
update tickettype with camp, remove camp from baseticket
minor updates to template and str method of TicketType
|
2017-08-17 21:17:36 +02:00 |
|
|
Stephan Telling
|
85a1db6704
|
minor tweaks
|
2017-08-17 21:16:49 +02:00 |
|
|
Stephan Telling
|
86ec617b71
|
Merge branch 'master' of github.com:bornhack/bornhack-website
|
2017-08-17 19:10:20 +02:00 |
|
|
Stephan Telling
|
ec428f78d5
|
update bootstrap script with tickettypes
|
2017-08-17 19:09:46 +02:00 |
|
|
Stephan Telling
|
e828bc9c4a
|
Merge pull request #150 from bornhack/tickets
Tickets
|
2017-08-17 18:51:56 +02:00 |
|
|
Stephan Telling
|
eac39352cd
|
move generate_pdf_letter func to utils app
|
2017-08-17 18:38:25 +02:00 |
|
|
Stephan Telling
|
ee8c9cf01c
|
mend
|
2017-08-17 17:53:45 +02:00 |
|
|
Stephan Telling
|
5eedb8ff03
|
update INSTALLED_APPS. add ticket_type and re-add old Ticket model
also updates bootstrap script with ticket_type
|
2017-08-17 17:52:22 +02:00 |
|
|
Stephan Telling
|
bea270f8eb
|
add new tickets app
|
2017-08-17 17:51:24 +02:00 |
|
|
Vidir Valberg Gudmundsson
|
93300f3b30
|
Change midnight offset from 6 to 9.
|
2017-08-16 23:05:26 +02:00 |
|
|
Vidir Valberg Gudmundsson
|
5c9e5482f5
|
Really fixing bordering events this time.
|
2017-08-16 22:39:48 +02:00 |
|
|
Vidir Valberg Gudmundsson
|
99fa18c14d
|
Fix events right up to each other. Unstick sidebar on event detail.
|
2017-08-16 21:10:27 +02:00 |
|
|
Vidir Valberg Gudmundsson
|
93ed88d641
|
Compile!
|
2017-08-16 19:58:26 +02:00 |
|
|
Vidir Valberg Gudmundsson
|
8055071b8b
|
Adding ICS button. Make sidebar not sticky.
|
2017-08-16 19:58:04 +02:00 |
|
|
Vidir Valberg Gudmundsson
|
25eb491f24
|
Adding compiled version without debug.
|
2017-08-16 19:42:20 +02:00 |
|
|
Vidir Valberg Gudmundsson
|
9659871a3f
|
Fix filter sidebar style.
|
2017-08-16 19:16:28 +02:00 |
|
|
Vidir Valberg Gudmundsson
|
08279a479a
|
Latest compiled version with debug.
|
2017-08-16 18:30:02 +02:00 |
|
|
Vidir Valberg Gudmundsson
|
bd1d139d2d
|
Fixing ICSView.
|
2017-08-16 18:30:02 +02:00 |
|
|
Vidir Valberg Gudmundsson
|
27a4ff0bbb
|
Comitting latest compiled version
|
2017-08-16 18:30:02 +02:00 |
|
|
Vidir Valberg Gudmundsson
|
d44ef3bbd8
|
Adding small indicators of the number of events instances for the different filters. Resulted in some cleanup as well.
|
2017-08-16 18:30:02 +02:00 |
|
|
Vidir Valberg Gudmundsson
|
5ce2a59036
|
Adding lates compiled version.
|
2017-08-16 18:30:02 +02:00 |
|
|
Vidir Valberg Gudmundsson
|
d4d7fad439
|
Cleanups. Adding Speaker detail.
|
2017-08-16 18:30:02 +02:00 |
|
|
Vidir Valberg Gudmundsson
|
a447ca476f
|
Working on event detail. Also small visual help in DayView. Also some favorite stuff.
|
2017-08-16 18:27:28 +02:00 |
|
|
Vidir Valberg Gudmundsson
|
c237d4ecc7
|
Adding a back buton on event detail if noscript.
|
2017-08-16 18:27:28 +02:00 |
|
|
Vidir Valberg Gudmundsson
|
084d2cee6b
|
Addin the missing template for noscript fallback.
|
2017-08-16 18:27:28 +02:00 |
|
|
Vidir Valberg Gudmundsson
|
3411aee34a
|
Make a noscript fallback version of the schedule.
|
2017-08-16 18:27:28 +02:00 |
|
|
Vidir Valberg Gudmundsson
|
d77564064f
|
Adding compiled version with debug enabled.
|
2017-08-16 18:27:28 +02:00 |
|
|
Vidir Valberg Gudmundsson
|
7abd35ab66
|
Fixing websocket url.
|
2017-08-16 18:27:28 +02:00 |
|
|
Vidir Valberg Gudmundsson
|
e103cb57b5
|
Pushing compiled and minified version with debug enabled for staging purposes.
|
2017-08-16 18:27:28 +02:00 |
|
|
Vidir Valberg Gudmundsson
|
5dfda5ec8c
|
More styling.
|
2017-08-16 18:27:28 +02:00 |
|
|
Vidir Valberg Gudmundsson
|
1bcc3a0ba0
|
Finally this seems to work 😅
|
2017-08-16 18:27:28 +02:00 |
|
|
Vidir Valberg Gudmundsson
|
3e50ccc9d8
|
Some styling.
|
2017-08-16 18:27:28 +02:00 |
|
|
Vidir Valberg Gudmundsson
|
725535d4a7
|
Some progress on the dayview.
|
2017-08-16 18:27:28 +02:00 |
|
|
Vidir Valberg Gudmundsson
|
a938f2406f
|
Filtering by video recording is now possible. Also show video recording states.
|
2017-08-16 18:27:28 +02:00 |
|
|
Vidir Valberg Gudmundsson
|
4279653fcb
|
Differentiating between data is too cumbersome, so now we just load everything on start. Think about optimizing later!
|
2017-08-16 18:27:28 +02:00 |
|
|
Vidir Valberg Gudmundsson
|
23d94145b7
|
Detail pages are for events. We now also load event data when accessing a detailpage directly.
|
2017-08-16 18:27:28 +02:00 |
|
|
Vidir Valberg Gudmundsson
|
e8c0ab1941
|
Organized the code in a more sane manner. Also some websocket work.
|
2017-08-16 18:27:28 +02:00 |
|
|
Vidir Valberg Gudmundsson
|
543347aaff
|
Adding detail view for event intances.
|
2017-08-16 18:27:28 +02:00 |
|
|
Vidir Valberg Gudmundsson
|
9b36959057
|
Remove that javascript garbage.
|
2017-08-16 18:27:28 +02:00 |
|
|
Vidir Valberg Gudmundsson
|
ebf4526425
|
Woops, no need to commit compiled version yet.
|
2017-08-16 18:26:49 +02:00 |
|
|
Vidir Valberg Gudmundsson
|
db14e7d80e
|
Replace schedule_overview.html with schedule_overview_elm.html.
|
2017-08-16 18:26:49 +02:00 |
|
|
Vidir Valberg Gudmundsson
|
b49a0ad556
|
Accomplished feature parity in filtering.
|
2017-08-16 18:26:49 +02:00 |
|
|
Vidir Valberg Gudmundsson
|
a6470d2ec9
|
Initial work on the schedule written in elm.
|
2017-08-16 18:26:49 +02:00 |
|
|
Stephan Telling
|
c04838377b
|
remove imports and ticket class from shop
|
2017-08-15 14:19:06 +02:00 |
|
|
Stephan Telling
|
477b1b85de
|
fix #147
|
2017-08-14 19:10:58 +02:00 |
|
|
Stephan Telling
|
973bdc575c
|
fix 144
|
2017-08-14 18:58:19 +02:00 |
|
|
Stephan Telling
|
cc43b0cb4d
|
Merge branch 'master' of github.com:bornhack/bornhack-website
|
2017-08-14 00:56:30 +02:00 |
|
|
Thomas Steen Rasmussen
|
5c84c81981
|
these do not belong here
|
2017-08-13 23:24:46 +02:00 |
|
|
Stephan Telling
|
756c90d2fb
|
filter team areas by camp
|
2017-08-13 17:21:00 +02:00 |
|
|
Stephan Telling
|
ad9e93d692
|
fix #141
|
2017-08-13 15:42:42 +02:00 |
|
|
Stephan Telling
|
6456ee3fa7
|
fix #140
|
2017-08-13 14:58:38 +02:00 |
|
|
Stephan Telling
|
f348566214
|
fix #139
|
2017-08-13 11:43:28 +02:00 |
|
|
Vidir Valberg Gudmundsson
|
bdc6c35b48
|
Adding pdf for 2017 small logo.
|
2017-08-11 10:39:28 +02:00 |
|
coral
|
260a37af3c
|
Fixed missing space in 'be excellent to eachother', maybe i'm wrong here, in which case sorry.
|
2017-08-10 20:55:13 +02:00 |
|
|
Vidir Valberg Gudmundsson
|
d73e14afa8
|
Remove the white from the small logo for 2017
|
2017-08-10 15:16:40 +02:00 |
|
|
Stephan Telling
|
e96dd27225
|
Merge pull request #145 from klarstrup/master
Add href attribute to Schedule -> All Days event link
|
2017-08-10 13:20:51 +02:00 |
|
|
Thomas Steen Rasmussen
|
a4b618a269
|
make admin listing of custom orders more nice
|
2017-08-08 13:27:12 +02:00 |
|
|
Thomas Steen Rasmussen
|
1f89ff986c
|
round vat to 2 decimals
|
2017-08-08 13:26:58 +02:00 |
|
klarstrup
|
5ff0289d6f
|
Add href attribute to event link
|
2017-08-06 21:09:43 +02:00 |
|