Skip to content
Snippets Groups Projects
Commit aa9515b5 authored by Eirik Steira's avatar Eirik Steira
Browse files

Merge branch 'dev' into 'master' 

Weekly merge to Master

See merge request !165
parents e510257e 9782ffcf
No related branches found
No related tags found
1 merge request!165Weekly merge to Master
Pipeline #81171 passed
Stage: build
Stage: test
Stage: deploy
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 0 additions and 5186 deletions
javadoc/NTNU/IDATT1002/service/ImageService.html deleted 100644 → 0
+ 0
− 416
View file @ e510257e
This diff is collapsed.
javadoc/NTNU/IDATT1002/service/PdfDocument.html deleted 100644 → 0
+ 0
− 338
View file @ e510257e
This diff is collapsed.
javadoc/NTNU/IDATT1002/service/TagService.html deleted 100644 → 0
+ 0
− 337
View file @ e510257e
This diff is collapsed.
javadoc/NTNU/IDATT1002/service/UserService.html deleted 100644 → 0
+ 0
− 364
View file @ e510257e
This diff is collapsed.
javadoc/NTNU/IDATT1002/service/package-summary.html deleted 100644 → 0
+ 0
− 208
View file @ e510257e
This diff is collapsed.
javadoc/NTNU/IDATT1002/service/package-tree.html deleted 100644 → 0
+ 0
− 172
View file @ e510257e
This diff is collapsed.
javadoc/NTNU/IDATT1002/utils/Authentication.html deleted 100644 → 0
+ 0
− 390
View file @ e510257e
This diff is collapsed.
javadoc/NTNU/IDATT1002/utils/CreateUser.html deleted 100644 → 0
+ 0
− 267
View file @ e510257e
This diff is collapsed.
javadoc/NTNU/IDATT1002/utils/ExtractMetaData.html deleted 100644 → 0
+ 0
− 343
View file @ e510257e
This diff is collapsed.
javadoc/NTNU/IDATT1002/utils/ImageUtil.html deleted 100644 → 0
+ 0
− 339
View file @ e510257e
This diff is collapsed.
javadoc/NTNU/IDATT1002/utils/MetaDataExtractor.html deleted 100644 → 0
+ 0
− 338
View file @ e510257e
This diff is collapsed.
javadoc/NTNU/IDATT1002/utils/MultiplePhotos.html deleted 100644 → 0
+ 0
− 267
View file @ e510257e
This diff is collapsed.
javadoc/NTNU/IDATT1002/utils/package-summary.html deleted 100644 → 0
+ 0
− 178
View file @ e510257e
This diff is collapsed.
javadoc/NTNU/IDATT1002/utils/package-tree.html deleted 100644 → 0
+ 0
− 164
View file @ e510257e
This diff is collapsed.
javadoc/allclasses-index.html deleted 100644 → 0
+ 0
− 444
View file @ e510257e
This diff is collapsed.
javadoc/allclasses.html deleted 100644 → 0
+ 0
− 74
View file @ e510257e
<!DOCTYPE HTML>
<!-- NewPage -->
<html lang="no">
<head>
<!-- Generated by javadoc (11.0.4) on Wed Apr 01 11:45:14 CEST 2020 -->
<title>All Classes</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<meta name="dc.created" content="2020-04-01">
<link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
<link rel="stylesheet" type="text/css" href="jquery/jquery-ui.css" title="Style">
<script type="text/javascript" src="script.js"></script>
<script type="text/javascript" src="jquery/jszip/dist/jszip.min.js"></script>
<script type="text/javascript" src="jquery/jszip-utils/dist/jszip-utils.min.js"></script>
<!--[if IE]>
<script type="text/javascript" src="jquery/jszip-utils/dist/jszip-utils-ie.min.js"></script>
<![endif]-->
<script type="text/javascript" src="jquery/jquery-3.3.1.js"></script>
<script type="text/javascript" src="jquery/jquery-migrate-3.0.1.js"></script>
<script type="text/javascript" src="jquery/jquery-ui.js"></script>
</head>
<body>
<h1 class="bar">All&nbsp;Classes</h1>
<main role="main" class="indexContainer">
<ul>
<li><a href="NTNU/IDATT1002/models/Album.html" title="class in NTNU.IDATT1002.models">Album</a></li>
<li><a href="NTNU/IDATT1002/service/AlbumDocument.html" title="interface in NTNU.IDATT1002.service"><span class="interfaceName">AlbumDocument</span></a></li>
<li><a href="NTNU/IDATT1002/filters/AlbumFilter.html" title="class in NTNU.IDATT1002.filters">AlbumFilter</a></li>
<li><a href="NTNU/IDATT1002/repository/AlbumRepository.html" title="class in NTNU.IDATT1002.repository">AlbumRepository</a></li>
<li><a href="NTNU/IDATT1002/service/AlbumService.html" title="class in NTNU.IDATT1002.service">AlbumService</a></li>
<li><a href="NTNU/IDATT1002/App.html" title="class in NTNU.IDATT1002">App</a></li>
<li><a href="NTNU/IDATT1002/ApplicationState.html" title="class in NTNU.IDATT1002">ApplicationState</a></li>
<li><a href="NTNU/IDATT1002/utils/Authentication.html" title="class in NTNU.IDATT1002.utils">Authentication</a></li>
<li><a href="NTNU/IDATT1002/controllers/CreateAlbum.html" title="class in NTNU.IDATT1002.controllers">CreateAlbum</a></li>
<li><a href="NTNU/IDATT1002/controllers/DataExchange.html" title="class in NTNU.IDATT1002.controllers">DataExchange</a></li>
<li><a href="NTNU/IDATT1002/database/EntityManagerConfig.html" title="class in NTNU.IDATT1002.database">EntityManagerConfig</a></li>
<li><a href="NTNU/IDATT1002/controllers/Explore.html" title="class in NTNU.IDATT1002.controllers">Explore</a></li>
<li><a href="NTNU/IDATT1002/controllers/ExploreAlbums.html" title="class in NTNU.IDATT1002.controllers">ExploreAlbums</a></li>
<li><a href="NTNU/IDATT1002/models/GeoLocation.html" title="class in NTNU.IDATT1002.models">GeoLocation</a></li>
<li><a href="NTNU/IDATT1002/repository/GeoLocatioRepository.html" title="class in NTNU.IDATT1002.repository">GeoLocatioRepository</a></li>
<li><a href="NTNU/IDATT1002/models/Histogram.html" title="class in NTNU.IDATT1002.models">Histogram</a></li>
<li><a href="NTNU/IDATT1002/repository/HistorgramRepository.html" title="class in NTNU.IDATT1002.repository">HistorgramRepository</a></li>
<li><a href="NTNU/IDATT1002/models/Image.html" title="class in NTNU.IDATT1002.models">Image</a></li>
<li><a href="NTNU/IDATT1002/filters/ImageFilter.html" title="class in NTNU.IDATT1002.filters">ImageFilter</a></li>
<li><a href="NTNU/IDATT1002/repository/ImageRepository.html" title="class in NTNU.IDATT1002.repository">ImageRepository</a></li>
<li><a href="NTNU/IDATT1002/service/ImageService.html" title="class in NTNU.IDATT1002.service">ImageService</a></li>
<li><a href="NTNU/IDATT1002/utils/ImageUtil.html" title="class in NTNU.IDATT1002.utils">ImageUtil</a></li>
<li><a href="NTNU/IDATT1002/database/LoadDatabase.html" title="class in NTNU.IDATT1002.database">LoadDatabase</a></li>
<li><a href="NTNU/IDATT1002/controllers/Login.html" title="class in NTNU.IDATT1002.controllers">Login</a></li>
<li><a href="NTNU/IDATT1002/models/Login.html" title="class in NTNU.IDATT1002.models">Login</a></li>
<li><a href="NTNU/IDATT1002/repository/LoginRepository.html" title="class in NTNU.IDATT1002.repository">LoginRepository</a></li>
<li><a href="NTNU/IDATT1002/controllers/Main.html" title="class in NTNU.IDATT1002.controllers">Main</a></li>
<li><a href="NTNU/IDATT1002/controllers/Map.html" title="class in NTNU.IDATT1002.controllers">Map</a></li>
<li><a href="NTNU/IDATT1002/models/Metadata.html" title="class in NTNU.IDATT1002.models">Metadata</a></li>
<li><a href="NTNU/IDATT1002/utils/MetaDataExtractor.html" title="class in NTNU.IDATT1002.utils">MetaDataExtractor</a></li>
<li><a href="NTNU/IDATT1002/repository/MetadataRepository.html" title="class in NTNU.IDATT1002.repository">MetadataRepository</a></li>
<li><a href="NTNU/IDATT1002/service/PdfDocument.html" title="class in NTNU.IDATT1002.service">PdfDocument</a></li>
<li><a href="NTNU/IDATT1002/repository/Repository.html" title="interface in NTNU.IDATT1002.repository"><span class="interfaceName">Repository</span></a></li>
<li><a href="NTNU/IDATT1002/controllers/Search.html" title="class in NTNU.IDATT1002.controllers">Search</a></li>
<li><a href="NTNU/IDATT1002/controllers/SignUp.html" title="class in NTNU.IDATT1002.controllers">SignUp</a></li>
<li><a href="NTNU/IDATT1002/models/Tag.html" title="class in NTNU.IDATT1002.models">Tag</a></li>
<li><a href="NTNU/IDATT1002/repository/TagRepository.html" title="class in NTNU.IDATT1002.repository">TagRepository</a></li>
<li><a href="NTNU/IDATT1002/service/TagService.html" title="class in NTNU.IDATT1002.service">TagService</a></li>
<li><a href="NTNU/IDATT1002/controllers/Upload.html" title="class in NTNU.IDATT1002.controllers">Upload</a></li>
<li><a href="NTNU/IDATT1002/controllers/UploadedMultiple.html" title="class in NTNU.IDATT1002.controllers">UploadedMultiple</a></li>
<li><a href="NTNU/IDATT1002/controllers/UploadedSingle.html" title="class in NTNU.IDATT1002.controllers">UploadedSingle</a></li>
<li><a href="NTNU/IDATT1002/models/User.html" title="class in NTNU.IDATT1002.models">User</a></li>
<li><a href="NTNU/IDATT1002/repository/UserRepository.html" title="class in NTNU.IDATT1002.repository">UserRepository</a></li>
<li><a href="NTNU/IDATT1002/service/UserService.html" title="class in NTNU.IDATT1002.service">UserService</a></li>
<li><a href="NTNU/IDATT1002/controllers/ViewAlbum.html" title="class in NTNU.IDATT1002.controllers">ViewAlbum</a></li>
<li><a href="NTNU/IDATT1002/controllers/ViewPicture.html" title="class in NTNU.IDATT1002.controllers">ViewPicture</a></li>
</ul>
</main>
</body>
</html>
javadoc/allpackages-index.html deleted 100644 → 0
+ 0
− 193
View file @ e510257e
This diff is collapsed.
javadoc/constant-values.html deleted 100644 → 0
+ 0
− 199
View file @ e510257e
This diff is collapsed.
javadoc/deprecated-list.html deleted 100644 → 0
+ 0
− 147
View file @ e510257e
This diff is collapsed.
javadoc/element-list deleted 100644 → 0
+ 0
− 8
View file @ e510257e
NTNU.IDATT1002
NTNU.IDATT1002.controllers
NTNU.IDATT1002.database
NTNU.IDATT1002.filters
NTNU.IDATT1002.models
NTNU.IDATT1002.repository
NTNU.IDATT1002.service
NTNU.IDATT1002.utils
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment