# This is a combination of 2 commits.
# The first commit's message is:

# This is a combination of 4 commits.
# The first commit's message is:
# This is a combination of 3 commits.
# The first commit's message is:
# This is a combination of 2 commits.
# The first commit's message is:

# This is a combination of 3 commits.
# The first commit's message is:
# This is a combination of 3 commits.
# The first commit's message is:
# This is a combination of 3 commits.
# The first commit's message is:
# This is a combination of 2 commits.
# The first commit's message is:

# This is a combination of 4 commits.
# The first commit's message is:
# This is a combination of 2 commits.
# The first commit's message is:

# This is a combination of 6 commits.
# The first commit's message is:
# This is a combination of 2 commits.
# The first commit's message is:

# This is a combination of 2 commits.
# The first commit's message is:

# This is a combination of 2 commits.
# The first commit's message is:

# This is a combination of 2 commits.
# The first commit's message is:

# This is a combination of 28 commits.
# The first commit's message is:
fixing .csproj file

# This is the 2nd commit message:

# This is the 3rd commit message:

Added more screen captures; text updates.

Added screen captures, finished draft user guide; rest api update.

Changed the output so that members and entities get level three headings.

experiment with reformatting remarks in Putuser command.

Added new file for top of ref doc; Updated REST API doc.

Added authoring guide stub.

Added some content and screen captures to the auth guide.

Added more text and screen captures

More screen captures and procedures.

Auth guide updates, sample planning spreadsheet.

Set build properties to correct settings (turned off XML docs, turned on treat warnings as errors.

# This is the 4th commit message:

[Tests] Implemented few unit tests for datepicker.

# This is the 5th commit message:

Search Engine Optimization - Friendly URLs

# This is the 6th commit message:

implementing Wahib's suggestions

# This is the 7th commit message:

additional timeline attributes + migration code

# This is the 8th commit message:

# This is the 9th commit message:

testing stored procedure on Azure

# This is the 10th commit message:

adding switch statement for providerName

# This is the 11th commit message:

# This is the 12th commit message:

correcting typo

# This is the 13th commit message:

# This is the 14th commit message:

# This is the 15th commit message:

# This is the 16th commit message:

adding query for returning nested timeline subtree

# This is the 17th commit message:

adding migration

# This is the 18th commit message:

adding "returning entire subtree" optimization

# This is the 19th commit message:

bug fix + migration-cleanup

# This is the 20th commit message:

--allow-empty-message

# This is the 21st commit message:

# This is the 22nd commit message:

completing unit test code

# This is the 23rd commit message:

code for maintaining SubtreeSize

# This is the 24th commit message:

code for updating post-order indexing

# This is the 25th commit message:

# This is the 26th commit message:

added codefiles for timeseries

# This is the 27th commit message:

initial source drop for timeSries from

# This is the 28th commit message:

timeSeries form cleanup

# This is the 2nd commit message:

removed dygraph

# This is the 2nd commit message:

[Tours Authoring] Added create tour button

# This is the 2nd commit message:

[Tours authoring] Tours editor window: list of stops and adding new stop interactively in the canvas

# This is the 2nd commit message:

Fix footer UI tests

# This is the 2nd commit message:

[Hotfix] #364 Email verification fixed, Peter can pass registration now

# This is the 3rd commit message:

Fix Authorization Tests

# This is the 4th commit message:

Added Assert to tests HelpLink

Fix formEditProfile tests

# This is the 5th commit message:

Framework refactoring

# This is the 6th commit message:

[Hotfix] #364 Email verification fixed, Peter can pass registration now

# This is the 2nd commit message:

[HotFix] #429 fixed link to CZ privacy policy

# This is the 2nd commit message:

[BugFix] #365 corrected case of data format in exhibits

# This is the 3rd commit message:

more auth guide work

Added more screen captures; text updates.

Added screen captures, finished draft user guide; rest api update.

Changed the output so that members and entities get level three headings.

experiment with reformatting remarks in Putuser command.

Added new file for top of ref doc; Updated REST API doc.

Added authoring guide stub.

# This is the 4th commit message:

ops guide

Begin adding deployment section to ops guide.

Added draft deployment section

Incorporated Javier's comments for ops guide update.

# This is the 2nd commit message:

Making monstrous regex for email verification

# This is the 2nd commit message:

fix data for tests

# This is the 3rd commit message:

Fix authorization UI tests

# This is the 2nd commit message:

fix regimes label

# This is the 3rd commit message:

Fix Redirection to cz.html

# This is the 2nd commit message:

Updated REST API ref.

# This is the 3rd commit message:

fix new_exhibit_should_have_a_correct_url

# This is the 2nd commit message:

[HotFix] #459 - user collection breadcrumbs are readable now

# This is the 2nd commit message:

CZ.Dates refactoring:
1. Rewrited methods GetCoordinateFromDMY, GetDMYFromCoordinate,IsLeapYear with account of leap years.
2. Deleted unnesessary and unused methods.
3. Changed timescale with account of new representation of zero point of time.
4. Rewrited Unit Tests for dates.ts.
5. Code review improvements, specified by Javier
6. Bug fixes for 354,34,403

# This is the 3rd commit message:

CZ.Dates refactoring:
1. Rewrited methods GetCoordinateFromDMY, GetDMYFromCoordinate,IsLeapYear with account of leap years.
2. Deleted unnesessary and unused methods.
3. Changed timescale with account of new representation of zero point of time.
4. Rewrited Unit Tests for dates.ts.
5. Code review improvements, specified by Javier
6. Bug fixes for 354,34,403

# This is the 2nd commit message:

Bugfix: cross browser onselectstart property

# This is the 3rd commit message:

Fix473: Authoring blocked form supercollection URL

# This is the 4th commit message:

added supporting for IE and Firefox

typo

Conflicts:
	Test/chronozoom20.test/Application.Helper/Helpers/AuthorizationHelper.cs
	Test/chronozoom20.test/Tests.UI/AuthorizationTests.cs

fix build

# This is the 2nd commit message:

fix BL tests