Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use the correct syntax to reference a github repository. #213

Closed
wants to merge 25 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
3f0a755
hide left table when numFixedColumns is 0
andrewfan Jun 26, 2014
97ade97
Merge pull request #179 from upsilonIT/hide_left_table
azirbel Jun 26, 2014
ec1ff2b
Release 0.2.1
Jun 30, 2014
eb73510
Fix changelog bulleting
Jun 30, 2014
f978abd
Use more standard ~ for handlebars version
Jul 18, 2014
18e7a1d
Upgrade grunt-bower-task to 0.4.0
Jul 21, 2014
a938728
Add multiselect functionality
Aug 5, 2014
6bf4933
Fix multiselect bugs
Aug 7, 2014
223683f
Compile dist files
Aug 8, 2014
947ae2d
Fix another multiselect bug
Aug 9, 2014
29c7e8b
Improvements to docs pages
Jul 21, 2014
b3ead87
Publish new gh-pages with every release
Aug 20, 2014
1cd4c2d
Fix typo so we publish to correct gh-pages repo
Aug 20, 2014
0d6b1f3
Store row objects in _selection rather than their contents
Aug 27, 2014
1b7c762
Check that selection is not null
Aug 27, 2014
283e6cd
Resolve Ember CLI style view references.
Aug 26, 2014
1731247
fix state deprecation, add quotes to colum header sort action name
arenoir Sep 10, 2014
c442799
Check against both undefined and null instead of just undefined
Sep 22, 2014
35fe70c
Dasherize stylename for output
Sep 22, 2014
e9123bd
Release 0.2.2
Sep 26, 2014
9ef2f11
Clean up comments, adding inputs/output docs
Sep 29, 2014
bc7113d
Update docs pages.
Sep 30, 2014
6f2a5bb
update copy:tests task to allow localhost:8000/tests to run
RandomEtc Oct 4, 2014
7391977
Use the correct syntax to reference a github repository.
cyril-sf Oct 3, 2014
8a057e3
Fix jquery-mousewheel dependency
cyril-sf Oct 3, 2014
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .bowerrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"directory": "vendor"
}
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ bower_components/
build/
doc/
gh_pages/
lib/
node_modules/
tests/lib
tests/css
vendor/
.DS_Store
.stage
*.swo
Expand Down
17 changes: 0 additions & 17 deletions .release.json

This file was deleted.

28 changes: 28 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,33 @@
# Ember Table Changelog

### Ember Table 0.2.2 _(September 25, 2014)_

* Dasherize stylename for output
* `styleBindings` definitions are now auto-dasherized
* Check against both undefined and null instead of just undefined
* Fix state deprecation, add quotes to column header sort action name
* Resolve Ember CLI style view references.
* Now, `tableCellView: 'message/preview'` is also valid
* Check that selection is not null
* Store row objects in _selection rather than their contents
* Automatically publish updated docs with every release
* Add community examples page, and other small docs improvements
* Add multiselect functionality
* API: `selectionMode="{single|multiple|none}"`
* Upgrade grunt-bower-task and use grunt-release-it
* Use more standard ~ for handlebars version

### Ember Table 0.2.1 _(June 30, 2014)_

* Hide fixedColumns table when numFixedColumns is 0
* Revert "Fix a few minor UI bugs" (fixes antiscroll issue)
* Fixes #92, where rows are dynamically inserted
* Fix updateLayout to make antiscroll update its dimensions
* Use intersect rather than pointer for sortable
* Header cell span css fix
* Use row rather than content of row object proxy in table cells
* It's now necessary to use row.get('property') rather than row.property

### Ember Table 0.2.0 _(May 19, 2014)_

