Skip to content

Commit

Permalink
meteor 1.6
Browse files Browse the repository at this point in the history
  • Loading branch information
santisiri committed Nov 7, 2017
1 parent 7e7b651 commit f22ce38
Show file tree
Hide file tree
Showing 7 changed files with 79 additions and 59 deletions.
25 changes: 13 additions & 12 deletions .meteor/packages
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@


# meteor libraries
meteor-base@1.1.0 # Packages every Meteor app needs to have
meteor-base@1.2.0 # Packages every Meteor app needs to have
[email protected] # Meteor's client-side reactive programming library
[email protected] # ECMAScript 5 compatibility for older browsers.
ecmascript@0.8.3 # Enable ECMAScript2015+ syntax in app code
ecmascript@0.9.0 # Enable ECMAScript2015+ syntax in app code

# standard libraries
[email protected] # Helpful client-side library
Expand All @@ -28,7 +28,7 @@ react-template-helper
react-meteor-data

# data
mongo@1.2.2 # The database Meteor supports right now
mongo@1.3.0 # The database Meteor supports right now
aldeed:simple-schema
aldeed:collection2
dburles:collection-helpers
Expand All @@ -42,10 +42,10 @@ tap:i18n

# accounts, users
[email protected] # Client-side reactive dictionary for your app
accounts-ui@1.1.9
accounts-password@1.4.0
accounts-twitter@1.3.0
accounts-facebook@1.2.1
accounts-ui@1.2.0
accounts-password@1.5.0
accounts-twitter@1.4.0
accounts-facebook@1.3.0

