Skip to content
This repository has been archived by the owner on May 26, 2019. It is now read-only.

Ember CLI updates to templates section of guides #24

Closed
wants to merge 66 commits into from
Closed

Ember CLI updates to templates section of guides #24

wants to merge 66 commits into from

Conversation

mikepmunroe
Copy link
Contributor

Ready for review

  • [ x] Finish remaining sections
  • [ x] Fix image at templates/actions/ - removed the image

@mikepmunroe mikepmunroe changed the title updates for application and handlebars basics [WIP] Ember CLI updates to templates section of guides Mar 3, 2015
@trek
Copy link
Member

trek commented Mar 13, 2015

Can you rebase and update this to reflect #35

@joostdevries joostdevries mentioned this pull request Mar 17, 2015
Closed
19 tasks
@rwjblue
Copy link
Member

rwjblue commented Mar 18, 2015

@mikepmunroe - Ping? Can you update this to reflect #35?

@rwjblue
Copy link
Member

rwjblue commented Mar 18, 2015

Also needs a rebase...

@mikepmunroe
Copy link
Contributor Author

Yes, sorry behind on this. Been underwater in some client work. I'll shoot to get this done by EOD today.

@rwjblue
Copy link
Member

rwjblue commented Mar 18, 2015

Also, just as a reminder, we need to comment out the JSBin's in the guides until we can get a better solution to ember-cli style examples.

@mikepmunroe
Copy link
Contributor Author

👍

trek and others added 22 commits March 18, 2015 20:46
@trek @mikepmunroe
Remove non-guide images
846787c
@trek @mikepmunroe
Basic search.json generation so we can move forward
4cc79b1
@trek @mikepmunroe
Remove some unused CSS
7199043
@trek @mikepmunroe
Removes unused middleman code. Makes assets user relative helpers
8b82c1b
@trek @mikepmunroe
Fix footer links
d561701
@trek @mikepmunroe
Fix github edit link
b9d2ebc
@trek @mikepmunroe
Fix left-over absolute link
42f3396
@trek @mikepmunroe
Correct github edit link.
8347bca 
Also, prune some unused helpers.
@mikepmunroe
converted the first four articles
4bf7b4f
@mikepmunroe
updating customizing
b70e71d
@mikepmunroe
updated a jsbin
7f744aa
@mikepmunroe
finished adding JSbins
aed20b9
@mikepmunroe
changing spaces to 2 instead of 4, reducing var CreateWhatever
16532a0
@mikepmunroe
more spacing and export changes
daf2172
@mikepmunroe
indent inside if statement with 2 spaces
88380ff
@mikepmunroe
JSBin changes and small space fixes
22b0f36
@trek @mikepmunroe
Cherry pick fixing commit. Hopefully last one for 1.10.0 guides
dd953e7
@bsclifton @mikepmunroe
Grabbed only the swiftype/middleman changes from #7
0595635
@bsclifton @mikepmunroe
Updated gemfile ref to middleman-swiftype
330c16a
@bsclifton @mikepmunroe
Updated reference for middleman-swiftype; now puts document key aroun…
6a0a53b 
…d content.
@trek @mikepmunroe
Autocomplete for switftype search
71cbe0d
@trek @mikepmunroe
Make autocomplete prefix links
a20adb4
trek and others added 21 commits March 18, 2015 20:47
@trek @mikepmunroe
Removes TodoMVC-based getting started guide
dbfe089
@trek @mikepmunroe
Removes bloggr video
dc730a4
@trek @mikepmunroe
Migrates application section to ember-cli style
917a4fe
@trek @mikepmunroe
Update index.md
b1a623a
@trek @mikepmunroe
Migrate configuring-ember section to cli-style
025a177
@nicolechung @mikepmunroe
commented out JSbins
399fe58
@rwjblue @mikepmunroe
Use upstream middleman-swiftype.
3385a6c
@mikepmunroe
Fixed Typo
61b9456 
Just fixing a small typo:

"for build a basic controls live text inputs, ..."

to

"for build basic controls live text inputs, ..."
@nicolechung @mikepmunroe
removed JSbins and added formatting to another file
74edc9e
@tarebyte @mikepmunroe
Moved rails-assets-* to their own block.
3534ef5
@trek @mikepmunroe
Convert views (as best we can) to ember-cli
bb7387b
@mixonic @mikepmunroe
Update list of injectable things
4f939c8
@mikepmunroe
fixes as per rwblue comments
c84b7e8
@mikepmunroe
fixes as per rwblue comments
b4c4fb5
@mikepmunroe
removing imports and newlines
1effc1a
@mikepmunroe
removed double 'a', indentation and incorrect file extension
33ae9c4
@mikepmunroe
removed indents
d4ba96b
@mikepmunroe
updates for application and handlebars basics
52debc7
@mikepmunroe
finish first pass on remaining sections
7871bdb
@mikepmunroe
clean up code samples
f53e894 
adjust file paths to utilize #35 syntax
remove import statements
@mikepmunroe
remove actions bubbling diagram image
3c68955
@mikepmunroe mikepmunroe reopened this Mar 19, 2015
@mikepmunroe mikepmunroe changed the title [WIP] Ember CLI updates to templates section of guides Ember CLI updates to templates section of guides Mar 19, 2015
@mikepmunroe
Copy link
Contributor Author

This is ready for review. I saw all of the extra commits from upstream and didn't expect to see them. Let me know if that is a problem. I am going off of http://stackoverflow.com/questions/10143842/pull-request-to-upstream-repo-contains-commits-previously-fetched-merged-from-up.

Also, you will notice that I removed the following image,
action-bubbling

Is that OK, or should I work on trying to get it updated?

@locks
Copy link
Contributor

locks commented Mar 20, 2015

Personally I'd leave it as it's a very important concept, and then the original artist can submit a new one.
Or you can fix it if you have time before the next release.

@locks
Copy link
Contributor

locks commented Mar 20, 2015

There seems to be something off with your rebase, this PR can't be cleanly merged.

@mikepmunroe
Copy link
Contributor Author

Please see PR #71 that replaces this

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet