Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: yogiben/meteor-admin
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: CaptainN/meteor-admin
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Able to merge. These branches can be automatically merged.
  • 3 commits
  • 2 files changed
  • 1 contributor

Commits on Oct 9, 2015

  1. fixed missing data in tables (including user table)

    @CaptainN
    CaptainN committed Oct 9, 2015
    Copy the full SHA
    7781e1a View commit details

  2. added explicit api use for check package

    @CaptainN
    CaptainN committed Oct 9, 2015
    Copy the full SHA
    87856e2 View commit details

Commits on Mar 3, 2016

  1. Merge remote-tracking branch 'yogiben/master'

    @CaptainN
    CaptainN committed Mar 3, 2016
    Copy the full SHA
    1c281f2 View commit details
Showing with 5 additions and 2 deletions.
  1. +4 −2 lib/both/startup.coffee
  2. +1 −0 package.js
6 changes: 4 additions & 2 deletions lib/both/startup.coffee
View file
Original file line number Diff line number Diff line change
@@ -44,7 +44,7 @@ adminCreateTables = (collections) ->
if column.template
createdCell = (node, cellData, rowData) ->
$(node).html ''
Blaze.renderWithData(Template[column.template], {value: cellData, doc: rowData}, node)
Blaze.renderWithData(Template[column.template], {value: cellData, doc: rowData})

data: column.name
title: column.label
@@ -193,7 +193,9 @@ Meteor.startup ->
data: 'emails'
title: 'Email'
render: (value) ->
value[0].address
# some users have no email addresses
if value && value.length
value[0].address
searchable: true
}
{
1 change: 1 addition & 0 deletions package.js
View file
Original file line number Diff line number Diff line change
@@ -14,6 +14,7 @@ Package.on_use(function(api){
api.use(
['iron:router@1.0.9',
'coffeescript',
'check',
'underscore',
'reactive-var',
'check',