75f3b80acb
fixed Create new order message on order edit
2019-05-30 02:30:22 +02:00
mcbloch
2d9f7e7fc5
add extra order items screen, clickable div with shadow
2019-05-29 20:12:19 +02:00
mcbloch
02c9abe28c
add location name to browser title
2019-05-29 18:02:55 +02:00
56ef2654a5
added open new tab on marker click
2019-05-29 15:48:38 +02:00
7555b9d65c
fixed poput location
2019-05-28 19:52:38 +02:00
Maxime
7802464c66
Merge pull request #113 from ZeusWPI/fix_map
...
Fix map
2019-04-30 17:28:50 +02:00
mcbloch
dd3fe26b86
add anchor so the marker points to the correct location
2019-04-06 19:31:04 +02:00
mcbloch
94fedf8097
Merge remote-tracking branch 'origin' into fix_map
2019-04-06 19:20:06 +02:00
mcbloch
31a731c1b8
do not query osm for 'None' locations
2019-04-06 19:05:52 +02:00
redfast00
909b3fc2e6
Remove Google Analytics
2019-04-05 23:31:36 +02:00
redfast00
b2c637b343
Serve own bootstrap
2019-04-05 23:26:57 +02:00
redfast00
34aca21a0b
Don't load over protocol-relative URI
2019-04-05 23:10:12 +02:00
mcbloch
83e4a10bbc
fix big ass close order issue #107
2019-04-05 18:24:24 +02:00
mcbloch
a3f0dffc30
move script to separate js file, add loging for bad adresses
2019-04-04 20:41:43 +02:00
mcbloch
3a5f31bfac
add database population script
2019-04-04 18:27:50 +02:00
Maxime
82d870e825
Merge pull request #95 from Kortika/feature/map
...
Feature/map
2019-04-04 17:51:00 +02:00
mcbloch
18c2008959
squash database migrations, update model to be equal to the server
2019-04-02 18:03:14 +02:00
Maxime
cd3e31d44b
Merge pull request #96 from ZeusWPI/date_time_update
...
Date time update.
Update looks good, merging.
2019-04-01 23:41:08 +02:00
Kobe Mertens
c32f2ac387
improved formatting of prices
2019-02-16 21:03:56 +01:00
klaasgoethals
71e16064d3
Added startdate and starttime on order page
2019-02-15 19:03:35 +01:00
klaasgoethals
4322f620d7
Show stoptime AND countdown on home and order page
2019-02-15 16:47:02 +01:00
Sitt Min Oo
a472efad7c
revert change to locations.html
2019-02-14 19:51:12 +01:00
Sitt Min Oo
e27d3977dd
removed copy paste check
2019-02-14 19:47:25 +01:00
Sitt Min Oo
ec91384e9a
added mousehovers for marker popups
2019-02-14 19:34:55 +01:00
Sitt Min Oo
eaf9ba8399
fixed name and address on popup
2019-02-14 19:17:02 +01:00
Sitt Min Oo
baf000eaab
edited db models to separate address and tele no. added map for locations
2019-02-14 18:45:24 +01:00
Sitt Min Oo
0a36eab231
added leaflet files and init maps.html
2019-02-14 16:43:29 +01:00
klaasgoethals
7d10608080
Logo's added
2019-02-13 22:31:52 +01:00
klaasgoethals
65b27f7668
Logo with red icon added
2019-02-13 22:28:16 +01:00
klaasgoethals
eece1844f2
Added favicon
2019-02-13 20:25:44 +01:00
debca79f39
Think this should work -- added primmadonna script
2019-01-23 18:11:10 +01:00
Jan-Pieter Baert
6ec294bcf1
forgot to update create_database and typo fix
2019-01-21 18:15:13 +01:00
Jan-Pieter Baert
e046d78d78
fixed formatting
2019-01-21 17:08:55 +01:00
Jan-Pieter Baert
c0a988d88d
added primadonna to take there
2019-01-21 17:01:02 +01:00
Jan-Pieter Baert
03bf116637
added primadonna from takeaway.com
2019-01-21 16:40:43 +01:00
Rien Maertens
0838c5c501
Add logo
2018-11-06 20:24:40 +01:00
Titouan Vervack
ac6659db2d
Sample keys available now!
2018-03-20 10:55:31 +01:00
Robbe Van Herck
b324d0a723
Added Choose for me button in order
2018-03-19 18:52:15 +01:00
Titouan Vervack
b611fe5961
Removed UTF-8 annotations, better count
2018-03-10 00:50:02 +01:00
Titouan Vervack
2e3ef91ec3
Count and display total # of orders
2018-03-09 00:59:33 +01:00
Titouan Vervack
f9b48969b2
Oops, python3
2018-03-09 00:59:14 +01:00
Titouan Vervack
628c5e55c5
Added total nr of orders to order.html
2018-03-08 23:23:40 +01:00
Titouan Vervack
8567d17bab
Use raw_input instead of input
2018-03-08 23:22:51 +01:00
Titouan Vervack
0ff7dca664
Set utf-8 encoding on required files
2018-03-08 23:22:32 +01:00
Feliciaan De Palmenaer
2208c44a8d
Fix crash in admin panel
2018-02-19 21:34:54 +01:00
Rien Maertens
4eda1e3f36
Use adams for oauth
2017-02-18 19:08:11 +01:00
Feliciaan De Palmenaer
6abd9614ab
Fix deprecations
2017-01-06 12:05:31 +01:00
Wout Schellaert
30a5d05362
Fix errors
2016-09-10 23:25:09 +02:00
Wout Schellaert
ba33a05f66
Add top4 products
2016-09-10 23:01:13 +02:00
Wout Schellaert
a6f71195fd
First data
2016-09-10 16:52:46 +02:00
Wout Schellaert
7ca0e36946
Small reformat
2016-09-10 15:49:52 +02:00
Wout Schellaert
38843173d5
Fix imports
2016-08-16 20:05:36 +02:00
Feliciaan De Palmenaer
ce0fe33c0e
Show prices for locations
...
For @procrat
2016-08-01 23:40:04 +02:00
Feliciaan De Palmenaer
6eeb7e8018
Remove prefixFix, no longer necessary
2016-02-18 11:26:41 +01:00
Rien Maertens
bea56b6a1e
Merge branch 'master' of github.com:ZeusWPI/Haldis
2016-02-09 01:09:39 +01:00
Rien Maertens
1ea873fe17
Added <!channel|@channel>
2016-02-09 01:07:34 +01:00
Feliciaan De Palmenaer
a289ad0697
Update models.py
2016-01-04 19:38:10 +01:00
Feliciaan De Palmenaer
59afcab907
OrderItem: repr to no longer show the product if it's deleted
2016-01-04 19:14:08 +01:00
Feliciaan De Palmenaer
3cf49c7634
Fix errbit
2015-11-29 15:19:37 +01:00
Feliciaan De Palmenaer
073f4bba11
Define id
2015-11-05 17:15:03 +01:00
Feliciaan De Palmenaer
b51fb2d6de
Haldis hot fix, anonymous users cannot delete stuff
2015-10-30 20:30:18 +01:00
Tom Naessens
48e314335f
Merge branch 'master' of github.com:ZeusWPI/Haldis
2015-08-18 21:19:47 +02:00
Tom Naessens
fcafbb68fa
Add search field to ProductAdmin
2015-08-18 21:19:41 +02:00
Stijn Seghers
47d4300e83
Product and paid status of an order can't be NULL
2015-08-18 20:47:49 +02:00
Feliciaan De Palmenaer
2497686abe
Better table Fixes #58
2015-06-24 22:24:21 +02:00
Feliciaan De Palmenaer
4de65752ec
Extras
2015-06-24 22:10:26 +02:00
Feliciaan De Palmenaer
a689dcfa1a
Fixing a little bug
2015-06-19 20:44:58 +02:00
Feliciaan De Palmenaer
f0a0d4f001
Show order stoptime
2015-06-18 14:39:42 +02:00
Feliciaan De Palmenaer
3d50650d8e
Add fancy debugtoolbar when debugging
2015-06-09 22:24:48 +02:00
Tom Naessens
71bfe073e6
Professionally revert a commit
2015-06-09 16:57:15 +02:00
Tom Naessens
19661989a7
#SWAG
2015-06-09 16:55:36 +02:00
Tom Naessens
c77f9150db
Add errbit integration
2015-06-09 16:47:11 +02:00
Feliciaan De Palmenaer
dd4754ec0d
Updated forms and orders
2015-06-09 13:46:37 +02:00
Feliciaan De Palmenaer
79d8a93267
After closing, payment status can still be changed
2015-06-05 14:27:55 +02:00
Feliciaan De Palmenaer
e50e97b428
Add initial profile
2015-06-05 11:39:34 +02:00
Feliciaan De Palmenaer
feb1bb0b69
Add link to form
2015-06-05 11:34:39 +02:00
Feliciaan De Palmenaer
47d46223aa
Added print.css and updated requirements, GA
2015-06-05 11:29:14 +02:00
Feliciaan De Palmenaer
46bf2a0cbb
Merge branch 'master' of github.com:ZeusWPI/Foodbot into feat/38/post_to_slack
...
* 'master' of github.com:ZeusWPI/Foodbot:
Fixed bug for volunteering closes #44
Check if user is allowed to edit
Add paid indicator, fixes #19
spacing
Edit orders
Added phone number
Added alembic and flask-migrate to haldis
2015-06-04 22:57:42 +02:00
Feliciaan De Palmenaer
d6c29b9703
Fixed bug for volunteering closes #44
2015-06-04 22:37:00 +02:00
Feliciaan De Palmenaer
a5e231cc12
Merge branch 'master' of github.com:ZeusWPI/Foodbot into feat/19/paid-indicator
...
* 'master' of github.com:ZeusWPI/Foodbot:
Check if user is allowed to edit
spacing
2015-06-04 22:08:04 +02:00
Feliciaan De Palmenaer
09c1bd5a19
Merge pull request #49 from ZeusWPI/feat/47/add_telephone_number
...
Feat/47/add telephone number
2015-06-04 22:02:49 +02:00
Feliciaan De Palmenaer
90b2954be6
Merge pull request #46 from ZeusWPI/add_db_migrations
...
Added alembic and flask-migrate to haldis (fixes #21 )
2015-06-04 21:50:56 +02:00
Feliciaan De Palmenaer
3d5f6ef1ae
Check if user is allowed to edit
2015-06-04 21:36:57 +02:00
Feliciaan De Palmenaer
39cfd77a7d
Merge branch 'master' of github.com:ZeusWPI/Foodbot into feat/19/paid-indicator
...
* 'master' of github.com:ZeusWPI/Foodbot:
Edit orders
2015-06-04 21:24:13 +02:00
Feliciaan De Palmenaer
69eb22c506
Add paid indicator, fixes #19
2015-06-04 21:20:38 +02:00
Feliciaan De Palmenaer
333a7ec5ec
spacing
2015-06-04 19:13:09 +02:00
Feliciaan De Palmenaer
50a8714c51
Edit orders
2015-06-04 19:11:08 +02:00
Feliciaan De Palmenaer
24d1b7c094
Added phone number
2015-06-04 18:45:59 +02:00
Feliciaan De Palmenaer
9b9eec4e63
Post to slack
2015-06-04 18:33:17 +02:00
Feliciaan De Palmenaer
2d6640b8b9
Added alembic and flask-migrate to haldis
2015-06-04 17:29:37 +02:00
Wout Schellaert
3aa16e2690
Merge branch 'master' of https://github.com/ZeusWPI/Foodbot
2015-05-13 13:35:14 +02:00
Wout Schellaert
111944619f
Package restructure and small create_database changes
2015-05-13 13:34:32 +02:00
Tom Naessens
76ec291d02
Fix #35
2015-04-05 13:08:02 +02:00
Wout Schellaert
81913d2d1b
Refactored create_database, put every addition in seperate file
2015-04-04 14:11:55 +02:00
Bart Mesuere
271e53dcae
punctuation is overrated
2015-04-03 21:04:10 +02:00
Feliciaan De Palmenaer
7436bd37e6
Merge pull request #34 from Donvittorio/master
...
find . -type f -exec sed -i s/James/Haldis/g {} \;
2015-04-03 20:30:03 +02:00
Lorin Werthen
7a82ad13cd
#stopJAMES2k15
2015-04-03 19:11:07 +02:00
Lorin Werthen
e3daf80ff6
lower case james
2015-04-03 18:51:19 +02:00
Feliciaan De Palmenaer
da73af3b19
Add nullable false to order
2015-04-03 18:45:33 +02:00
Lorin Werthen
113fbe98b9
find . -type f -exec sed -i s/James/Haldis/g {} \;
2015-04-03 18:41:44 +02:00
Feliciaan De Palmenaer
037b7ee934
why was this added?
...
How the fuck do you type this.
2015-04-03 18:16:01 +02:00
Feliciaan De Palmenaer
e1b35de786
fixing the db script
2015-04-03 18:11:39 +02:00
Feliciaan De Palmenaer
8a975d5d44
Modify the models to stop allowing certain fields to be null
2015-04-03 14:28:28 +02:00
Feliciaan De Palmenaer
4c94953059
Hopefully lets werkzeug log
2015-04-02 21:01:18 +02:00
Feliciaan De Palmenaer
85790c0a45
Adds placeholder to name field, fixes #25
2015-04-02 20:56:31 +02:00
James
f12c7b4849
Merge branch 'master' of github.com:ZeusWPI/James
2015-04-02 13:00:03 +02:00
James
acc389082b
Put things like they were
2015-04-02 12:59:55 +02:00
Feliciaan De Palmenaer
43b8a4f028
Merge branch 'master' of github.com:ZeusWPI/Foodbot
2015-04-02 12:56:38 +02:00
Feliciaan De Palmenaer
16b630854a
maybe fixes it
2015-04-02 12:56:15 +02:00
James
24c5da72f6
Merge branch 'master' of github.com:ZeusWPI/James
...
Conflicts:
app/app.py
app/james.py
2015-04-02 12:47:11 +02:00
James
6eb310199a
Do stuff on server
2015-04-02 12:45:38 +02:00
Feliciaan De Palmenaer
aa7f916979
Merge branch 'master' of github.com:ZeusWPI/Foodbot
...
Conflicts:
app/app.py
app/james.py
2015-04-02 12:42:39 +02:00
Feliciaan De Palmenaer
7ce3642ef8
Added logging
2015-04-02 12:41:19 +02:00
James
6a5a0ed20d
Remove tmp dir from repo
2015-03-31 20:38:55 +02:00
James
6cb9bf067f
This is really going to hurt
2015-03-31 20:15:22 +02:00
Feliciaan De Palmenaer
d4f129cd35
Merge branch 'master' of github.com:ZeusWPI/Foodbot
2015-03-31 19:24:07 +02:00
Feliciaan De Palmenaer
4cfb0b42aa
Added simpizza to create database script
2015-03-31 19:21:53 +02:00
Tom Naessens
f276b94a1c
Use HTTPS for everything
2015-03-31 16:29:45 +02:00
Tom Naessens
76f7d4c56d
Some PEP8, remove insecure_lib
2015-03-31 16:29:28 +02:00
Tom Naessens
8c464ed73c
Nope
2015-03-31 16:02:30 +02:00
Tom Naessens
a9390ed4e8
Try this
2015-03-31 15:59:35 +02:00
Tom Naessens
6c238ab4f5
Add init file
2015-03-31 15:35:53 +02:00
Tom Naessens
5515b7c370
Add wsgi goodies
2015-03-31 15:11:40 +02:00
Tom Naessens
1c76a318cd
Merge branch 'master' of github.com:ZeusWPI/James
2015-03-31 15:11:26 +02:00
Tom Naessens
e59d7b5cc6
Add newline at end of file
2015-03-31 15:11:20 +02:00
Feliciaan De Palmenaer
bcefb66ac4
Fix create database, really add iepoev to the database
2015-03-31 13:16:10 +02:00
Wout Schellaert
9d9886c511
Added iepoev as admin
2015-03-31 12:18:00 +02:00
Feliciaan De Palmenaer
00613a7db8
better form layout orders page
2015-03-31 00:55:50 +02:00
Feliciaan De Palmenaer
8c992beed7
new layout
2015-03-31 00:51:30 +02:00
Feliciaan De Palmenaer
5677986378
Foodbot is dead, long live James
2015-03-31 00:06:09 +02:00
Gilles Jacobs
1151671aba
JAMES
2015-03-30 23:53:21 +02:00
Feliciaan De Palmenaer
7032f2ad77
`The Final Countdown
2015-03-30 23:02:05 +02:00
Wout Schellaert
a0b2e6dd3d
Merge remote-tracking branch 'origin/master'
2015-03-30 18:50:53 +02:00
Wout Schellaert
0cbbb7433c
Fixed spelling
2015-03-30 18:50:39 +02:00
Feliciaan De Palmenaer
e8d72e686a
Merge branch 'master' of github.com:ZeusWPI/Foodbot
2015-03-30 18:38:27 +02:00
Feliciaan De Palmenaer
f379448e31
make select2 look better in bootstrap
2015-03-30 18:37:39 +02:00
Wout Schellaert
efeb3e08a3
Added autogenerate for Chinese
2015-03-30 18:30:01 +02:00
Feliciaan De Palmenaer
c2c1b86aae
flash things to the user
2015-03-30 00:38:53 +02:00
Feliciaan De Palmenaer
0a9212f2fe
oops super
2015-03-30 00:29:32 +02:00
Feliciaan De Palmenaer
79063f8bdf
added a footer
2015-03-30 00:23:59 +02:00
Feliciaan De Palmenaer
c3d776a985
added date pickers, only admins can set starttime
2015-03-30 00:01:07 +02:00
Feliciaan De Palmenaer
6c0badfd55
search items
2015-03-29 22:44:26 +02:00
Feliciaan De Palmenaer
9cd05b61d2
flash messages
2015-03-29 13:01:42 +02:00
Feliciaan De Palmenaer
b9a1a62a81
Fix some bugs ( closes #8 )
2015-03-29 11:46:08 +02:00
Feliciaan De Palmenaer
d2621c75f5
clearer model string representation
2015-03-28 23:31:38 +01:00
Feliciaan De Palmenaer
75dee4ebbd
Some more layouting
2015-03-28 23:21:43 +01:00
Feliciaan De Palmenaer
28cd6947a5
Added some layouting
2015-03-28 23:06:36 +01:00
Feliciaan De Palmenaer
b4d1868988
Also show recently closed orders
2015-03-28 21:25:55 +01:00
Feliciaan De Palmenaer
08c0922591
Removed some bugs in closing an order
2015-03-28 21:12:02 +01:00
Feliciaan De Palmenaer
bf1b6b92ab
With unregistered user ( fixes #1 )
2015-03-28 20:38:15 +01:00
Feliciaan De Palmenaer
511bdebea5
Change food => product, orders => items, closes #6
2015-03-28 19:25:38 +01:00
Wout Schellaert
95519f813f
moved requirements to top level
...
added me as admin
2015-03-28 13:32:22 +01:00
Wout Schellaert
756b447719
Added testvalues & made stats non private
2015-03-28 12:17:04 +01:00
Wout Schellaert
4522adb3cc
Merge remote-tracking branch 'origin/master'
2015-03-28 11:32:50 +01:00
Feliciaan De Palmenaer
8b99a763d8
Better close button
2015-03-28 10:49:28 +01:00
Feliciaan De Palmenaer
09e3aece73
Randomly select someone
2015-03-28 02:01:30 +01:00
Feliciaan De Palmenaer
a0b79b68ac
Added totals
2015-03-28 01:31:04 +01:00
Feliciaan De Palmenaer
7514396669
"I volunteer as Tribute"
2015-03-28 01:09:59 +01:00
Feliciaan De Palmenaer
c160002a94
Delete items, with fancy icon
2015-03-28 00:44:58 +01:00
Wout Schellaert
d323a7065c
Merge remote-tracking branch 'origin/master'
...
Conflicts:
app/create_database.py
2015-03-28 00:08:27 +01:00
Feliciaan De Palmenaer
b34dc7fccc
Add order items and split views
2015-03-28 00:02:12 +01:00
Feliciaan De Palmenaer
070dc241a9
Create order from order page
2015-03-27 23:24:41 +01:00
Feliciaan De Palmenaer
424af3e2cb
Added orders form (simple bootstrap), using new bootstrap package
2015-03-27 21:57:37 +01:00
Feliciaan De Palmenaer
d2f9b4dc9d
Look fancy error pages
2015-03-27 18:25:09 +01:00
Feliciaan De Palmenaer
6e660399a2
Added an order detail view, and open orders on the homepage
2015-03-27 18:07:06 +01:00
Wout Schellaert
56c908c63f
Removed slotmachien slack stuff
2015-03-27 14:03:28 +01:00
Feliciaan De Palmenaer
55a5c9b927
Remove some CSS
2015-03-27 01:25:21 +01:00
Feliciaan De Palmenaer
5da909dce4
Remove URL prefix, can be added during deploy, see http://flask.pocoo.org/snippets/35/ or so
2015-03-27 01:23:07 +01:00
Feliciaan De Palmenaer
0426b71556
bootstrap 3 ftw
2015-03-27 01:07:43 +01:00
Feliciaan De Palmenaer
7a8b8b7434
Modified the base layout to show the logged in users name
2015-03-26 23:31:13 +01:00
Feliciaan De Palmenaer
70a5874089
Merge branch 'master' of github.com:ZeusWPI/Foodbot
2015-03-26 23:18:07 +01:00
Feliciaan De Palmenaer
e58ed018bd
lol admin interface
2015-03-26 23:17:51 +01:00
Wout Schellaert
96f7542104
Dunno what ichanged
2015-03-26 22:45:41 +01:00
Feliciaan De Palmenaer
4e2780d9be
mode some changes to get it working
2015-03-26 22:32:34 +01:00
Wout Schellaert
c851ce11ec
Edited User parameters
2015-03-26 22:23:11 +01:00
Wout Schellaert
b69132b5b7
Removed imports
2015-03-26 22:17:50 +01:00
Feliciaan De Palmenaer
051588fba9
updated thingies
2015-03-26 22:11:58 +01:00
Feliciaan De Palmenaer
b3b1d25bb5
Removed some more unnecsarry settings
2015-03-26 21:59:51 +01:00
Feliciaan De Palmenaer
a17ffaf4a3
Remove reference to slotmachien
2015-03-26 21:58:55 +01:00
Feliciaan De Palmenaer
f9968e0654
Removed config file
2015-03-26 21:56:49 +01:00
Wout Schellaert
cc62911509
LoL windoos
2015-03-26 21:54:43 +01:00
Feliciaan De Palmenaer
eba3fc5f07
forgot to add some files
2015-03-26 21:49:14 +01:00
Feliciaan De Palmenaer
cf9fcfbad3
Lol did not test this
2015-03-26 21:45:27 +01:00
Wout Schellaert
258a7ab992
LeesMij
2015-03-26 00:21:25 +01:00
Wout Schellaert
f57b636e3e
Initial commit
2015-03-26 00:17:43 +01:00
