reynir/bornhack-website
1
0
Fork 0
Code Issues Pull requests 1 Releases Wiki Activity
1436 commits 2 branches 0 tags 164 MiB
Commit graph

698 commits

Author SHA1 Message Date
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
Thomas Steen Rasmussen c5d7caf3fc better description for formfield 2017-08-01 15:28:04 +02:00
Thomas Steen Rasmussen 036fcf67ef add missing migrations from whatever 2017-08-01 15:26:36 +02:00
Thomas Steen Rasmussen 222da21e7f add some text describing how to propose stuff 2017-08-01 15:23:11 +02:00
Thomas Steen Rasmussen aa5eb1f904 fix bug that made all speakers and eventtypes visible when modifying an event proposal 2017-07-31 22:05:44 +02:00
Thomas Steen Rasmussen 9b44d9d451 fix a typo 2017-07-31 18:28:13 +02:00
Vidir Valberg Gudmundsson 992089f626 Remove random </li> tag. 2017-07-20 13:23:34 +02:00
Stephan Telling 56fc0b4db6
allow users to change the state of allow_video_recording when updating 2017-07-19 15:18:45 +02:00
Thomas Steen Rasmussen 87da054985 better message 2017-07-19 14:42:46 +02:00
Thomas Steen Rasmussen 57f90ec1ce fix irc message with ticket stats 2017-07-19 14:38:55 +02:00
Víðir Valberg Guðmundsson 4dc8e6d95f Delete bornhack-2019_sponsors.html 2017-07-19 12:20:28 +02:00
Víðir Valberg Guðmundsson 5320f853ff Delete bornhack-2018_sponsors.html 2017-07-19 12:19:59 +02:00
Víðir Valberg Guðmundsson 9b22837c8b Delete bornhack-2017_sponsors.html 2017-07-19 12:19:48 +02:00
Víðir Valberg Guðmundsson d98ec59ee6 Delete bornhack-2016_sponsors.html 2017-07-19 12:18:34 +02:00
Thomas Steen Rasmussen 9e53a5152e add missing 2016 sponsor 2017-07-19 12:04:59 +02:00
Stephan Telling d4ba512920 fix clean method for eventinstance 
You can no longer save eventinstances where the camp year doesnt match
for its location and event.
 2017-07-15 18:16:52 +02:00
Vidir Valberg Gudmundsson 5b1d1c79e9 Fix error where everything looks like it has a video. 2017-07-15 18:16:27 +02:00
Vidir Valberg Gudmundsson c5ae8f4d6e Revamp schedule code and fix #128. 2017-07-15 17:58:53 +02:00
Stephan Telling 1a3e1088f7
delete event if speakers arent approved or created 2017-07-15 17:17:19 +02:00
Stephan Telling 05946d065b
fix issue with approving eventproposal with unapproved speakers 
This commit fixes some issues around approving eventproposals with no
speakers attached or unapproved speakers attached.
 2017-07-15 16:48:30 +02:00
Vidir Valberg Gudmundsson 544d6ba07b Sponsors should be filterable by camp. 2017-07-15 16:20:51 +02:00
Vidir Valberg Gudmundsson ef8d3f3ecf Order sponsors alphabetically. 2017-07-15 16:04:31 +02:00
Stephan Telling b60d8fb9a8 fix #135 2017-07-15 15:57:31 +02:00
Vidir Valberg Gudmundsson d2c4a18df7 Styling, and hoping it looks good on @telling's big screen. 2017-07-15 15:35:38 +02:00
Vidir Valberg Gudmundsson d6a07110b7 "Just" use static files for logos. 2017-07-15 15:21:12 +02:00
Vidir Valberg Gudmundsson 7cd82ea3bb Adding models to the sponsor. 2017-07-15 15:21:12 +02:00
Stephan Telling cf81dbe870
remove print statements 2017-07-15 10:04:13 +02:00
Stephan Telling 9866149636
fix event proposal emails, name -> title 2017-07-14 11:03:35 +02:00
Stephan Telling 8b000d8dae
fix string formatting of uuid for irc message 2017-07-13 21:18:57 +02:00
Thomas Steen Rasmussen 79f240d4d1 settings is not a dict 2017-07-12 17:05:27 +02:00
Víðir Valberg Guðmundsson 471e260380 Fixing width on speaker image. 2017-07-12 15:49:52 +02:00
Víðir Valberg Guðmundsson 026324802b Make locations distinguishable 2017-07-12 11:36:23 +02:00
Víðir Valberg Guðmundsson 734c810cff Making EventLocations a bit more usable. 2017-07-12 11:07:11 +02:00
Thomas Steen Rasmussen a028a0696c change the order of text 2017-07-12 00:54:31 +02:00
Thomas Steen Rasmussen 11a9ac5eac a few design changes to people.html 2017-07-12 00:08:51 +02:00
Thomas Steen Rasmussen 9a47622bc6 a few small fixes to team pages 2017-07-11 23:32:56 +02:00
Stephan Telling 3ef4094e94 Merge branch 'master' of github.com:bornhack/bornhack-website 2017-07-11 23:15:31 +02:00
Stephan Telling 78c4f14048
fix irc message for proposals 2017-07-11 23:14:30 +02:00
Stephan Telling 534a2d790d
add missing migration 2017-07-11 23:14:05 +02:00
Thomas Steen Rasmussen 53199e4300 skip this for now 2017-07-11 23:11:31 +02:00
Thomas Steen Rasmussen 8fd7f4c813 unfuck migrations maybe 2017-07-11 22:57:26 +02:00
Thomas Steen Rasmussen 533c1b3efa add initial people stuff 2017-07-11 22:50:31 +02:00
Stephan Telling f4a2f6cea6
add irc messages when new event- or speakerproposals are created 2017-07-11 22:29:06 +02:00
Stephan Telling c02598bfde
fix link in event proposal email 2017-07-11 22:20:53 +02:00
Stephan Telling fcd85f680a
fix #133 
An email is now sent when a new speaker- or eventproposal is created and
when any such is updated.
 2017-07-11 22:02:19 +02:00
