This is a test#3

Open

louisachoy wants to merge 69 commits intodocumentation-scottfrom

documentation-louisa

Commits on Sep 2, 2016

Merge pull request #1 from scottvieira/documentation-scott
scottvieira
authored

Commits on Sep 15, 2016

Merge pull request #2 from scottvieira/documentation-scott
scottvieira
authored

Commits on Oct 5, 2016

Merge remote-tracking branch 'refs/remotes/origin/documentation-scott' into documentation-louisa
Louisa Choy
committed

Commits on Oct 6, 2016

Commits on Oct 10, 2016

Merge pull request #4 from scottvieira/documentation-yan
xsong9
authored

Commits on Oct 21, 2016

Merge remote-tracking branch 'refs/remotes/origin/master' into documentation-louisa
Louisa Choy
committed
added emoticons

Louisa Choy
authored and
Louisa Choy
committed
attempting to remove emoticons

Louisa Choy
authored and
Louisa Choy
committed
added helloworld to test1 branch

Louisa Choy
authored and
Louisa Choy
committed
removed helloworld

Louisa Choy
authored and
Louisa Choy
committed

Commits on Nov 14, 2016

update organization's images
Scott Vieira
committed
image notes in docstyleguide
Scott Vieira
committed
delete images
Scott Vieira
committed

Commits on Nov 15, 2016

cleanup
Scott Vieira
committed
image add
Scott Vieira
committed
cleanup
Scott Vieira
committed
test1
Scott Vieira
committed
test1 removed
Scott Vieira
committed
test2
Scott Vieira
committed
update org images
Scott Vieira
committed
update image guidelines
Scott Vieira
committed

Commits on Nov 22, 2016

add management
scottvieira
committed
changes org examples to plural

Louisa Choy
authored and
Louisa Choy
committed
made changes to org examples

Louisa Choy
authored and
Louisa Choy
committed
Merge remote-tracking branch 'refs/remotes/origin/master' into documentation-louisa
Louisa Choy
committed
add new organizations images

Louisa Choy
authored and
Louisa Choy
committed
made edits to text and inserted images

Louisa Choy
authored and
Louisa Choy
committed
create general img subdir and uploaded icon images

Louisa Choy
authored and
Louisa Choy
committed
make edits to text and inserted images

Louisa Choy
authored and
Louisa Choy
committed
edited view icon img

Louisa Choy
authored and
Louisa Choy
committed
addscreenshots for management module

Louisa Choy
authored and
Louisa Choy
committed
inserted icons

Louisa Choy
authored and
Louisa Choy
committed
inserted icons

Louisa Choy
authored and
Louisa Choy
committed

Commits on Nov 23, 2016

Commits on Nov 30, 2016

Merge remote-tracking branch 'refs/remotes/origin/master' into documentation-louisa
Louisa Choy
committed
minor edits to text

Louisa Choy
authored and
Louisa Choy
committed
replace editdocumentrecord image

Louisa Choy
authored and
Louisa Choy
committed
made minor edits to text

Louisa Choy
authored and
Louisa Choy
committed

Commits on Dec 1, 2016

test100
Scott Vieira
committed
test1000
Scott Vieira
committed

Commits on Dec 8, 2016

btest1 testedit
Scott Vieira
committed
btest6
Scott Vieira
committed
Merge pull request #12 from scottvieira/btest6
scottvieira
authored

Commits on Dec 14, 2016

Commits on Jan 19, 2017

content edits to licensing doc up to display notes section

Louisa Choy
authored and
Louisa Choy
committed
update licensing admin info and added new images

Louisa Choy
authored and
Louisa Choy
committed
formatting edits, added screenshots, and further content edits through to the end

Louisa Choy
authored and
Louisa Choy
committed
added more screenshots for licensing documentation

Louisa Choy
authored and
Louisa Choy
committed

Commits on Jan 31, 2017

Merge remote-tracking branch 'refs/remotes/scottvieira/master' into documentation-louisa
Louisa Choy
committed
more edits to licensing and additional licensing screenshots

Louisa Choy
authored and
Louisa Choy
committed
Merge pull request #18 from Coral-erm/documentation-louisa
Louisa Choy
authored
added gitignore file

Louisa Choy
authored and
Louisa Choy
committed
Add files via upload
Louisa Choy
authored
Merge pull request #21 from Coral-erm/documentation-louisa
Louisa Choy
authored