From 1ae7fff3085f0f97db8abbc9f60a438fabd8b99d Mon Sep 17 00:00:00 2001 From: Yaman Qalieh Date: Thu, 18 Aug 2016 18:11:45 -0400 Subject: [PATCH] update packages and fix #22 --- hourglass/.meteor/.finished-upgraders | 1 + hourglass/.meteor/packages | 17 ++++++------ hourglass/.meteor/release | 2 +- hourglass/.meteor/versions | 39 ++++++++++++++------------- hourglass/client/main/main.js | 9 ++++++- 5 files changed, 39 insertions(+), 29 deletions(-) diff --git a/hourglass/.meteor/.finished-upgraders b/hourglass/.meteor/.finished-upgraders index 11fc14e..aa60704 100644 --- a/hourglass/.meteor/.finished-upgraders +++ b/hourglass/.meteor/.finished-upgraders @@ -12,3 +12,4 @@ notices-for-facebook-graph-api-2 1.2.0-breaking-changes 1.3.0-split-minifiers-package 1.4.0-remove-old-dev-bundle-link +1.4.1-add-shell-server-package diff --git a/hourglass/.meteor/packages b/hourglass/.meteor/packages index 9803487..70cdd71 100644 --- a/hourglass/.meteor/packages +++ b/hourglass/.meteor/packages @@ -6,23 +6,23 @@ meteor-base@1.0.4 # Packages every Meteor app needs to have mobile-experience@1.0.4 # Packages for a great mobile UX -mongo@1.1.10 # The database Meteor supports right now +mongo@1.1.11 # The database Meteor supports right now blaze-html-templates@1.0.4 # Compile .html files into Meteor Blaze views reactive-var@1.0.10 # Reactive variable for tracker jquery@1.11.9 # Helpful client-side library tracker@1.1.0 # Meteor's client-side reactive programming library -standard-minifier-css@1.1.8 # CSS minifier run for production mode -standard-minifier-js@1.1.8 # JS minifier run for production mode -es5-shim@4.6.13 # ECMAScript 5 compatibility for older browsers. -ecmascript@0.5.7 # Enable ECMAScript2015+ syntax in app code +standard-minifier-css@1.2.0 # CSS minifier run for production mode +standard-minifier-js@1.2.0 # JS minifier run for production mode +es5-shim@4.6.14 # ECMAScript 5 compatibility for older browsers. +ecmascript@0.5.8 # Enable ECMAScript2015+ syntax in app code fortawesome:fontawesome -session +session@1.1.6 proyk:meteor-cookies aldeed:simple-schema -accounts-google -accounts-ui +accounts-google@1.0.10 +accounts-ui@1.1.9 iron:router ongoworks:security mizzao:autocomplete @@ -30,3 +30,4 @@ alanning:roles rzymek:fullcalendar momentjs:moment eternicode:bootstrap-datepicker +shell-server diff --git a/hourglass/.meteor/release b/hourglass/.meteor/release index c85944c..30b2c59 100644 --- a/hourglass/.meteor/release +++ b/hourglass/.meteor/release @@ -1 +1 @@ -METEOR@1.4.0.1 +METEOR@1.4.1 diff --git a/hourglass/.meteor/versions b/hourglass/.meteor/versions index 901579f..3ec8ce3 100644 --- a/hourglass/.meteor/versions +++ b/hourglass/.meteor/versions @@ -1,4 +1,4 @@ -accounts-base@1.2.9 +accounts-base@1.2.11 accounts-google@1.0.10 accounts-oauth@1.1.13 accounts-ui@1.1.9 @@ -7,8 +7,8 @@ alanning:roles@1.2.15 aldeed:simple-schema@1.5.3 allow-deny@1.0.5 autoupdate@1.2.11 -babel-compiler@6.9.0 -babel-runtime@0.1.10 +babel-compiler@6.9.1 +babel-runtime@0.1.11 base64@1.0.9 binary-heap@1.0.9 blaze@2.1.8 @@ -28,10 +28,10 @@ ddp-rate-limiter@1.0.5 ddp-server@1.2.10 deps@1.0.12 diff-sequence@1.0.6 -ecmascript@0.5.7 -ecmascript-runtime@0.3.12 +ecmascript@0.5.8 +ecmascript-runtime@0.3.14 ejson@1.0.12 -es5-shim@4.6.13 +es5-shim@4.6.14 eternicode:bootstrap-datepicker@1.6.0_3 fastclick@1.0.12 fortawesome:fontawesome@4.5.0 @@ -55,28 +55,28 @@ launch-screen@1.0.12 less@2.6.5 livedata@1.0.18 localstorage@1.0.11 -logging@1.1.14 +logging@1.1.15 mdg:validation-error@0.2.0 -meteor@1.2.16 +meteor@1.2.17 meteor-base@1.0.4 -minifier-css@1.2.13 -minifier-js@1.2.13 +minifier-css@1.2.14 +minifier-js@1.2.14 minimongo@1.0.17 mizzao:autocomplete@0.5.1 mobile-experience@1.0.4 mobile-status-bar@1.0.12 -modules@0.7.5 -modules-runtime@0.7.5 -momentjs:moment@2.8.4 -mongo@1.1.10 +modules@0.7.6 +modules-runtime@0.7.6 +momentjs:moment@2.14.4 +mongo@1.1.11 mongo-id@1.0.5 -npm-mongo@1.5.45 +npm-mongo@1.5.46 oauth@1.1.11 oauth2@1.1.10 observe-sequence@1.0.12 ongoworks:security@2.0.1 ordered-dict@1.0.8 -promise@0.8.3 +promise@0.8.4 proyk:meteor-cookies@0.0.1 random@1.0.10 rate-limit@1.0.5 @@ -88,15 +88,16 @@ routepolicy@1.0.11 rzymek:fullcalendar@2.7.2 service-configuration@1.0.10 session@1.1.6 +shell-server@0.2.1 spacebars@1.0.12 spacebars-compiler@1.0.12 -standard-minifier-css@1.1.8 -standard-minifier-js@1.1.8 +standard-minifier-css@1.2.0 +standard-minifier-js@1.2.0 templating@1.1.14 templating-tools@1.0.4 tracker@1.1.0 ui@1.0.11 underscore@1.0.9 url@1.0.10 -webapp@1.3.10 +webapp@1.3.11 webapp-hashing@1.0.9 diff --git a/hourglass/client/main/main.js b/hourglass/client/main/main.js index 3a6fcb5..fa69191 100644 --- a/hourglass/client/main/main.js +++ b/hourglass/client/main/main.js @@ -72,7 +72,14 @@ Template.registerHelper('myClasses', () => { var thisWork = work.find({class: courses[i]}).fetch(); for(var j = 0; j < thisWork.length; j++) { - thisWork[j].dueDate = getReadableDate(thisWork[j].dueDate); + thisWork[j].dueDate = moment(thisWork[j].dueDate).calendar(null, { + sameDay: '[Today]', + nextDay: '[Tomorrow]', + nextWeek: 'dddd', + lastDay: '[Yesterday]', + lastWeek: '[Last] dddd', + sameElse: 'MMMM Do' + }); thisWork[j].typeColor = workColors[thisWork[j].type]; } array[i].thisClassWork = thisWork;