* Add versions to proper files; add CHANGELOG.md to manage versions
Expand Down
82 changes: 61 additions & 21 deletions Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ module.exports = function (grunt) {
grunt.loadNpmTasks('grunt-banner');
grunt.loadNpmTasks('grunt-text-replace');
grunt.loadNpmTasks('grunt-bower-task');
grunt.loadNpmTasks('grunt-release-it');

// Project configuration.
grunt.initConfig({
Expand All @@ -25,8 +26,10 @@ module.exports = function (grunt) {
bower: {
install: {
options: {
cleanup: true,
layout: 'byComponent'
targetDir: 'vendor',
layout: 'byComponent',
verbose: true,
copy: false
}
}
},
Expand Down Expand Up @@ -121,21 +124,29 @@ module.exports = function (grunt) {
dest: 'gh_pages/index.html'
}, {
expand: true,
flatten: true,
cwd: 'dependencies/',
src: ['**/*.js'],
dest: 'gh_pages/lib'
}, {
expand: true,
flatten: true,
cwd: 'vendor/',
src: ['**/*.js'],
dest: 'gh_pages/lib'
}, {
expand: true,
cwd: 'dependencies/',
src: ['**/*.css'],
dest: 'gh_pages/css'
dest: 'gh_pages/lib'
}, {
expand: true,
cwd: 'lib/font-awesome/font/',
cwd: 'vendor/',
src: ['**/*.css'],
dest: 'gh_pages/lib'
}, {
expand: true,
cwd: 'vendor/font-awesome/font/',
src: ['**'],
dest: 'gh_pages/font'
dest: 'gh_pages/lib/font-awesome/font'
}, {
expand: true,
cwd: 'app/assets/font/',
Expand All @@ -152,17 +163,22 @@ module.exports = function (grunt) {
tests: {
files: [
{
expand: true,
flatten: true,
cwd: 'dependencies/',
src: ['**/*.js'],
dest: 'tests/lib'
src: ['vendor/qunit/qunit/qunit.css'],
dest: 'tests/css/qunit.css'
}, {
expand: true,
flatten: true,
cwd: 'dependencies/',
src: ['**/*.css'],
dest: 'tests/css'
expand: true,
src: [
'vendor/qunit/qunit/qunit.js',
'vendor/ember/ember.js',
'vendor/handlebars/handlebars.js',
'vendor/modernizr/modernizr.js',
'vendor/d3/d3.js',
'vendor/jquery/jquery.js',
'vendor/jquery-ui/ui/jquery-ui.custom.js',
'vendor/jquery-mousewheel/jquery.mousewheel.js'
],
dest: 'tests/lib/'
}
]
}
Expand Down Expand Up @@ -220,6 +236,14 @@ module.exports = function (grunt) {
from: /Ember.Table.VERSION = '.*\..*\..*'/,
to: "Ember.Table.VERSION = '<%=pkg.version%>'"
}]
},
overview_page: {
src: ['app/templates/ember_table/overview.hbs'],
overwrite: true,
replacements: [{
from: /The current version is .*\..*\..*./,
to: "The current version is <%=pkg.version%>."
}]
}
},

Expand All @@ -229,7 +253,7 @@ module.exports = function (grunt) {
tasks: ["default"]
},
code: {
files: ["src/**/*.coffee", "app/**/*.coffee", "dependencies/**/*.js", "lib/**/*.js"],
files: ["src/**/*.coffee", "app/**/*.coffee", "dependencies/**/*.js", "vendor/**/*.js"],
tasks: ["coffee", "neuter"]
},
handlebars: {
Expand All @@ -244,15 +268,31 @@ module.exports = function (grunt) {
files: ["app/index.html"],
tasks: ["copy"]
}
},

"release-it": {
options: {
"pkgFiles": ["package.json", "bower.json"],
"commitMessage": "Release %s",
"tagName": "v%s",
"tagAnnotation": "Release %s",
"increment": "patch",
"buildCommand": "grunt dist",
"distRepo": "-b gh-pages [email protected]:addepar/ember-table",
"distStageDir": ".stage",
"distBase": "gh_pages",
"distFiles": ["**/*"],
"publish": false
}
}
});

// Default tasks.
// Build tasks
grunt.registerTask("build_srcs", ["coffee:srcs", "emberTemplates", "neuter"]);

grunt.registerTask("build_app", ["coffee:app", "emberTemplates", "neuter"]);

grunt.registerTask("dist", ["replace", "build_srcs", "build_app", "less", "copy", "uglify", "usebanner"]);
grunt.registerTask("dist", ["bower", "replace", "build_srcs", "build_app", "less", "copy", "uglify", "usebanner"]);

grunt.registerTask("default", ["bower", "replace", "build_srcs", "build_app", "less", "copy", "uglify", "usebanner", "watch"]);
grunt.registerTask("default", ["dist", "watch"]);
};

25 changes: 18 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ http://addepar.github.com/ember-table/

#### JS Bin Starter Kit

http://emberjs.jsbin.com/feqih/1/edit
http://emberjs.jsbin.com/rikon/1/edit

