testing PR - #1

Open

aashu4uiit wants to merge 139 commits into

alanagoyal:masterfrom

aashu4uiit:master

Commits on Jun 22, 2016

Updated with Guice/JPA/Jersey
mqprichard
committed
f203dbd
Added README.md
mqprichard
committed
d3b6469
Update README with basic instructions
mqprichard
committed
1d41530
Formatting MD
mqprichard
committed
fec6690
Added example to README
mqprichard
committed
b60734a
Updated jackson dependencies
mqprichard
committed
b0f841d
Added Apache 2.0 license
mqprichard
committed
d5477e1
Added alana's branch
Alana Anderson
committed
6c13aba

Commits on Jun 23, 2016

test pull request
Stephanie Chou
committed
a2651a3
added appdynamics sample app
Stephanie Chou
committed
008845d
Merge pull request #2 from alanaanderson/alana
Jennifer
authored
cccba6e
Add web direcotry
Jennifer
committed
09a5498
Move src to rest
Jennifer
committed
8059cbe
Build and run with docker-compose
Jennifer
committed
801ca9e
add web stuff
Stephanie Chou
committed
d950c17
Merge remote-tracking branch 'upstream/master'
Stephanie Chou
committed
0d001f6
Add web direcotry
Jennifer
committed
3c8b542
Move src to rest
Jennifer
committed
3a5f127
Build and run with docker-compose
Jennifer
committed
20aa9c3
Fix exceptions
Jennifer
committed
837fc61
Merge dev and master
Jennifer
committed
4445d97
Modify SampleApp.java
Jennifer
committed
22fea7a
Added Agent installation to startup
mqprichard
committed
74e4d39
Added App Server Agent install
mqprichard
committed
35762b7
Added OpenJDK 8 as default
mqprichard
committed
ead9cda
web prototype
Stephanie Chou
committed
7802545
remove extraneous files and folders from Sample App
Stephanie Chou
committed
5fa1bf6
Merge remote-tracking branch 'upstream/master'
Stephanie Chou
committed
981dd66

Commits on Jun 24, 2016

post request works
Stephanie Chou
committed
cfe9d59
move body-parser to node_module folder
Stephanie Chou
committed
82d0565
Merge pull request #4 from Stephanie-Chou/master
Jennifer
authored
573748d
Style and Content Changes
Stephanie Chou
committed
b40fbd6
Bug Fix: Save New Product shows newly added product without refresh
Stephanie Chou
committed
4dd401d
add header text to sample application instructions
Stephanie Chou
committed
ea65bd9
Sample App Edits and Clean up
Stephanie Chou
committed
1da1949
Moved sample-app to docker container
mqprichard
committed
90f55f3
merge
Stephanie Chou
committed
e27b1d1
Modify README
Jennifer
committed
447df53
test pull request

Stephanie Chou
authored and
mqprichard
committed
52fb97c
added appdynamics sample app

Stephanie Chou
authored and
mqprichard
committed
f3b6ff4
add web stuff

Stephanie Chou
authored and
mqprichard
committed
2d980d1
web prototype

Stephanie Chou
authored and
mqprichard
committed
c569f0d
remove extraneous files and folders from Sample App

Stephanie Chou
authored and
mqprichard
committed
9b7e5f4
post request works

Stephanie Chou
authored and
mqprichard
committed
8401aae
move body-parser to node_module folder

Stephanie Chou
authored and
mqprichard
committed
2421b04
Style and Content Changes

Stephanie Chou
authored and
mqprichard
committed
49993c4
Bug Fix: Save New Product shows newly added product without refresh

Stephanie Chou
authored and
mqprichard
committed
ad1b5e6
add header text to sample application instructions

Stephanie Chou
authored and
mqprichard
committed
3d87766
Sample App Edits and Clean up

Stephanie Chou
authored and
mqprichard
committed
37f5ab2
Moved sample-app to docker container
mqprichard
committed
bd5eca7
Added node.js dynamics configuration
mqprichard
committed
5b230a9
Using npm to load modules
mqprichard
committed
002cb95
Removed node_modules
mqprichard
committed
31df9b0
Edit readme

Jennifer
authored and
mqprichard
committed
160f286
Add screenshot

Jennifer
authored and
mqprichard
committed
526debe
Modify README

Jennifer
authored and
mqprichard
committed
ef12893
Cleaned up README
mqprichard
committed
bef09c5
Fixed README
mqprichard
committed
f4a21a6
Fixed .gitignore for node-properties.txt
mqprichard
committed
a9580a0
Removed appd.coffee
mqprichard
committed
c780834
Remove Tomcat utility webapps
mqprichard
committed
719404f

Commits on Jun 25, 2016

Added Response return types to RESTExceptions
mqprichard
committed
3b4c507

Commits on Jun 27, 2016

clean up code
Stephanie Chou
committed
4eed480
Added logging injection
mqprichard
committed
6539108

Commits on Jun 28, 2016

merge
Stephanie Chou
committed
d54608a
Added README for rest service
mqprichard
committed
2791286
Renamed web project to portal
mqprichard
committed
cfca9db
Renamed sample-app to web
mqprichard
committed
a2b891b
Fixed link in README.md
mqprichard
committed
b390080
Updated docker-compose.yml
mqprichard
committed
9482e29
Renamed web service
mqprichard
committed
ee594ce

Commits on Jul 1, 2016

Commits on Jul 5, 2016

Sample App Server Code Clean Up and Button Functionality
Stephanie Chou
committed
2eae018
Added README for rest service

mqprichard
authored and
Stephanie Chou
committed
4611c2b
Renamed web project to portal

