Merge branch 'develop'

Miguel Rodrigues Miguel Rodrigues 2018-06-27

changed frontend/public/js/controllers/appCtrl.js
changed frontend/public/js/controllers/createAppCtrl.js
changed frontend/public/js/controllers/editRuleCtrl.js
changed frontend/public/js/controllers/listCtrl.js
changed frontend/public/js/controllers/listRules.js
changed frontend/public/js/controllers/rulesCtrl.js
changed frontend/public/js/controllers/statisticsCtrl.js
changed frontend/public/js/controllers/viewCtrl.js
changed frontend/public/views/appListRules.html
changed frontend/public/views/appRules.html
changed frontend/public/views/appView.html
changed frontend/public/views/editRule.html
changed frontend/public/views/index.html
changed package.json
frontend/public/js/controllers/appCtrl.js Diff Switch to side-by-side view
Loading...
frontend/public/js/controllers/createAppCtrl.js Diff Switch to side-by-side view
Loading...
frontend/public/js/controllers/editRuleCtrl.js Diff Switch to side-by-side view
Loading...
frontend/public/js/controllers/listCtrl.js Diff Switch to side-by-side view
Loading...
frontend/public/js/controllers/listRules.js Diff Switch to side-by-side view
Loading...
frontend/public/js/controllers/rulesCtrl.js Diff Switch to side-by-side view
Loading...
frontend/public/js/controllers/statisticsCtrl.js Diff Switch to side-by-side view
Loading...
frontend/public/js/controllers/viewCtrl.js Diff Switch to side-by-side view
Loading...
frontend/public/views/appListRules.html Diff Switch to side-by-side view
Loading...
frontend/public/views/appRules.html Diff Switch to side-by-side view
Loading...
frontend/public/views/appView.html Diff Switch to side-by-side view
Loading...
frontend/public/views/editRule.html Diff Switch to side-by-side view
Loading...
frontend/public/views/index.html Diff Switch to side-by-side view
Loading...
package.json Diff Switch to side-by-side view
Loading...