Commits · fb6734c382a4c856e1a5ce4e517d56c77496a14d · SRCT / mason-today-web

21 Mar, 2018 1 commit
- fixing tostring · fb6734c3
  Zach Osman authored Mar 21, 2018
  
  fb6734c3
20 Mar, 2018 1 commit
- Added exceptions to handle bad event-making. Thanks, Phi Beta Sigma · 9109f6b9
  Landon DeCoito authored Mar 20, 2018
  
  9109f6b9
21 Feb, 2018 1 commit
- Re-removed print statement · 41bf8081
  Landon DeCoito authored Feb 21, 2018
  
  41bf8081
20 Feb, 2018 3 commits
- Merge branch 'OpenSourceDay' into 'master' · 88209a14
  Landon DeCoito authored Feb 20, 2018
```
added print statement

See merge request !22
```
  88209a14
- added print statement · 91bff8dd
  Mohidin Hassan authored Feb 20, 2018
  
  91bff8dd
- removed print statement · 4832fa7b
  Landon DeCoito authored Feb 20, 2018
  
  4832fa7b
19 Feb, 2018 3 commits
- k actually fixed it this time · 3ed2d943
  Aaron R Poulter-martinez authored Feb 19, 2018
  
  3ed2d943
- changed notprovide from not not to just one not · 55430601
  Aaron R Poulter-martinez authored Feb 19, 2018
  
  55430601
- Merge branch 'DeleteStartProd' into 'master' · 23859bf7
  Landon DeCoito authored Feb 19, 2018
```
Deleting startprod

See merge request !20
```
  23859bf7
15 Feb, 2018 1 commit

Zach Osman authored Feb 15, 2018

Startprod was created as a quick way to "deploy" a server
we have since moved to nginx+uwsgi

0b007ffc

14 Feb, 2018 1 commit
- edited location so it doesn't return a leading comma · 4d2e96ef
  Aaron R Poulter-martinez authored Feb 14, 2018
  
  4d2e96ef
08 Feb, 2018 4 commits
- Delete parscript.pyc · 1ea66002
  Landon DeCoito authored Feb 08, 2018
  
  1ea66002
- Delete app.pyc · 573dcb96
  Landon DeCoito authored Feb 08, 2018
  
  573dcb96
- Merge branch 'Landon' into 'master' · e3f6687c
  Landon DeCoito authored Feb 08, 2018
```
deleted pycache. I think

See merge request !19
```
  e3f6687c
- deleted pycache. I think · 3d8a1c7b
  Landon DeCoito authored Feb 08, 2018
  
  3d8a1c7b
07 Feb, 2018 1 commit
- added reference to current JSON host URL in README · 773e9023
  Landon DeCoito authored Feb 07, 2018
  
  773e9023
05 Feb, 2018 2 commits
- Merge branch 'scriptfix' into 'master' · bec53833
  Zach Osman authored Feb 05, 2018
```
Adding #!/bin/sh to scripts to force scripts to use bash

See merge request !16
```
  bec53833
- Adding #!/bin/sh to scripts to force scripts to use bash · 5a92f45c
  Zach Osman authored Feb 05, 2018
```
making using sh to start scripts on bash alternatives unnessacary
```
  5a92f45c
02 Feb, 2018 2 commits
- Merge branch 'Landon' into 'master' · fbe8f7e4
  Landon DeCoito authored Feb 02, 2018
```
parsed a unique event id and placed it into the first dictionary item

See merge request !15
```
  fbe8f7e4
- parsed a unique event id and placed it into the first dictionary item · 469fdba1
  Landon DeCoito authored Feb 02, 2018
  
  469fdba1
01 Feb, 2018 3 commits
- adding more comprehensive git ignore · e3c5539c
  Zach Osman authored Feb 01, 2018
```
removing begining line of parscript
```
  e3c5539c
- Restoring start command from what is now the start production command · 51d11e3e
  Zach Osman authored Feb 01, 2018
  
  51d11e3e
- Adding mbailies changes + mine · a1c2f30d
  Zach Osman authored Feb 01, 2018
  
  a1c2f30d
31 Jan, 2018 8 commits
- readme · 39e5fd06
  Zac Wood authored Jan 31, 2018
  
  39e5fd06
- renamed stuff, added basic instructions to start dev server · b783e3c2
  Zac Wood authored Jan 31, 2018
  
  b783e3c2
- flask server · ad6acda4
  Zac Wood authored Jan 31, 2018
  
  ad6acda4
- Merge branch 'Landon' into 'master' · dc41fe96
  Landon DeCoito authored Jan 31, 2018
```
parscript is now a complete function, returning a list of dictionaries

See merge request apoulter/mason-today-web!14
```
  dc41fe96
- parscript is now a complete function, returning a list of dictionaries · af3aa97b
  Landon DeCoito authored Jan 31, 2018
  
  af3aa97b
- Merge branch 'Landon' into 'master' · 368dcfce
  Landon DeCoito authored Jan 31, 2018
```
revamped requirements.txt to follow convention

See merge request apoulter/mason-today-web!13
```
  368dcfce
- revamped requirements.txt to follow convention · 87736754
  Landon DeCoito authored Jan 31, 2018
  
  87736754
- Merge branch 'Landon' into 'master' · a2467435
  Landon DeCoito authored Jan 31, 2018
```
WE MAKE TIM GUD

See merge request apoulter/mason-today-web!12
```
  a2467435
29 Jan, 2018 1 commit
- TIM WURK GUD NAO · 3d9a1176
  Landon DeCoito authored Jan 29, 2018
  
  3d9a1176
27 Jan, 2018 7 commits
- Merge branch 'aaronmartinez' into 'master' · e10fc3c2
  Aaron R Poulter-martinez authored Jan 27, 2018
```
Merge 2 electric boogaloo

See merge request apoulter/mason-today-web!11
```
  e10fc3c2
- Merge branch 'master' into 'aaronmartinez' · b9c59361
  Aaron R Poulter-martinez authored Jan 27, 2018
```
# Conflicts:
#   pscripts/parscript.py
```
  b9c59361
- small edit to make sure all locations are lists · 139422c1
  Aaron R Poulter-martinez authored Jan 27, 2018
  
  139422c1
- Merge branch 'Landon' into 'master' · a8e6608d
  Landon DeCoito authored Jan 27, 2018
```
Landon

See merge request apoulter/mason-today-web!10
```
  a8e6608d
- split time from day of the week and date. concatenated cleanup functions · 340a95e7
  Landon DeCoito authored Jan 27, 2018
  
  340a95e7
- fixed requirements typo and updated events.xml for no reason · 2bc0f147
  Landon DeCoito authored Jan 27, 2018
  
  2bc0f147
- wurk plz · f238ea0e
  Aaron R Poulter-martinez authored Jan 27, 2018
  
  f238ea0e
26 Dec, 2017 1 commit
- Merge branch 'aaron-martinez' into 'master' · f6ba3b5d
  Aaron R Poulter-martinez authored Dec 26, 2017
```
Aaron martinez

See merge request apoulter/mason-today-web!9
```
  f6ba3b5d