#### Installation

Expand All @@ -41,6 +41,8 @@ To view examples, start the node server. From the root directory:

You can view the examples at http://localhost:8000/gh_pages.

You can run the tests at http://localhost:8000/tests.

## Dependencies
* ember
* jquery-ui
Expand Down Expand Up @@ -71,17 +73,26 @@ In a nutshell, this means:


### Maintainers
Update version numbers and release using https://github.com/webpro/release-it. Install:
Update version numbers and release using https://github.com/webpro/grunt-release-it:

```
$ npm install -g release-it
$ alias release="release-it"
$ vim CHANGELOG.md
$ grunt release-it:<options>
```
Release process:

By default, this will release a new patch version. Other suggested commands:

```
$ vim CHANGELOG.md
$ release <options>
$ grunt release-it:minor
$ grunt release-it:major
$ grunt release-it:X.Y.Z
```

Ember Table uses the "distribution repository" feature of `release-it` to push to
the `gh-pages` branch and update documentation. When prompted, do NOT update the
tag for the distribution repository. We'll streamline the release process a bit
more soon.


## Copyright and License
Copyright © 2013 Addepar, Inc. All Rights Reserved
Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.2.0
0.2.2
6 changes: 3 additions & 3 deletions app/app.coffee
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Ember-Table Dependencies
require 'lib/bootstrap/bootstrap'
require 'lib/antiscroll/antiscroll'
require 'vendor/bootstrap/dist/js/bootstrap'
require 'vendor/antiscroll/antiscroll'
require 'dependencies/ember-addepar-mixins/resize_handler'
require 'dependencies/ember-addepar-mixins/style_bindings'
require 'dist/ember-table'
Expand All @@ -9,7 +9,7 @@ require 'dist/ember-table'
require 'dependencies/date'

# Editable Horizon and Sparkline dependency
require 'lib/d3/d3'
require 'vendor/d3/d3'
require 'dependencies/horizon'

window.App = Ember.Application.create
Expand Down
21 changes: 16 additions & 5 deletions app/assets/css/app.less
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,8 @@

// External Libraries on which addepar-components.css relies
// -------------------------
@import "../../../lib/bootstrap/bootstrap.css";
@import '../../../lib/jquery-ui/jquery-ui.css';
@import '../../../dependencies/addepar-bootstrap-theme/addepar-bootstrap-theme.less';
@import "../lib/bootstrap/dist/css/bootstrap.css";
@import '../lib/jquery-ui/themes/base/jquery-ui.css';

// Ember Table
// -------------------------
Expand Down Expand Up @@ -93,6 +92,10 @@ h3 {
h4 {
font: 500 15px/1.5 @sansFontFamily;
font-family: 'Univers Next W01 Medium';

&.byline {
margin-bottom: 2px;
}
}

h5 {
Expand Down Expand Up @@ -126,6 +129,13 @@ p,
font: normal 11px/1.4 @sansFontFamily;
font-family: 'UniversNextW01-Regular';
}

&.byline {
font: normal 12px/1.4 @sansFontFamily;
font-family: 'Univers Next W01 Light';
margin-top: 2px;
margin-bottom: 6px;
}
}

.styled li {
Expand Down Expand Up @@ -188,17 +198,18 @@ strong {
/* Code Sample Styles */

code, pre {
display: block;
background-color: #f8f8f8;
color: black;
font-family : 'SourceCodePro-Regular', Menlo, Monaco, Consolas, monospace;
font-size: 12px;
white-space: pre !important;
word-wrap: normal;
}

pre {
display: block;
.border-radius(1px);
border: none;
background-color: #f8f8f8;
}

/* Buttons
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 0 additions & 1 deletion app/controllers/financial.coffee
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,6 @@ App.FinancialTableComponent = Ember.Table.EmberTableComponent.extend
# custom properties
sortAscending: no
sortColumn: null
selection: null

actions:
toggleTableCollapse: (event) ->
Expand Down
1 change: 0 additions & 1 deletion app/controllers/treetable.coffee
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,6 @@ Ember.Table.EmberTableComponent.extend App.TreeTableExample.TreeDataAdapter,
# custom properties
sortAscending: no
sortColumn: null
selection: null

toggleTableCollapse: (event) ->
@toggleProperty 'isCollapsed'
Expand Down
Loading