first commit
Updated frontend and backend get/post
Merge branch 'master' of gitlab:conorhughes/timesheet-server

Conflicts:
	.gradle/1.12/taskArtifacts/cache.properties
	.gradle/1.12/taskArtifacts/cache.properties.lock
	.gradle/1.12/taskArtifacts/fileHashes.bin
	.gradle/1.12/taskArtifacts/fileSnapshots.bin
	.gradle/1.12/taskArtifacts/outputFileStates.bin
	.gradle/1.12/taskArtifacts/taskArtifacts.bin
	.idea/inspectionProfiles/Project_Default.xml
	.idea/libraries/Gradle__jackson_dataformat_yaml_2_1_4.xml
	.idea/workspace.xml
	Cellusys-Timesheet.iml
	gradle/wrapper/gradle-wrapper.properties
	out/production/Cellusys-Timesheet/com/cellusys/timesheet/CellusysTimesheetResource.class
	out/production/Cellusys-Timesheet/com/cellusys/timesheet/ElasticSearch.class
	out/production/Cellusys-Timesheet/html/bower_components/elasticsearch/.bower.json
	out/production/Cellusys-Timesheet/html/bower_components/elasticsearch/bower.json
	out/production/Cellusys-Timesheet/html/bower_components/elasticsearch/elasticsearch.angular.js
	out/production/Cellusys-Timesheet/html/bower_components/elasticsearch/elasticsearch.angular.min.js
	out/production/Cellusys-Timesheet/html/bower_components/elasticsearch/elasticsearch.jquery.js
	out/production/Cellusys-Timesheet/html/bower_components/elasticsearch/elasticsearch.jquery.min.js
	out/production/Cellusys-Timesheet/html/bower_components/elasticsearch/elasticsearch.js
	out/production/Cellusys-Timesheet/html/bower_components/elasticsearch/elasticsearch.min.js
	out/production/Cellusys-Timesheet/html/bower_components/elasticsearch/package.json
	out/production/Cellusys-Timesheet/html/bower_components/jquery/.bower.json
	out/production/Cellusys-Timesheet/html/bower_components/jquery/MIT-LICENSE.txt
	out/production/Cellusys-Timesheet/html/bower_components/jquery/bower.json
	out/production/Cellusys-Timesheet/html/bower_components/jquery/src/ajax.js
	out/production/Cellusys-Timesheet/html/bower_components/jquery/src/ajax/jsonp.js
	out/production/Cellusys-Timesheet/html/bower_components/jquery/src/ajax/script.js
	out/production/Cellusys-Timesheet/html/bower_components/jquery/src/ajax/xhr.js
	out/production/Cellusys-Timesheet/html/bower_components/jquery/src/attributes.js
	out/production/Cellusys-Timesheet/html/bower_components/jquery/src/callbacks.js
	out/production/Cellusys-Timesheet/html/bower_components/jquery/src/core.js
	out/production/Cellusys-Timesheet/html/bower_components/jquery/src/css.js
	out/production/Cellusys-Timesheet/html/bower_components/jquery/src/data.js
	out/production/Cellusys-Timesheet/html/bower_components/jquery/src/deferred.js
	out/production/Cellusys-Timesheet/html/bower_components/jquery/src/deprecated.js
	out/production/Cellusys-Timesheet/html/bower_components/jquery/src/dimensions.js
	out/production/Cellusys-Timesheet/html/bower_components/jquery/src/effects.js
	out/production/Cellusys-Timesheet/html/bower_components/jquery/src/event.js
	out/production/Cellusys-Timesheet/html/bower_components/jquery/src/intro.js
	out/production/Cellusys-Timesheet/html/bower_components/jquery/src/manipulation.js
	out/production/Cellusys-Timesheet/html/bower_components/jquery/src/offset.js
	out/production/Cellusys-Timesheet/html/bower_components/jquery/src/outro.js
	out/production/Cellusys-Timesheet/html/bower_components/jquery/src/queue.js
	out/production/Cellusys-Timesheet/html/bower_components/jquery/src/serialize.js
	out/production/Cellusys-Timesheet/html/bower_components/jquery/src/traversing.js
	out/production/Cellusys-Timesheet/html/bower_components/jquery/src/wrap.js
	out/production/Cellusys-Timesheet/html/favicon.ico
	out/production/Cellusys-Timesheet/html/index.html
	out/production/Cellusys-Timesheet/html/scripts/app.js
	out/production/Cellusys-Timesheet/html/views/timesheet.html
	src/main/java/com/cellusys/timesheet/CellusysTimesheetResource.java
	src/main/java/com/cellusys/timesheet/ElasticSearch.java
	src/main/resources/html/bower_components/elasticsearch/.bower.json
	src/main/resources/html/bower_components/elasticsearch/bower.json
	src/main/resources/html/bower_components/elasticsearch/elasticsearch.angular.js
	src/main/resources/html/bower_components/elasticsearch/elasticsearch.angular.min.js
	src/main/resources/html/bower_components/elasticsearch/elasticsearch.jquery.js
	src/main/resources/html/bower_components/elasticsearch/elasticsearch.jquery.min.js
	src/main/resources/html/bower_components/elasticsearch/elasticsearch.js
	src/main/resources/html/bower_components/elasticsearch/elasticsearch.min.js
	src/main/resources/html/bower_components/elasticsearch/package.json
	src/main/resources/html/bower_components/jquery/.bower.json
	src/main/resources/html/bower_components/jquery/MIT-LICENSE.txt
	src/main/resources/html/bower_components/jquery/bower.json
	src/main/resources/html/bower_components/jquery/src/ajax.js
	src/main/resources/html/bower_components/jquery/src/ajax/jsonp.js
	src/main/resources/html/bower_components/jquery/src/ajax/script.js
	src/main/resources/html/bower_components/jquery/src/ajax/xhr.js
	src/main/resources/html/bower_components/jquery/src/attributes.js
	src/main/resources/html/bower_components/jquery/src/callbacks.js
	src/main/resources/html/bower_components/jquery/src/core.js
	src/main/resources/html/bower_components/jquery/src/css.js
	src/main/resources/html/bower_components/jquery/src/data.js
	src/main/resources/html/bower_components/jquery/src/deferred.js
	src/main/resources/html/bower_components/jquery/src/deprecated.js
	src/main/resources/html/bower_components/jquery/src/dimensions.js
	src/main/resources/html/bower_components/jquery/src/effects.js
	src/main/resources/html/bower_components/jquery/src/event.js
	src/main/resources/html/bower_components/jquery/src/intro.js
	src/main/resources/html/bower_components/jquery/src/manipulation.js
	src/main/resources/html/bower_components/jquery/src/offset.js
	src/main/resources/html/bower_components/jquery/src/outro.js
	src/main/resources/html/bower_components/jquery/src/queue.js
	src/main/resources/html/bower_components/jquery/src/serialize.js
	src/main/resources/html/bower_components/jquery/src/traversing.js
	src/main/resources/html/bower_components/jquery/src/wrap.js
	src/main/resources/html/favicon.ico
	src/main/resources/html/index.html
	src/main/resources/html/scripts/app.js
	src/main/resources/html/views/timesheet.html
