dave/pathfinder
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'refs/remotes/origin/master' into develop

Browse Source 
# Conflicts:
#	app/config.ini
#	app/main/controller/api/signature.php
#	app/main/controller/setup.php
#	app/main/cron/cache.php
#	app/pathfinder.ini
#	js/app/login.js
#	js/app/util.js
#	public/css/pathfinder.css
#	public/js/v1.1.0/app.js.src.js
#	public/js/v1.1.0/build.txt
#	public/js/v1.1.0/lib/jquery.fullscreen.min.js
#	public/js/v1.1.0/lib/jquery.fullscreen.min.js.map
#	public/js/v1.1.0/lib/jquery.fullscreen.min.js.src.js
#	public/js/v1.1.0/lib/jsPlumb-2.0.5.js
#	public/js/v1.1.0/lib/jsPlumb-2.0.5.js.map
#	public/js/v1.1.0/lib/jsPlumb-2.0.5.js.src.js
#	public/js/v1.1.1/app.js.src.js
#	public/js/v1.1.1/build.txt
#	public/js/v1.1.1/lib/bootstrap-image-gallery.js
#	public/js/v1.1.1/lib/bootstrap-image-gallery.js.map
#	public/js/v1.1.1/lib/bootstrap-image-gallery.js.src.js
#	public/js/v1.1.1/lib/datatables/dataTables.bootstrap.js
#	public/js/v1.1.1/lib/datatables/dataTables.bootstrap.js.map
#	public/js/v1.1.1/lib/datatables/dataTables.bootstrap.js.src.js
#	public/js/v1.1.1/lib/datatables/extensions/tabletools/Readme.txt

#	public/js/v1.1.1/lib/datatables/extensions/tabletools/js/dataTables.tableTools.min.js

#	public/js/v1.1.1/lib/datatables/extensions/tabletools/js/dataTables.tableTools.min.js.map

#	public/js/v1.1.1/lib/datatables/extensions/tabletools/js/dataTables.tableTools.min.js.src.js

#	public/js/v1.1.1/lib/datatables/extensions/tabletools/swf/copy_csv_xls.swf

#	public/js/v1.1.1/lib/datatables/extensions/tabletools/swf/copy_csv_xls_pdf.swf
#	public/js/v1.1.1/lib/jquery.fullscreen.min.js
#	public/js/v1.1.1/lib/jquery.fullscreen.min.js.map
#	public/js/v1.1.1/lib/jquery.fullscreen.min.js.src.js
#	public/js/v1.1.1/lib/jsPlumb-2.0.5.js
#	public/js/v1.1.1/lib/jsPlumb-2.0.5.js.map
#	public/js/v1.1.1/lib/jsPlumb-2.0.5.js.src.js
#	public/js/v1.1.2/app.js.src.js
#	public/js/v1.1.2/build.txt
#	public/js/v1.1.2/lib/jquery.fullscreen.min.js
#	public/js/v1.1.2/lib/jquery.fullscreen.min.js.map
#	public/js/v1.1.2/lib/jquery.fullscreen.min.js.src.js
#	public/js/v1.1.2/lib/jsPlumb-2.0.5.js
#	public/js/v1.1.2/lib/jsPlumb-2.0.5.js.map
#	public/js/v1.1.2/lib/jsPlumb-2.0.5.js.src.js
#	public/templates/ui/notice.html
#	public/templates/view/login.html
#	public/templates/view/setup.html
#	sass/layout/_forms.scss
#	sass/layout/_main.scss
This commit is contained in:
Exodus4D
2016-07-29 20:13:34 +02:00
parent 5389519ac2 e01f299d2b
commit bd6497f8d6
2 changed files with 37 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
app/main/data/mapper/crestservicestatus.php Normal file
View File

@@ -0,0 +1,19 @@
<?php
/**
* Created by PhpStorm.
* User: Exodus
* Date: 01.05.2016
* Time: 19:17
*/
namespace Data\Mapper;
class CrestServiceStatus extends AbstractIterator {
protected static $map = [
'dust' => 'dust',
'eve' => 'eve',
'server' => 'server'
];
}

18
app/main/data/mapper/crestusercounts.php Normal file
View File

@@ -0,0 +1,18 @@
<?php
/**
* Created by PhpStorm.
* User: Exodus
* Date: 01.05.2016
* Time: 19:42
*/
namespace Data\Mapper;
class CrestUserCounts extends AbstractIterator {
protected static $map = [
'dust' => 'dust',
'eve' => 'eve'
];
}