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 |
|