Develop

[bradrich]

Submission of the requested coding challenge. Please review README.md file located in single-page-app-exercise to understand setup, viewing and testing.

You might have noticed the closing of the pull request of my master to your master. I thought better of it since it was not in the mind of Git Flow best practices.

[spencerhrob]

I can't quite tell why you closed #10 and opened #11, but if you're just
updating your code, you can simply keep your pull request open and continue
to push new code to your branch. GitHub will automatically update your pull
request with your new code.
On Oct 4, 2015 2:50 PM, "Brad Richardson" [email protected] wrote:

Submission of the requested coding challenge. Please review README.md file
located in single-page-app-exercise to understand setup, viewing and
testing.

You might have noticed the closing of the pull request of my master to
your master. I thought better of it since it was not in the mind of Git

Flow best practices.

You can view, comment on, or merge this pull request online at:

#11
Commit Summary

• Merge pull request Uiposition #5 from siostechcorp/uiposition
• Update README
• Again, generator
• Added data.json
• Removed extra stuff, ready to go
• Fixed missing timestamps, fixed ports in README
• Travis' questions
• Merge pull request Update README #7 from siostechcorp/readme
• Merge pull request Generator2 #8 from siostechcorp/generator2
• Merge pull request Travis' questions #9 from siostechcorp/questions
• Spelling fixes
• Initial commit.
• Working on unit testing.
• * Fix - Fixed a date issue with Internet Explorer.
• Working on initial build.
• Finalize testing.
• Finalizing build.
• Fixed an error in the unit tests.
• Readme change.
• Readme change.

File Changes

• A single-page-app-exercise/.bowerrc
  https://github.com/siostechcorp/exercises/pull/11/files#diff-0 (3)
• A single-page-app-exercise/.editorconfig
  https://github.com/siostechcorp/exercises/pull/11/files#diff-1 (21)
• A single-page-app-exercise/.gitattributes
  https://github.com/siostechcorp/exercises/pull/11/files#diff-2 (1)
• A single-page-app-exercise/.gitignore
  https://github.com/siostechcorp/exercises/pull/11/files#diff-3 (5)
• A single-page-app-exercise/.jshintrc
  https://github.com/siostechcorp/exercises/pull/11/files#diff-4 (21)
• A single-page-app-exercise/.travis.yml
  https://github.com/siostechcorp/exercises/pull/11/files#diff-5 (9)
• A single-page-app-exercise/.yo-rc.json
  https://github.com/siostechcorp/exercises/pull/11/files#diff-6 (1)
• A single-page-app-exercise/Gruntfile.js
  https://github.com/siostechcorp/exercises/pull/11/files#diff-7 (617)
• A single-page-app-exercise/INSTRUCTIONS.md
  https://github.com/siostechcorp/exercises/pull/11/files#diff-8 (102)
• A single-page-app-exercise/QUESTIONS.md
  https://github.com/siostechcorp/exercises/pull/11/files#diff-9 (136)
• M single-page-app-exercise/README.md
  https://github.com/siostechcorp/exercises/pull/11/files#diff-10 (55)
• A single-page-app-exercise/app/.buildignore
  https://github.com/siostechcorp/exercises/pull/11/files#diff-11 (1)
• A single-page-app-exercise/app/.htaccess
  https://github.com/siostechcorp/exercises/pull/11/files#diff-12
  (543)
• A single-page-app-exercise/app/404.html
  https://github.com/siostechcorp/exercises/pull/11/files#diff-13
  (152)
• A
  single-page-app-exercise/app/components/accordion/accordion-item.html
  https://github.com/siostechcorp/exercises/pull/11/files#diff-14 (4)
• A single-page-app-exercise/app/components/accordion/accordion.html
  https://github.com/siostechcorp/exercises/pull/11/files#diff-15 (2)
• A
  single-page-app-exercise/app/components/actionsheet/actionsheet-button.html
  https://github.com/siostechcorp/exercises/pull/11/files#diff-16 (6)
• A
  single-page-app-exercise/app/components/actionsheet/actionsheet-content.html
  https://github.com/siostechcorp/exercises/pull/11/files#diff-17 (8)
• A
  single-page-app-exercise/app/components/actionsheet/actionsheet.html
  https://github.com/siostechcorp/exercises/pull/11/files#diff-18 (3)