Can now post and get hours
Merge branch 'master' of gitlab:conorhughes/timesheet-server

Conflicts:
	.idea/workspace.xml
	src/main/java/com/cellusys/timesheet/ElasticSearch.java
Added tests and updated get requests
 Merge branch 'master' into 'master'

Updated requests and add tests
Fixed stuff
 Merge branch 'master' into 'master'

Updates
Removed getCategories functions etc and moved into one function
 Merge branch 'master' into 'master'

Merged functions for getting hours/categories
Started on login functionality
Refractor names, cleaned up js and added new tests
 Merge branch 'master' into 'master'

Refractoring
Add backend tests
Few updates
 Merge branch 'master' into 'master'

Few updates
Updates
Merge branch 'master' of gitlab:conorhughes/timesheet-server

Conflicts:
	.gradle/1.12/taskArtifacts/cache.properties
	.gradle/1.12/taskArtifacts/cache.properties.lock
	.gradle/1.12/taskArtifacts/fileHashes.bin
	.gradle/1.12/taskArtifacts/fileSnapshots.bin
	.gradle/1.12/taskArtifacts/outputFileStates.bin
	.gradle/1.12/taskArtifacts/taskArtifacts.bin
	.idea/.name
	.idea/inspectionProfiles/profiles_settings.xml
	.idea/modules.xml
	.idea/workspace.xml
	build.gradle
	build/classes/main/com/cellusys/timesheet/CellusysTimesheetConfiguration.class
	build/classes/main/com/cellusys/timesheet/CellusysTimesheetResource.class
	build/classes/main/com/cellusys/timesheet/CellusysTimesheetService.class
	build/classes/main/com/cellusys/timesheet/ElasticSearch.class
	build/reports/tests/index.html
	build/test-results/binary/test/results.bin
	gradle/wrapper/gradle-wrapper.properties
	settings.gradle
	src/main/java/com/cellusys/timesheet/CellusysTimesheetConfiguration.java
	src/main/java/com/cellusys/timesheet/CellusysTimesheetResource.java
	src/main/java/com/cellusys/timesheet/CellusysTimesheetService.java
	src/main/java/com/cellusys/timesheet/ElasticSearch.java
	src/main/resources/html/index.html
	src/main/resources/html/scripts/app.js
	src/main/resources/html/scripts/controllers/login.js
	src/main/resources/html/scripts/controllers/timesheet.js
	src/main/resources/html/views/login.html
	src/main/resources/html/views/timesheet.html
 Merge branch 'master' into 'master'

Timesheet hours now numbers