Stephan Telling a67f9ee4a5
add mailing_list email field on team model 2017-07-11 19:39:43 +02:00
Thomas Steen Rasmussen a96d9f74be add new fields for the people page 2017-07-11 17:30:18 +02:00
Thomas Steen Rasmussen 124b8a6afd add a default for coinify_callback_hostname 2017-07-11 11:08:53 +02:00
Thomas Steen Rasmussen 974b90676e make coinify callback hostname configurable, so we can workaround old openssl in their callback engine 2017-07-11 11:06:46 +02:00
Thomas Steen Rasmussen 2e13525ad7 only mark as paid if not already paid (aka. dont create tickets again if we see a double callback) 2017-07-11 07:31:15 +02:00
Thomas Steen Rasmussen ec120bca39 only pass the invoicejson not the whole thing 2017-07-11 07:16:51 +02:00
Thomas Steen Rasmussen fe3e2b3d0a callbackobject.payload not invoicejson 2017-07-11 07:11:02 +02:00
Thomas Steen Rasmussen 69074d6496 another missing import 2017-07-11 07:06:25 +02:00
Thomas Steen Rasmussen 1d23989df1 pass order to save_coinify_callback 2017-07-11 07:02:17 +02:00
Thomas Steen Rasmussen 588a36ee56 missing import 2017-07-11 06:57:39 +02:00
Thomas Steen Rasmussen 55316e1bd0 missing import 2017-07-11 06:54:15 +02:00
Thomas Steen Rasmussen bded5d8192 field is called allow_video_recording in EventProposal 2017-07-11 05:24:08 +02:00
Víðir Valberg Guðmundsson 65a085b3ab Output event instance datatimes as timezone. 2017-07-10 12:57:35 +02:00
Víðir Valberg Guðmundsson c313397def Fix video alert in event modal. 2017-07-10 12:50:15 +02:00
Stephan Telling b9fcd841f7 Merge branch 'master' of github.com:bornhack/bornhack-website 2017-07-09 21:26:20 +02:00
Stephan Telling 6744ee1959
add field to allow video recording on event proposal 2017-07-09 21:24:25 +02:00
Víðir Valberg Guðmundsson c32d4aee82 Filter proposals. 2017-07-09 17:00:44 +02:00
Thomas Steen Rasmussen 38d8c25775 fix argument name 2017-07-09 16:54:21 +02:00
Thomas Steen Rasmussen 4f0de99ea2 fix bug in speaker<>camp relationship validation in signal handler 2017-07-09 16:48:02 +02:00
Víðir Valberg Guðmundsson 034543595a Fix error in consumer when camp matching query does not exist. 2017-07-09 16:37:19 +02:00
Víðir Valberg Guðmundsson af94eba144 Fixing 2019 logo 2017-07-09 16:20:22 +02:00
Víðir Valberg Guðmundsson bd8989d9bc Order camps 2017-07-09 16:16:21 +02:00
Víðir Valberg Guðmundsson b27bac8500 Fix error hvor speaker will be added every time a modal is opened. 2017-07-09 16:12:10 +02:00
Víðir Valberg Guðmundsson a32f04548c Adding icon which shows is an event will be recorded or not. 2017-07-09 16:07:59 +02:00
Víðir Valberg Guðmundsson 624ae872a3 Add filtering for events 2017-07-09 15:48:29 +02:00
Víðir Valberg Guðmundsson aa29480498 Apply filtering to ICS button. 2017-07-08 23:00:54 +02:00
Stephan Telling d38d6ce66a Merge branch 'master' of github.com:bornhack/bornhack-website 2017-07-08 20:17:40 +02:00
Stephan Telling 32651eafa7
add initial files for 2019 2017-07-08 20:16:58 +02:00
Stephan Telling 1cea9cf4a4
wrap text about foreign payments in alert class 2017-07-08 20:14:14 +02:00
Víðir Valberg Guðmundsson 2c5815982c Make product categories clickable. 2017-07-08 17:48:10 +02:00
Stephan Telling 0472769513
rename logos for fixing caches 2017-07-08 17:20:59 +02:00
Víðir Valberg Guðmundsson cc8777107e Fixing templates for the new logos. 2017-07-08 16:55:05 +02:00
Víðir Valberg Guðmundsson a1db2dc699 Fixing logos for other years as well. 2017-07-08 16:42:14 +02:00
Víðir Valberg Guðmundsson 95139e483f Adding 2018 logos 2017-07-08 16:23:03 +02:00
Thomas Steen Rasmussen beea33e0b8 remove safety valve to only output to debug channel 2017-07-03 23:02:00 +02:00
Thomas Steen Rasmussen b542853217 lower message check interval a bit 2017-07-03 22:46:47 +02:00
Thomas Steen Rasmussen 6c43e59371 send stats in seperate message, and shorten the ticket names a bit, and disable 1day tickets for now 2017-07-03 22:22:35 +02:00
Thomas Steen Rasmussen 8c01963c8d self.bot please 2017-07-03 21:19:20 +02:00
Thomas Steen Rasmussen 9ad6ba3f6b more nickserv fun 2017-07-03 21:16:07 +02:00
Thomas Steen Rasmussen 205e112718 add nickserv functionality 2017-07-03 21:08:47 +02:00
Thomas Steen Rasmussen 79cd7d73c4 add some more logging to the irc bot 2017-07-03 20:53:44 +02:00
Thomas Steen Rasmussen 7601b33b6a use list() not [] 2017-07-03 20:07:54 +02:00
Thomas Steen Rasmussen 84f79572b0 get channel list to join from settings 2017-07-03 20:05:12 +02:00
Thomas Steen Rasmussen a527e0dd0f a few more changes to irc worker stuff 2017-07-03 19:46:49 +02:00
Thomas Steen Rasmussen 5c689e4076 queue an irc message when we sell a ticket 2017-07-03 19:28:50 +02:00
Thomas Steen Rasmussen 4d9663123a add coinifyapiinvoice property to order model 2017-06-20 09:02:13 +02:00
Thomas Steen Rasmussen e839396d40 right, tempinvoice 2017-06-20 00:18:57 +02:00
Thomas Steen Rasmussen cc874cdbb8 loop over invoices to check if they expired 2017-06-20 00:13:37 +02:00
Thomas Steen Rasmussen 3010033b75 pass request to create_coinify_invoice() 2017-06-19 23:52:01 +02:00
Thomas Steen Rasmussen 45a5f58ddf add missing import 2017-06-19 23:46:52 +02:00
Thomas Steen Rasmussen 11fff93c41 use secure cookies 2017-06-05 23:22:12 +02:00
Stephan Telling 3141e8f588
add missing import, remove unused import and minor changes 2017-06-05 14:52:59 +02:00
Stephan Telling 1e1008a582
fix #131 2017-06-05 10:46:57 +02:00
Stephan Telling be5b6a08a1
add large_svg method on camp model and logos 2017-06-04 16:08:41 +02:00
Stephan Telling 1bfe068d77
add 2018 templates 2017-06-04 13:42:23 +02:00
Stephan Telling 733028e4b7
move createcamp script to camps app 2017-06-04 13:08:59 +02:00
Stephan Telling 6cf4e9577b
fix template names in sponsor app for consistency 2017-06-04 13:05:59 +02:00
Thomas Steen Rasmussen dd736066f7 fixup the team pages a bit, column names and stuff 2017-05-25 19:56:34 +02:00
Thomas Steen Rasmussen f4b2e55478 use name from profile not name from user 2017-05-25 17:36:20 +02:00
Thomas Steen Rasmussen 9bc9ed1ef7 hide <th> when no buttons, add ? to headline 2017-05-24 08:02:33 +02:00
Thomas Steen Rasmussen 0007e5424c split team management into seperate page, fix a few small things 2017-05-24 07:49:32 +02:00
Stephan Telling f2ad740ca2
fix #125 2017-05-23 23:15:31 +02:00
Thomas Steen Rasmussen 903b214d86 do not make all checkboxes in the world invisible 2017-05-23 23:11:32 +02:00
Stephan Telling a0a8d65f34
add missing import 2017-05-23 22:28:21 +02:00
Stephan Telling e7c3b264f4 Merge branch 'master' of github.com:bornhack/bornhack-website 2017-05-23 22:25:35 +02:00
Stephan Telling 79bf459659
send emails for approve/remove actions in team manage 2017-05-23 22:25:06 +02:00
Thomas Steen Rasmussen 96a9f9d4e8 show name from profile 2017-05-23 22:21:48 +02:00
Stephan Telling 49bfc58dda Merge pull request #127 from bornhack/develop 
fix #123
 2017-05-23 22:09:27 +02:00
Stephan Telling 93fdfd5712 add approve action 2017-05-23 22:02:36 +02:00
Thomas Steen Rasmussen f5b612cf0c add member remove button 2017-05-23 22:02:10 +02:00
Thomas Steen Rasmussen 916dba52c1 add member remove button 2017-05-23 21:21:47 +02:00
Thomas Steen Rasmussen 26a8a9d70d quote key 2017-05-22 21:11:06 +02:00
Thomas Steen Rasmussen 36d3d6d3bf json fun 2017-05-22 21:00:52 +02:00
Thomas Steen Rasmussen 6b42358ad6 fix json saves 2017-05-22 20:52:00 +02:00
Thomas Steen Rasmussen cd59f9cf4b add CoinifyAPIRequest to admin 2017-05-22 20:45:22 +02:00
Thomas Steen Rasmussen 475efc08fb kwargs not invoicedict 2017-05-22 20:20:12 +02:00
Thomas Steen Rasmussen 9e5626ddf1 missing import 2017-05-22 20:12:37 +02:00
Thomas Steen Rasmussen e2ba7c84a3 add missing argument 2017-05-22 20:03:41 +02:00
Thomas Steen Rasmussen 916fde4a4d switch to jsonfield 2017-05-22 19:42:20 +02:00
Thomas Steen Rasmussen 1b27145ecb some changes to models.py got lost somehow 2017-05-22 19:41:08 +02:00
Thomas Steen Rasmussen 8644d4ba2f Coinify multiinvoice fix (#126) 
* rework coinify api stuff, work in progress

* fix imports

* indentation

* rework coinify api stuff, work in progress

* fix imports

* indentation
 2017-05-22 18:03:09 +02:00
Stephan Telling 167ec6cd90
Merge branch 'develop' of github.com:bornhack/bornhack-website into develop 2017-05-21 23:12:03 +02:00
Stephan Telling 469b708782 Merge pull request #124 from bornhack/emailworker 
add emailworker for async emails
 2017-05-21 22:37:56 +02:00
Stephan Telling eab2c41f9b
fix bcc_recipients 2017-05-21 22:11:54 +02:00
Stephan Telling 750ab94f93
add defaults for to_recipients in send_mail and add_outgoing_email 2017-05-21 21:14:06 +02:00
Stephan Telling da26b3e0d3
add str method for OutgoingEmail 2017-05-21 20:57:16 +02:00
Stephan Telling 46cf9c53f7
verify invoice emails gets added to the queue and fix names 2017-05-21 20:43:05 +02:00
Stephan Telling febecc137d
rename send email to add email and log on error 2017-05-21 20:15:27 +02:00
Stephan Telling c55c68beff
add bcc and cc to email system 2017-05-21 20:13:49 +02:00
Stephan Telling 6a98ee3564
use a list for recipients rather than a string 2017-05-21 18:06:45 +02:00
Stephan Telling f986617c64
only log if theres emails to be processed 2017-05-21 16:48:06 +02:00
Stephan Telling 95e363b831
change logging from info to debug in emailworker 2017-05-21 16:23:13 +02:00
Stephan Telling 06a24c5899 make manage page part of detail page 2017-05-21 16:06:34 +02:00
Stephan Telling 3395fe8bd5 start work on #123 2017-05-21 16:06:34 +02:00
Stephan Telling 63648cd08e
fix add_outgoing_email to return false if emails cant be validated 2017-05-21 15:04:51 +02:00
Stephan Telling 73eaf5bae4
fix title in team_leave.html 2017-05-12 11:28:09 +02:00
Stephan Telling 3f21422057
start work on #123 2017-05-07 17:55:31 +02:00
Stephan Telling 1522e3997b
set is_staff for users who are responsibles in bootstrap-script 2017-05-07 17:16:35 +02:00
Stephan Telling edc128c94f
update bootstrap script with profile information for users 2017-05-07 16:24:57 +02:00
Stephan Telling e185da7436
add migrations for the OutgoingEmail model 2017-04-30 14:20:36 +02:00
Thomas Steen Rasmussen 12dbc05680 add missing migration for program 2017-04-30 14:12:23 +02:00
Thomas Steen Rasmussen e15c0bd20d add missing migration for profiles 2017-04-30 14:12:00 +02:00
Stephan Telling 098b6ea83c
update invoiceworker to reflect the new email system 
Also removes some comments (for consistency) and some unused imports
 2017-04-30 12:36:03 +02:00
Stephan Telling a8eb0ffe97
use filefield for email attachments, add logging for emailworker 2017-04-30 11:32:49 +02:00
Stephan Telling 16eb7cf594
use os.path.join to create paths for pdf files 2017-04-30 11:28:10 +02:00
Víðir Valberg Guðmundsson 5ef3e79b38 Making day menu responsive. 2017-04-29 14:58:21 +02:00
Víðir Valberg Guðmundsson 521d3c9c71 Fix type filter. 2017-04-29 13:21:06 +02:00
Víðir Valberg Guðmundsson 12d08a092c Still show icon on click. 2017-04-29 13:11:16 +02:00
Víðir Valberg Guðmundsson c32cde780a Adding icons 2017-04-29 12:23:10 +02:00
Thomas Steen Rasmussen 9513a903a3 specify daphne before channels to make it use the specified version as dependency 2017-04-28 09:21:00 +02:00
Thomas Steen Rasmussen a9c4eb97a3 add patched daphne to requirements.txt for now 2017-04-28 09:06:59 +02:00
Stephan Telling 2bab46050f
fix spelling in invoice_email, your -> you 2017-04-28 08:29:04 +02:00
Thomas Steen Rasmussen 62f9daa7e2 use fixed version of channels for now 2017-04-27 20:48:46 +02:00
Víðir Valberg Guðmundsson c845dca950 Now with support for days! 2017-04-27 00:23:03 +02:00
Stephan Telling 61b670931c
mark email as processed when send 2017-04-23 22:08:59 +02:00
Stephan Telling 1f4df68304
add outgoingemail model, add mailhelper function and worker 2017-04-23 22:04:58 +02:00
Stephan Telling 698698a96b
update bootstrap script with orders and orderproductrelations 2017-04-23 21:45:35 +02:00
Thomas Steen Rasmussen 5c4487d513 send email to team responsibles, not to the person joining the team 2017-04-22 00:23:12 +02:00
Víðir Valberg Guðmundsson 30c56afb83 Small esthetic fix. 2017-04-21 19:13:44 +02:00
Víðir Valberg Guðmundsson 13631eac93 Now also mark the filters accordingly to URL. 2017-04-21 19:09:46 +02:00