• A single-page-app-exercise/app/components/app.js
  https://github.com/siostechcorp/exercises/pull/11/files#diff-19 (28)
• A single-page-app-exercise/app/components/content/directives.js
  https://github.com/siostechcorp/exercises/pull/11/files#diff-20 (19)
• A
  single-page-app-exercise/app/components/content/styles/_styles.scss
  https://github.com/siostechcorp/exercises/pull/11/files#diff-21 (30)
• A
  single-page-app-exercise/app/components/content/templates/error.html
  https://github.com/siostechcorp/exercises/pull/11/files#diff-22 (5)
• A
  single-page-app-exercise/app/components/content/templates/loader.html
  https://github.com/siostechcorp/exercises/pull/11/files#diff-23 (3)
• A single-page-app-exercise/app/components/footer/directives.js
  https://github.com/siostechcorp/exercises/pull/11/files#diff-24 (11)
• A
  single-page-app-exercise/app/components/footer/styles/_styles.scss
  https://github.com/siostechcorp/exercises/pull/11/files#diff-25 (14)
• A
  single-page-app-exercise/app/components/footer/templates/footer.html
  https://github.com/siostechcorp/exercises/pull/11/files#diff-26 (11)
• A single-page-app-exercise/app/components/form/directives.js
  https://github.com/siostechcorp/exercises/pull/11/files#diff-27
  (463)
• A single-page-app-exercise/app/components/form/styles/_styles.scss
  https://github.com/siostechcorp/exercises/pull/11/files#diff-28 (75)
• A single-page-app-exercise/app/components/global/configs.js
  https://github.com/siostechcorp/exercises/pull/11/files#diff-29 (31)
• A single-page-app-exercise/app/components/global/runs.js
  https://github.com/siostechcorp/exercises/pull/11/files#diff-30 (10)
• A
  single-page-app-exercise/app/components/global/styles/_settings.scss
  https://github.com/siostechcorp/exercises/pull/11/files#diff-31 (57)
• A
  single-page-app-exercise/app/components/global/styles/_styles.scss
  https://github.com/siostechcorp/exercises/pull/11/files#diff-32
  (116)
• A single-page-app-exercise/app/components/global/styles/main.scss
  https://github.com/siostechcorp/exercises/pull/11/files#diff-33 (28)
• A single-page-app-exercise/app/components/modal/modal.html
  https://github.com/siostechcorp/exercises/pull/11/files#diff-34 (9)
• A
  single-page-app-exercise/app/components/notification/notification-set.html
  https://github.com/siostechcorp/exercises/pull/11/files#diff-35 (9)
• A
  single-page-app-exercise/app/components/notification/notification-static.html
  https://github.com/siostechcorp/exercises/pull/11/files#diff-36 (12)
• A
  single-page-app-exercise/app/components/notification/notification.html
  https://github.com/siostechcorp/exercises/pull/11/files#diff-37 (12)
• A single-page-app-exercise/app/components/offcanvas/offcanvas.html
  https://github.com/siostechcorp/exercises/pull/11/files#diff-38 (5)
• A single-page-app-exercise/app/components/panel/panel.html
  https://github.com/siostechcorp/exercises/pull/11/files#diff-39 (6)
• A single-page-app-exercise/app/components/popup/popup.html
  https://github.com/siostechcorp/exercises/pull/11/files#diff-40 (2)
• A single-page-app-exercise/app/components/states/config.js
  https://github.com/siostechcorp/exercises/pull/11/files#diff-41 (25)
• A single-page-app-exercise/app/components/tabs/tab-content.html
  https://github.com/siostechcorp/exercises/pull/11/files#diff-42 (8)
• A single-page-app-exercise/app/components/tabs/tab.html
  https://github.com/siostechcorp/exercises/pull/11/files#diff-43 (3)
• A single-page-app-exercise/app/components/tabs/tabs.html
  https://github.com/siostechcorp/exercises/pull/11/files#diff-44 (8)
• A single-page-app-exercise/app/favicon.ico
  https://github.com/siostechcorp/exercises/pull/11/files#diff-45 (0)
• A
  single-page-app-exercise/app/fonts/bootstrap/glyphicons-halflings-regular.eot
  https://github.com/siostechcorp/exercises/pull/11/files#diff-46 (0)