# mobile
[email protected] # Packages for a great mobile UX
Expand All @@ -65,20 +65,21 @@ dburles:factory
lh84:medium-editor
meteorhacks:search-source
[email protected]
ejson@1.0.14
ejson@1.1.0
houston:admin
# meteortoys:allthings
edgee:slingshot
http@1.2.12
http@1.3.0
[email protected]
meteorhacks:ssr
[email protected]
shell-server@0.2.4
shell-server@0.3.0
xolvio:cleaner
practicalmeteor:chai
dispatch:mocha-phantomjs
[email protected]
reactive-dict@1.1.9
reactive-dict@1.2.0
[email protected]
[email protected]
[email protected]
[email protected]
mdg:meteor-apm-agent
2 changes: 1 addition & 1 deletion .meteor/release
Original file line number Diff line number Diff line change
@@ -1 +1 @@
METEOR@1.5.2.2
METEOR@1.6
88 changes: 45 additions & 43 deletions .meteor/versions
Original file line number Diff line number Diff line change
@@ -1,61 +1,60 @@
accounts-base@1.3.4
accounts-facebook@1.2.1
accounts-base@1.4.0
accounts-facebook@1.3.0
[email protected]
accounts-password@1.4.0
accounts-twitter@1.3.0
accounts-ui@1.1.9
accounts-ui-unstyled@1.2.1
accounts-password@1.5.0
accounts-twitter@1.4.0
accounts-ui@1.2.0
accounts-ui-unstyled@1.3.0
aldeed:[email protected]
aldeed:[email protected]
aldeed:[email protected]
aldeed:[email protected]
aldeed:[email protected]
allow-deny@1.0.9
allow-deny@1.1.0
[email protected]
babel-compiler@6.20.0
babel-runtime@1.0.1
babel-compiler@6.24.7
babel-runtime@1.1.1
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
boilerplate-generator@1.2.0
boilerplate-generator@1.3.0
[email protected]
[email protected]
[email protected]
cfs:[email protected]
[email protected]
[email protected]_1
[email protected]_1
[email protected]_1
dburles:[email protected]
dburles:[email protected]
dburles:[email protected]
ddp@1.3.1
ddp-client@2.1.3
ddp-common@1.2.9
ddp@1.4.0
ddp-client@2.2.0
ddp-common@1.3.0
[email protected]
ddp-server@2.0.2
ddp-server@2.1.0
[email protected]
[email protected]
dispatch:[email protected]
dispatch:[email protected]
dynamic-import@0.1.3
ecmascript@0.8.3
ecmascript-runtime@0.4.1
ecmascript-runtime-client@0.4.3
ecmascript-runtime-server@0.4.1
dynamic-import@0.2.0
ecmascript@0.9.0
ecmascript-runtime@0.5.0
ecmascript-runtime-client@0.5.0
ecmascript-runtime-server@0.5.0
edgee:[email protected]
ejson@1.0.14
ejson@1.1.0
[email protected]
[email protected]
[email protected]
facebook-oauth@1.3.2
facebook-oauth@1.4.0
[email protected]
[email protected]
houston:[email protected]
[email protected]
[email protected]
http@1.2.12
http@1.3.0
[email protected]
iron:[email protected]
iron:[email protected]
Expand All @@ -68,58 +67,61 @@ iron:[email protected]
[email protected]
lai:[email protected]_1
[email protected]
[email protected].9
[email protected].11
lh84:[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
mdg:[email protected]
mdg:[email protected]
mdg:[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
meteorhacks:[email protected]
meteorhacks:[email protected]
meteorhacks:[email protected]
meteorhacks:[email protected]
meteorspark:[email protected]
[email protected]
minimongo@1.3.2
minimongo@1.4.0
[email protected]
[email protected]
modules@0.10.0
modules-runtime@0.8.0
mongo@1.2.2
mongo-dev-server@1.0.1
modules@0.11.0
modules-runtime@0.9.0
mongo@1.3.0
mongo-dev-server@1.1.0
[email protected]
[email protected]
mrt:[email protected]
mystor:[email protected]
[email protected]
[email protected].30
oauth@1.1.13
oauth1@1.1.11
oauth2@1.1.11
[email protected].33
oauth@1.2.0
oauth1@1.2.0
oauth2@1.2.0
[email protected]
[email protected]
practicalmeteor:[email protected]_1
practicalmeteor:[email protected]_2
practicalmeteor:[email protected]_6
practicalmeteor:[email protected]
practicalmeteor:[email protected]_2
promise@0.9.0
promise@0.10.0
raix:[email protected]
rajit:[email protected]
[email protected]
[email protected]
[email protected].13
[email protected].15
[email protected]
reactive-dict@1.1.9
reactive-dict@1.2.0
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
shell-server@0.2.4
shell-server@0.3.0
[email protected]
[email protected]
[email protected]
Expand All @@ -139,6 +141,6 @@ [email protected]
[email protected]
[email protected]
velocityjs:[email protected]
webapp@1.3.19
webapp@1.4.0
[email protected]
xolvio:[email protected]
12 changes: 11 additions & 1 deletion imports/ui/css/earth.css
Original file line number Diff line number Diff line change
Expand Up @@ -3591,7 +3591,7 @@ blockquote {

.login {
width: 100%;
padding: 10px 10px 5px;
padding: 5px 5px 0px;
float: left;
font-size: 14px;
text-align: center;
Expand Down Expand Up @@ -3652,6 +3652,13 @@ blockquote {
float: left;
}

.login-label.title-label {
margin: 5px -20px 10px;
padding: 5px 20px;
border-bottom: 1px dotted #6c5b7c;
text-align: left;
}

.authenticate {
display: inline-block;
margin-right: auto;
Expand Down Expand Up @@ -5981,6 +5988,9 @@ blockquote {
.actor.actor-score {
right: 0px;
}
.avatar-icon-box {
max-height: 24px;
}
}

@media (max-width: 479px) {
Expand Down
5 changes: 5 additions & 0 deletions imports/ui/templates/components/identity/card/card.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,11 @@
{{> avatar profile=this includeName=true includeNation=true editable=false disabled=true includeRole=false}}
{{#if currentUser}}
{{#unless myself}}

<div class="login-label title-label">
{{_ 'delegation-status'}}
</div>

{{#with voteSettings}}
{{> liquid _id=this.voteId sourceId=this.sourceId contract=contract targetId=this.targetId wallet=this.wallet editable=true}}
{{/with}}
Expand Down
5 changes: 3 additions & 2 deletions imports/ui/templates/layout/navigation/navigation.js
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,8 @@ function hideBar() {
* @summary verifies if current screen should have back button on navbar
*/
function displayBackButton() {
return (Meteor.Device.isPhone() && (Router.current().url.search('/idea/') >= 0 || Router.current().url.search('/peer/') >= 0));
return false;
// return (Meteor.Device.isPhone() && (Router.current().url.search('/idea/') >= 0 || Router.current().url.search('/peer/') >= 0));
}

/**
Expand Down Expand Up @@ -127,7 +128,7 @@ Template.navigation.events({
Session.set('showPostEditor', false);
} else if (displayBackButton()) {
window.history.back();
} else if (Session.get('navbar').action === 'SIDEBAR') {
} else { // if (Session.get('navbar').action === 'SIDEBAR')
toggleSidebar();
}
},
Expand Down
1 change: 1 addition & 0 deletions imports/ui/templates/widgets/feed/feed.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import './feedEmpty.js';
Template.feed.helpers({
item() {
const feed = Contracts.find(this.query, { sort: this.sort, skip: this.skip, limit: this.limit }).fetch();
console.log(feed);
if (feed.length === 0) {
Session.set('emptyFeed', true);
} else {
Expand Down

0 comments on commit f22ce38

Please sign in to comment.