Commit Graph

19 Commits

Author SHA1 Message Date
Kevin G Christiano
2e0ff9b7dc name change 2020-01-23 09:59:49 -05:00
Kevin G Christiano
9084669695 Preparing for growth. 2019-09-04 15:03:30 -04:00
Kevin G Christiano
d343ae2017 New stuff. 2019-08-22 11:18:50 -04:00
Kevin G Christiano
27202e83b7 no longer needed. 2019-08-21 15:56:02 -04:00
Kevin G Christiano
ec52278144 gotit. 2019-08-21 14:56:18 -04:00
Kevin G Christiano
fd060971e5 Indentation and removal of placeholder variable. 2019-08-15 16:28:17 -04:00
Kevin G Christiano
f16ee20991 Altered font size. Was too big. 2019-08-15 16:12:55 -04:00
Kevin G Christiano
6bff2e844d Revised header logic to play along with the rest. 2019-08-15 09:57:58 -04:00
Kevin G Christiano
03fceaab5a Fixed merge conflicts. 2019-08-15 09:54:19 -04:00
Kevin G Christiano
3fedfb3afe fixing commit 2019-08-15 09:46:45 -04:00
Kevin G Christiano
e1c4fdda63 Merge branch 'develop' into feature/molecular
# Conflicts:
#	JSONCreator_iOS/JSONCreator/AppDelegate.swift
#	JSONCreator_iOS/JSONCreator/DetailViewController.swift
#	JSONCreator_iOS/JSONCreator/MasterViewController.swift
2019-08-15 09:38:57 -04:00
Kevin G Christiano
85f1da00d8 Updated the master VC. logic to query molecular server. 2019-08-15 09:36:40 -04:00
Pfeil, Scott Robert
775139401a Merge branch 'feature/iphone_functional' into 'develop'
Make it more user friendly

See merge request BPHV_MIPS/jsoncreator_ios!1
2019-08-14 15:47:43 -04:00
Pfeil, Scott Robert
5c2901fbfa logic to work on small phones 2019-08-14 11:45:19 -04:00
Pfeil, Scott Robert
0b150e8945 Make it more user friendly 2019-08-13 15:38:59 -04:00
Kevin G Christiano
ac38e271bc Including logic to pull from custom molecular server. 2019-08-13 12:43:42 -04:00
Kevin G Christiano
1884ade36a new file. 2019-08-13 11:24:41 -04:00
Kevin G Christiano
78bded54e5 Designing logic to simply pull from custom server. 2019-08-13 11:24:32 -04:00
Pfeil, Scott Robert
57d9899283 first commit 2019-08-06 15:55:50 -04:00