• A
  single-page-app-exercise/app/fonts/bootstrap/glyphicons-halflings-regular.svg
  https://github.com/siostechcorp/exercises/pull/11/files#diff-47
  (288)
• A
  single-page-app-exercise/app/fonts/bootstrap/glyphicons-halflings-regular.ttf
  https://github.com/siostechcorp/exercises/pull/11/files#diff-48 (0)
• A
  single-page-app-exercise/app/fonts/bootstrap/glyphicons-halflings-regular.woff
  https://github.com/siostechcorp/exercises/pull/11/files#diff-49 (0)
• A
  single-page-app-exercise/app/fonts/bootstrap/glyphicons-halflings-regular.woff2
  https://github.com/siostechcorp/exercises/pull/11/files#diff-50 (0)
• R single-page-app-exercise/app/images/login_redline.jpg
  https://github.com/siostechcorp/exercises/pull/11/files#diff-51 (0)
• A single-page-app-exercise/app/images/sios-icon.png
  https://github.com/siostechcorp/exercises/pull/11/files#diff-52 (0)
• A single-page-app-exercise/app/images/yeoman.png
  https://github.com/siostechcorp/exercises/pull/11/files#diff-53 (0)
• A single-page-app-exercise/app/index.html
  https://github.com/siostechcorp/exercises/pull/11/files#diff-54 (93)
• A single-page-app-exercise/app/modules/edit/controllers.js
  https://github.com/siostechcorp/exercises/pull/11/files#diff-55
  (141)
• A single-page-app-exercise/app/modules/edit/services.js
  https://github.com/siostechcorp/exercises/pull/11/files#diff-56 (45)
• A single-page-app-exercise/app/modules/edit/templates/edit.html
  https://github.com/siostechcorp/exercises/pull/11/files#diff-57 (44)
• A single-page-app-exercise/app/modules/list/controllers.js
  https://github.com/siostechcorp/exercises/pull/11/files#diff-58
  (129)
• A single-page-app-exercise/app/modules/list/templates/list.html
  https://github.com/siostechcorp/exercises/pull/11/files#diff-59 (40)
• A single-page-app-exercise/app/robots.txt
  https://github.com/siostechcorp/exercises/pull/11/files#diff-60 (4)
• A single-page-app-exercise/bower.json
  https://github.com/siostechcorp/exercises/pull/11/files#diff-61 (46)
• A single-page-app-exercise/data.json
  https://github.com/siostechcorp/exercises/pull/11/files#diff-62 (76)
• A single-page-app-exercise/package.json
  https://github.com/siostechcorp/exercises/pull/11/files#diff-63 (63)
• A single-page-app-exercise/test/.jshintrc
  https://github.com/siostechcorp/exercises/pull/11/files#diff-64 (18)
• A single-page-app-exercise/test/karma.conf.js
  https://github.com/siostechcorp/exercises/pull/11/files#diff-65
  (172)
• A single-page-app-exercise/test/spec/controllers/edit.js
  https://github.com/siostechcorp/exercises/pull/11/files#diff-66
  (263)
• A single-page-app-exercise/test/spec/controllers/list.js
  https://github.com/siostechcorp/exercises/pull/11/files#diff-67
  (337)
• A single-page-app-exercise/test/spec/directives/content-error.js
  https://github.com/siostechcorp/exercises/pull/11/files#diff-68 (24)
• A single-page-app-exercise/test/spec/directives/content-loader.js
  https://github.com/siostechcorp/exercises/pull/11/files#diff-69 (24)
• A single-page-app-exercise/test/spec/directives/footer.js
  https://github.com/siostechcorp/exercises/pull/11/files#diff-70 (24)

Patch Links:

• https://github.com/siostechcorp/exercises/pull/11.patch
• https://github.com/siostechcorp/exercises/pull/11.diff

—
Reply to this email directly or view it on GitHub
#11.

[bradrich]

I understand and am familiar with that process. I was not adding more code. I was simply concerned with the request of my master branch being pulled into your master branch. I generally like to follow Git Flow best practices and wanted to change it to where it was my develop branch being pulled into a branch besides your master. Please excuse the traffic.

[bradrich]

It has been bothering me since yesterday and my OCD won't let me ignore it, LOL.