Commits · 3d8a1c7b6e92a2f677c0ee5305837901bb1afa8f · SRCT / mason-today-web

08 Feb, 2018 1 commit
- 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 2 commits
- 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
- added comments and documentation · b8ec598f
  Aaron R Poulter-martinez authored Dec 26, 2017
  
  b8ec598f
25 Dec, 2017 1 commit

created another cleaning method that gets rid of a ton of junk, almost done... · e38d0b75

Aaron R Poulter-martinez authored Dec 25, 2017

created another cleaning method that gets rid of a ton of junk, almost done with sorting out the locations dates and descriptions, there's something weird with entry 36?

e38d0b75

21 Dec, 2017 1 commit
- edited parscript to list out all titles as text · 8be289c9
  Aaron R Poulter-martinez authored Dec 21, 2017
  
  8be289c9
07 Dec, 2017 2 commits
- Merge branch 'Landon' into 'master' · 5679d9aa
  Landon DeCoito authored Dec 08, 2017
```
Landon

See merge request apoulter/mason-today-web!8
```
  5679d9aa
- completed 'cleanup' function for squashing The Character and slightly revised README · bb610e31
  Landon DeCoito authored Dec 07, 2017
  
  bb610e31
06 Dec, 2017 1 commit
- starting cleanup function and further defined Event class · 3bb91ef1
  Landon DeCoito authored Dec 06, 2017
  
  3bb91ef1
05 Dec, 2017 1 commit
- updated Readme · 5b5af7fc
  Landon DeCoito authored Dec 05, 2017
  
  5b5af7fc
04 Dec, 2017 2 commits
- Merge branch 'Landon' into 'master' · 818b754f
  Landon DeCoito authored Dec 05, 2017
```
Landon

See merge request apoulter/mason-today-web!7
```
  818b754f
- revised requirements.txt and code now works · e2178d33
  Landon DeCoito authored Dec 04, 2017
  
  e2178d33
03 Dec, 2017 5 commits
- code can now parse out a list of events from the xml · f8467fff
  Landon DeCoito authored Dec 03, 2017
  
  f8467fff
- starting to parse info from the doc · e1d239e8
  Landon DeCoito authored Dec 03, 2017
  
  e1d239e8
- Merge branch 'Landon' into 'master' · 88e43a7e
  Landon DeCoito authored Dec 03, 2017
```
Landon

See merge request apoulter/mason-today-web!6
```
  88e43a7e
- starting to code · cea45b6a
  Landon DeCoito authored Dec 03, 2017
  
  cea45b6a
- requirements.txt reflects addition of requests package · 844fc108
  Landon DeCoito authored Dec 03, 2017
  
  844fc108