 Víðir Valberg Guðmundsson
|
5c00934027
|
Resolve merge conflict.
|
2016-07-13 21:44:09 +02:00 |
|
|
Víðir Valberg Guðmundsson
|
4381dbd2bd
|
Merge branch 'master' into feature/speakers-app
|
2016-07-13 21:41:35 +02:00 |
|
Ronni Elken Lindsgaard
|
99f79e0ca2
|
WIP program app
|
2016-07-13 19:13:47 +02:00 |
|
Thomas Steen Rasmussen
|
178be1deb0
|
more template styling
|
2016-07-13 00:24:34 +02:00 |
|
|
Thomas Steen Rasmussen
|
c4459695da
|
pdf template styling
|
2016-07-13 00:21:03 +02:00 |
|
|
Thomas Steen Rasmussen
|
edcdf23c19
|
add migration
|
2016-07-12 23:34:46 +02:00 |
|
|
Thomas Steen Rasmussen
|
1b1c0a8065
|
use |linebreaks templatefilter
|
2016-07-12 23:32:05 +02:00 |
|
|
Thomas Steen Rasmussen
|
1ff887ca82
|
migration for previous commit
|
2016-07-12 23:19:43 +02:00 |
|
|
Thomas Steen Rasmussen
|
f60d2bfdae
|
add customer field to customorder model, change template a bit
|
2016-07-12 23:16:45 +02:00 |
|
|
Thomas Steen Rasmussen
|
be34e1a6b5
|
generate invoices for unpaid customorders
|
2016-07-12 22:56:21 +02:00 |
|
|
Thomas Steen Rasmussen
|
ae1c15b88e
|
add CustomOrder to admin
|
2016-07-12 22:42:30 +02:00 |
|
|
Thomas Steen Rasmussen
|
1d65ddeca6
|
add migrations
|
2016-07-12 22:38:59 +02:00 |
|
|
Thomas Steen Rasmussen
|
3ce6b70e99
|
commit initial customorder support
|
2016-07-12 22:33:53 +02:00 |
|
|
Thomas Steen Rasmussen
|
5e151da366
|
show nice title for village list and detail
|
2016-07-11 14:36:21 +02:00 |
|
|
Thomas Steen Rasmussen
|
2bd49b3539
|
show 50 words instead of 15
|
2016-07-11 14:04:18 +02:00 |
|
|
Thomas Steen Rasmussen
|
e3facc15b5
|
Merge branch 'master' of https://github.com/bornhack/bornhack-website
|
2016-07-11 13:47:06 +02:00 |
|
|
Víðir Valberg Guðmundsson
|
e5d330fa01
|
Move hr into the if block
|
2016-07-10 23:14:57 +02:00 |
|
|
Víðir Valberg Guðmundsson
|
bd089d03d3
|
Add note about not having to have a village or a concept to rent a tent
|
2016-07-10 20:14:00 +02:00 |
|
|
Víðir Valberg Guðmundsson
|
25570632b2
|
Updating info about villages. Styling buttons in the village CRUD.
|
2016-07-10 20:06:08 +02:00 |
|
|
Víðir Valberg Guðmundsson
|
f7e2cf54b6
|
Adding private and deleted to list_display on villages
|
2016-07-10 19:45:21 +02:00 |
|
|
Víðir Valberg Guðmundsson
|
2fc0205710
|
Adding deletion possibility and some other stuff to villages
|
2016-07-10 19:19:41 +02:00 |
|
|
Víðir Valberg Guðmundsson
|
406057f172
|
Adding meaningless migration.
|
2016-07-05 23:59:43 +02:00 |
|
|
Víðir Valberg Guðmundsson
|
cbb48a8553
|
Default should be false in private.
|
2016-07-05 23:58:46 +02:00 |
|
|
Víðir Valberg Guðmundsson
|
d4acb0d434
|
Use private instead of open.
|
2016-07-05 23:57:08 +02:00 |
|
|
Víðir Valberg Guðmundsson
|
fdd6433af5
|
Call "open" "private" instead.
|
2016-07-05 23:55:05 +02:00 |
|
|
Víðir Valberg Guðmundsson
|
94e6ccc101
|
Too much copy pasting going on :P
|
2016-07-05 23:48:04 +02:00 |
|
|
Víðir Valberg Guðmundsson
|
51c7eac4d7
|
Use the right query
|
2016-07-05 23:47:08 +02:00 |
|
|
Víðir Valberg Guðmundsson
|
8786b5af88
|
Initial villages feature
|
2016-07-05 23:43:18 +02:00 |
|
|
Thomas Steen Rasmussen
|
5fe157a868
|
change "paid" field to readonly in django admin
|
2016-07-05 21:43:09 +02:00 |
|
|
Víðir Valberg Guðmundsson
|
fe0bc14ac1
|
Adding content to <title>. Fix #62
|
2016-07-05 18:46:32 +02:00 |
|
|
Víðir Valberg Guðmundsson
|
add35068af
|
Improving the setup process a bit.
|
2016-07-03 14:27:31 +02:00 |
|
|
Víðir Valberg Guðmundsson
|
d7fdc06764
|
Adding note about fees for transfers from outside of denmark.
|
2016-06-29 20:24:13 +02:00 |
|
|
Víðir Valberg Guðmundsson
|
ac8f9a16ae
|
Merge pull request #60 from bornhack/add_facebook
Add facebook and extract contact info into an include
|
2016-06-27 21:58:41 +00:00 |
|
|
Víðir Valberg Guðmundsson
|
fb58ede246
|
Fix casing
|
2016-06-27 23:53:24 +02:00 |
|
|
Víðir Valberg Guðmundsson
|
fafdde8003
|
Duplicate of Twitter.
|
2016-06-27 23:53:24 +02:00 |
|
|
Víðir Valberg Guðmundsson
|
3aa0f9d8a3
|
Add link to Facebook and extract contact info into an include
|
2016-06-27 23:53:24 +02:00 |
|
|
Thomas Steen Rasmussen
|
02096e4f2b
|
fix bug preventing invoice mails from being sent
|
2016-06-22 09:30:03 +02:00 |
|
|
Thomas Steen Rasmussen
|
1e2a9e5afd
|
add link to creditnotes in profile
|
2016-06-19 22:07:44 +02:00 |
|
|
Thomas Steen Rasmussen
|
8712ac4669
|
move creditnote link to the end
|
2016-06-19 22:04:37 +02:00 |
|
|
Thomas Steen Rasmussen
|
11cb0d453f
|
fix creditnote pdf download
|
2016-06-19 22:04:24 +02:00 |
|
|
Thomas Steen Rasmussen
|
ac64d9d555
|
missing import
|
2016-06-19 21:59:50 +02:00 |
|
|
Thomas Steen Rasmussen
|
062f7502d0
|
more creditnote stuff
|
2016-06-19 21:37:25 +02:00 |
|
|
Thomas Steen Rasmussen
|
3e401f03bc
|
show how many tickets get deleted when refunding an order
|
2016-06-19 08:58:26 +02:00 |
|
|
Thomas Steen Rasmussen
|
ab180a7c74
|
pass request to mark_as_refunded()
|
2016-06-19 08:49:30 +02:00 |
|
|
Thomas Steen Rasmussen
|
2dca419b81
|
move import to the right file :)
|
2016-06-19 08:43:56 +02:00 |
|
|
Thomas Steen Rasmussen
|
7fcfd36840
|
missing import
|
2016-06-19 08:40:31 +02:00 |
|
|
Thomas Steen Rasmussen
|
ea36b68493
|
only mark as refunded if order is paid
|
2016-06-19 08:38:43 +02:00 |
|
|
Thomas Steen Rasmussen
|
863b0bc175
|
migration for previous commit
|
2016-06-19 00:16:35 +02:00 |
|
|
Thomas Steen Rasmussen
|
996ecbc36d
|
more work on creditnotes, add refunded field to order, delete tickets when order is marked as refunded
|
2016-06-18 23:42:58 +02:00 |
|
|
Thomas Steen Rasmussen
|
037a23fa2a
|
simplify Ticket admin
|
2016-06-18 23:42:30 +02:00 |
|