mqprichard
authored and
Stephanie Chou
committed
cf2254b
Renamed sample-app to web

mqprichard
authored and
Stephanie Chou
committed
51cc2f5
Fixed link in README.md

mqprichard
authored and
Stephanie Chou
committed
c908fc0
Updated docker-compose.yml

mqprichard
authored and
Stephanie Chou
committed
6304e0f
Renamed web service

mqprichard
authored and
Stephanie Chou
committed
fd5bdd8
Moved AppD agent config and start commands to exec scripts

mqprichard
authored and
Stephanie Chou
committed
25c09e6
Added -it flag to log tail instructions and comments

mqprichard
authored and
Stephanie Chou
committed
682599a
test pull request
Stephanie Chou
committed
6c85041
add web stuff
Stephanie Chou
committed
2f97197

Commits on Jul 6, 2016

web prototype
Stephanie Chou
committed
9ad5e1e
Style and Content Changes
Stephanie Chou
committed
f0694e7
Moved sample-app to docker container

mqprichard
authored and
Stephanie Chou
committed
c362d24
Sample App Server Code Clean Up and Button Functionality
Stephanie Chou
committed
d7291f8
Merge
Stephanie Chou
committed
983cc1c
merge remove portal
Stephanie Chou
committed
8f7998b
Modify web to start with docker exec
Jennifer
committed
e47ed40
Remove redundant files
Jennifer
committed
9cc9cb3
Merge conflicts
Jennifer
committed
ec8318e
Merge branch 'Stephanie-Chou-master' into merge
Jennifer
committed
745e494

Commits on Jul 7, 2016

Update Dockerfile and package.json
Jennifer
committed
333a9e8

Commits on Jul 11, 2016

Modified README
Jennifer
committed
206655a
Update README
Jennifer
authored
0d4944a

Commits on Jul 18, 2016

Bug Fix: java and sql exceptions should be thrown
Stephanie Chou
authored
11f5219
Merge pull request #8 from Stephanie-Chou/master
Jennifer
authored
5e691ff
Bug Fix: Java and Sql exceptions were not thrown from node app
Stephanie Chou
committed
191d1f2

Commits on Jul 20, 2016

Enable connection through ssl
Jennifer
committed
b5781de
Enable ssl for web
Jennifer
committed
e9b9db8

Commits on Jul 21, 2016

Modify readme and small fix
Jennifer
committed
f1154e8

Commits on Jul 26, 2016

Fix ssl logic for rest and web
Jennifer
committed
de46839

Commits on Aug 1, 2016

Bug Fix: delete and update always effect last product, not selected product
Stephanie Chou
authored
66bd22b

Commits on Aug 2, 2016

Rename start to start-all
Jennifer
committed
3755b54
Edit README
Jennifer
committed
06ec0df

Commits on Aug 8, 2016

App Clean Up
Stephanie Chou
committed
461defe

Commits on Aug 10, 2016

Added environment variables for controller and portal properties
mqprichard
committed
150217d
Added environment variables to web container
mqprichard
committed
a27f3a9
Added import.sql and GenerationType.IDENTITY
mqprichard
committed
d1a1615

Commits on Aug 11, 2016

Sample App Style Redesign
Stephanie Chou
committed
b5e429f

Commits on Aug 12, 2016

Added appd-controller.js to web container
mqprichard
committed
e9abcb6

Commits on Aug 17, 2016

Sample App Style Redesign
Stephanie Chou
committed
b7bd6fb

Commits on Aug 22, 2016

Sample App Style Redesign
Stephanie Chou
committed
71fc2b2
Sample App Style Redesign
Stephanie Chou
committed
0d9a36c

Commits on Aug 25, 2016

Add ApplicationId
Stephanie Chou
committed
53dad73
add -o to unzip, avoid check for existing files
Jennifer
committed
02133f0

Commits on Aug 26, 2016

Added Controller API call to retrieve app id
mqprichard
committed
75c6070
Added Controller credentials for API calls
mqprichard
committed
887b41e
Fixed typo in usage message
mqprichard
committed
fc2c437

Commits on Aug 29, 2016

Removed Controller API call, added checks to install scripts
mqprichard
committed
4a418e4
Added Jennifer's changes to pick up app id
mqprichard
committed
8f22ad3
Fixed typo in docker-compose.yml
mqprichard
committed
92c766f
Move flowmap to business transaction section
Jennifer
committed
2eeb757
Small changes of text and added favicon
Jennifer
committed
47dca52
Fix favicon path
Jennifer
committed
5cde019
Formatted script output
mqprichard
committed
bd0553d

Commits on Aug 30, 2016

Fix typos
Jennifer
committed
dba1c85
Modify yml file to pull from Docker Hub
Jennifer
committed
e363972

Commits on Sep 16, 2016

Modify README
Jennifer
committed
c77b758
Update Readme
Jennifer
authored
d6c94ee

Commits on Sep 18, 2016

Modify link url to include accountName
Jennifer
committed
2a4ce22

Commits on Sep 26, 2016

Add Infographic
Stephanie Chou
committed
5e87970

Commits on Sep 27, 2016

remove include line. sample app was not loading
Stephanie Chou
committed
0d185e7

Commits on Oct 6, 2016

Updated UI to include screenshots, button pattern, removed slow transactions
Jennifer
committed
87d0313
Fix add and delete buttons
Jennifer
committed
15a90d8

Commits on Oct 10, 2016

Update view to multiple pages, add CTA to Getting Started, error handling when APP_ID is empty
Jennifer
committed
65d8537

Commits on Nov 19, 2016

Adjust Typos
Jennifer
committed
9bc509f