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

# 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

2016-07-29 20:13:34 +02:00

..

controller

- fixed "system graph" module rendering if there was no data available

2016-07-27 18:51:43 +02:00

cron

- added build files for upcoming version 1.1.2

2016-07-11 20:35:25 +02:00

data

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

2016-07-29 20:13:34 +02:00

db

- added requirement check for "PDO", "PDO_MYSQL" to "/setup" route

2016-07-26 19:16:04 +02:00

exception

New "Invite" feature implemented

2015-08-30 23:25:02 +02:00

lib

- added build files for upcoming version 1.1.2

2016-07-11 20:35:25 +02:00

model

- added requirement check for "PDO", "PDO_MYSQL" to "/setup" route

2016-07-26 19:16:04 +02:00