This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
<?php | |
/** | |
* @file | |
* Contains the theme's functions to manipulate Drupal's default markup. | |
* | |
* Complete documentation for this file is available online. | |
* @see https://drupal.org/node/1728096 | |
*/ | |
include_once 'includes/template.pager.inc'; |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/src/app/controllers/login.controller.js b/src/app/controllers/login.controller.js | |
index df3eba1..a0d15b3 100644 | |
--- a/src/app/controllers/login.controller.js | |
+++ b/src/app/controllers/login.controller.js | |
@@ -30,11 +30,12 @@ export class LoginController { | |
let userId = this.$Auth.getPayload().userId; | |
this.User.get({ id: userId }, (user) => { | |
this.$UserService.setUser(user); | |
- | |
+ return user; |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
-- | |
docroot/core//assets/vendor/ckeditor/skins/moono/dialog.css-/* | |
docroot/core//assets/vendor/ckeditor/skins/moono/dialog.css-Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved. | |
docroot/core//assets/vendor/ckeditor/skins/moono/dialog.css-For licensing, see LICENSE.md or http://ckeditor.com/license | |
docroot/core//assets/vendor/ckeditor/skins/moono/dialog.css-*/ | |
docroot/core//assets/vendor/ckeditor/skins/moono/dialog.css:.cke_dialog{visibility:visible}.cke_dialog_body{z-index:1;background:#eaeaea;border:1px solid #b2b2b2;border-bottom-color:#999;border-radius:3px;box-shadow:0 0 3px rgba(0,0,0,.15)}.cke_dialog strong{font-weight:bold}.cke_dialog_title{font-weight:bold;font-size:13px;cursor:move;position:relative;color:#474747;text-shadow:0 1px 0 rgba(255,255,255,.75);border-bottom:1px solid #999;padding:6px 10px;border-radius:2px 2px 0 0;box-shadow:0 1px 0 #fff inset;background:#cfd1cf;background-image:linear-gradient(to bottom,#f5f5f5,#cfd1cf);filter:progid:DXImageTransform.Microsoft.grad |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/docroot/profiles/discoverdesign/modules/cafprojectedit/js/drupalEntity.directive.js b/docroot/profiles/discoverdesign/modules/cafprojectedit/js/drupalEntity.directive.js | |
index 758a6bb..6da21c0 100644 | |
--- a/docroot/profiles/discoverdesign/modules/cafprojectedit/js/drupalEntity.directive.js | |
+++ b/docroot/profiles/discoverdesign/modules/cafprojectedit/js/drupalEntity.directive.js | |
@@ -14,6 +14,7 @@ | |
var entityUrl = attrs['ddDrupalEntity']; | |
scope.alerts = []; | |
+ scope.mode = 'form'; | |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/docroot/profiles/discoverdesign/modules/cafprojectedit/cafprojectedit.module b/docroot/profiles/discoverdesign/modules/cafprojectedit/cafprojectedit.module | |
index 80585de..2a67188 100644 | |
--- a/docroot/profiles/discoverdesign/modules/cafprojectedit/cafprojectedit.module | |
+++ b/docroot/profiles/discoverdesign/modules/cafprojectedit/cafprojectedit.module | |
@@ -27,6 +27,7 @@ function cafprojectedit_preprocess_node(&$variables) { | |
/** @var \Drupal\node\Entity\Node $entity */ | |
$entity = $variables['node']; | |
if ($entity->bundle() === 'project' && $entity->access('edit')) { | |
+ $variables['csrf'] = \Drupal::csrfToken()->get('rest'); | |
$variables['editable'] = TRUE; |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/src/app/views/accountFormEdit.html b/src/app/views/accountFormEdit.html | |
index aad91b1..00dba76 100644 | |
--- a/src/app/views/accountFormEdit.html | |
+++ b/src/app/views/accountFormEdit.html | |
@@ -35,8 +35,8 @@ | |
<input type="number" class="form-control" id="balance" step="any" ng-model="accountForm.currentLedger.balance" required /> | |
</div> | |
<div class="form-group"> | |
- <label for="payment" ng-if="accountForm.accountType == 'saving'">Contribution this Month</label> | |
- <label for="payment" ng-if="accountForm.accountType == 'debt'">Payment this Month</label> |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/src/app/controllers/accounts.controller.js b/src/app/controllers/accounts.controller.js | |
index 223be0e..b720462 100644 | |
--- a/src/app/controllers/accounts.controller.js | |
+++ b/src/app/controllers/accounts.controller.js | |
@@ -10,6 +10,15 @@ export class AccountsController { | |
this.HateoasResource = HateoasResource; | |
this.$scope = $scope; | |
this.$state = $state; | |
+ this.period = 'P1M'; | |
+ this.schedules = [ |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/src/app/filters/moneyPeriod.filter.js b/src/app/filters/moneyPeriod.filter.js | |
index eecf40a..de196af 100644 | |
--- a/src/app/filters/moneyPeriod.filter.js | |
+++ b/src/app/filters/moneyPeriod.filter.js | |
@@ -1,6 +1,6 @@ | |
angular | |
.module('bmmFilter') | |
- .filter('moneyPeriod', (moment)=> { | |
+ .filter('moneyPeriod', (moment) => { | |
'ngInject'; |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/src/app/controllers/accountForm.controller.js b/src/app/controllers/accountForm.controller.js | |
index 96f64ce..303813c 100644 | |
--- a/src/app/controllers/accountForm.controller.js | |
+++ b/src/app/controllers/accountForm.controller.js | |
@@ -1,5 +1,5 @@ | |
export class AccountFormController { | |
- constructor ($log, HateoasResource, Account, $uibModalInstance, account, action, $scope) { | |
+ constructor ($log, HateoasResource, Account, $uibModalInstance, account, action, currentLedger, $scope) { | |
'ngInject'; | |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
commit 062c7a626df9f1c832738cfa00e33f143be3f414 | |
Author: Benjamin Doherty <[email protected]> | |
Date: Tue May 24 09:39:24 2016 -0500 | |
support dynamic site group. | |
diff --git a/docroot/sites/default/settings.php b/docroot/sites/default/settings.php | |
index 1b6c720..c6da989 100644 | |
--- a/docroot/sites/default/settings.php | |
+++ b/docroot/sites/default/settings.php |