github.com/TheOdinProject/theodinproject commits

Merge pull request #174 from LaMarseillaise/refactor_curriculum_import

Refactor curriculum import

8daf3455b1ca612611cf46564bef58fd4883e6b6 authored over 8 years ago by Kevin Mulhern <[email protected]>

Refactor Lesson#import_content

e082ff52bb91d6804bcad27bf9c90fd23e0e6fd1 authored over 8 years ago by Andur Carr <[email protected]>

changed project flag to true for sinatra project

7fe888e9907b68f76eada63ac79ac5acf339e8f3 authored over 8 years ago by Kevin <[email protected]>

Merge pull request #175 from TheOdinProject/feature/add-sinatra-lessons

updated seed files

53f183e81f0c9671d96268f2c0f6e92290b30781 authored over 8 years ago by Kevin Mulhern <[email protected]>

updated seed files

1fe5b0b49e06480548e0ae0227f56f63a0f794d6 authored over 8 years ago by Kevin <[email protected]>

Add comments and error message for Lesson#import_content

dd25585496ec892bf0f3eef71c0402d806f108e0 authored over 8 years ago by Andur Carr <[email protected]>

Add content validation for lessons

47fafd3e54ac7c78a9af20bede47f386028ff16c authored over 8 years ago by Andur Carr <[email protected]>

Refactor curriculum tasks

b9ef8094ed4c98a8877962dcec384e4423de366a authored over 8 years ago by Andur Carr <[email protected]>

Add lesson import method

89713cffbbbb87a82f9936f0ba78461876cf5a72 authored over 8 years ago by Andur Carr <[email protected]>

added gearing up lesson to seeds

3734a0ea10a81ad9397b18cbdf2d60be0fd1806a authored over 8 years ago by Kevin <[email protected]>

Merge pull request #172 from TheOdinProject/feature/add-linked-list-lesson

Added linked lists project to seeds

557fe8dd1a90ab6f22246926fdcfbd31d62bc2ec authored over 8 years ago by Kevin Mulhern <[email protected]>

Added linked lists project to seeds

ed8d20891d546e749df3929cb3ff39ede3ac33e2 authored over 8 years ago by Kevin <[email protected]>

Merge branch 'master' of https://git.heroku.com/theodinproject

a7d73cf517f0b41ed429e923c1eb49a226ca88bb authored over 8 years ago by Kevin <[email protected]>

removed redundant missing template rescue

fd20c580724b4de478a4660ca0104ea4e4b23dc4 authored over 8 years ago by Kevin <[email protected]>

removed redundant missing template rescue

5b2cee711bfb0501e447a80067c1698a076c09c4 authored over 8 years ago by Kevin <[email protected]>

Merge branch 'master' of https://git.heroku.com/theodinproject

fe846667a14d2b7ca683e8af0a8c75a187beda5e authored over 8 years ago by Kevin <[email protected]>

added rescue from actionview::templateerror

f591ce5442d72590f95beffebe6a566cf7ba81c0 authored over 8 years ago by Kevin <[email protected]>

Revert "Changed inner join query to direct query on Lesson"

This reverts commit fb774e709def6192387836bc26ef1a5f4a714fa8.

Querying for lessons by this fiel...

6d02d996a4546992be3afcb8e28b38a97f018b49 authored over 8 years ago by Mazin Power <[email protected]>

Changed inner join query to direct query on Lesson

fb774e709def6192387836bc26ef1a5f4a714fa8 authored over 8 years ago by Mazin Power <[email protected]>

Refactored lessons not found error

e5de5fd949730a24a0dec365ddad7f9a7e019d80 authored over 8 years ago by Kevin <[email protected]>

cleaned up lessons controller and added tests for not found error

5c26c93f9dbf4582c3f3b43fdf9d6a8076851e04 authored over 8 years ago by Kevin <[email protected]>

hotfix/for-404-error

7afdcfb66f266dccb478c71ebfd08ad7c4b8b56c authored over 8 years ago by Kevin <[email protected]>

Merge pull request #164 from TopOneOfTopOne/add-threading-to-rake-task

Add threading to rake task

358a7fb5daa82e64be1569515504bc54a53faa1e authored over 8 years ago by Kevin Mulhern <[email protected]>

Merge pull request #167 from TopOneOfTopOne/refactor-

Refactor

45954fdcea4909f02f05b355dbf38b3ac73eed01 authored over 8 years ago by Kevin Mulhern <[email protected]>

Merge pull request #171 from TheOdinProject/refactor/lessons-controller

Refactor/lessons controller

3e276c90f9bc8cba63f618af24d2e49b89948faf authored over 8 years ago by Kevin Mulhern <[email protected]>

added tests and fixed feature specs

1e68a5db577ca3b0f5ac7bc222bff02a460de4cf authored over 8 years ago by Kevin <[email protected]>

added rails helper and tests for lessons controller

5345e493cf5c8e6b993aed65244b8b80f6cffa79 authored over 8 years ago by Kevin <[email protected]>

Merge branch 'master' into refactor/lessons-controller

01dece62fcf8fea31b6b18d5238b84255ad6b7db authored over 8 years ago by Kevin <[email protected]>

Merge pull request #170 from cdouglass/poltergeist

Move JS tests from Selenium/Firefox to PhantomJS

5646099bcdbaaf307ebb940e213660d19a67c972 authored over 8 years ago by Kevin Mulhern <[email protected]>

refactored show method

afab699f13307dd27dc6d08bc35357ea23b8211b authored over 8 years ago by Kevin <[email protected]>

Merge branch 'master' into refactor/lessons-controller

3586bfe3ca0bd57fa438f8142329ae422722a2ab authored over 8 years ago by Kevin <[email protected]>

index method

9580b9739549a66ee7992e7a1b9aa37ec786cb7b authored over 8 years ago by Kevin <[email protected]>

removed discuss from readme

d87bfca14c0c5a83cf7f6855ca3b6e8eb55746cf authored over 8 years ago by Kevin Mulhern <[email protected]>

Move JS tests from Selenium/Firefox to PhantomJS

4e6dbf28ed0d741c6176ba376f06c8b0b57706c0 authored over 8 years ago by Cathy Douglass <[email protected]>

Merge pull request #168 from tmacfarlane90/patch-1

Fix minor typo

f0442c6c18b5e9849422c9ac94ef4d78ed7acd38 authored over 8 years ago by Kevin Mulhern <[email protected]>

Fix minor typo

fbd0cca5f299b2d4920e1c34900ca432a59ee531 authored over 8 years ago by Thomas MacFarlane <[email protected]>

Merge branch 'refactor' into refactor-

0b36efe02dd4b8b382b9673b792f916f931d4c18 authored over 8 years ago by toponeoftopone <[email protected]>

Merge branch 'TheOdinProject/master'

9dd93e51e933330e90d053a204123d237a56abdb authored over 8 years ago by toponeoftopone <[email protected]>

refactor users controller

changed before_filer to before_action because it is going to be
deprecated in rails 5 anyway.

98681ff51931bb086491560a8ee35323204a65df authored over 8 years ago by toponeoftopone <[email protected]>

add both versions

960df803dd6b569087a770c4cbb3939669952f6c authored over 8 years ago by toponeoftopone <[email protected]>

Merge branch 'TheOdinProject/master' into add-threading-to-rake-task

fa5a00468512612e118271bd9e6828b371e34105 authored over 8 years ago by toponeoftopone <[email protected]>

add threading to rake task

dee422c400d585c3ad7d8eb7974d5f795de6221b authored over 8 years ago by toponeoftopone <[email protected]>

Merge branch 'TheOdinProject/master'

1da129c6d11b7b863adfbb875e5389a7727bd596 authored over 8 years ago by toponeoftopone <[email protected]>

added in missing bracket

540638e9c5b8313d963f7dcdcc232ddcb0224c42 authored over 8 years ago by Kevin Mulhern <[email protected]>

Merge pull request #163 from raditotev/patch-1

Update static_pages.css.scss

0d53cff58a3158645797507d842f758164595b86 authored over 8 years ago by Kevin Mulhern <[email protected]>

Update static_pages.css.scss

Set the size of "div .headline h1" for mobiles.

c7cb206f067599cc34e280343320807742b80586 authored over 8 years ago by Radi Totev <[email protected]>

Delete dev_roadmap.md

fa3867a478bdc0ac3f0dcf1ab15f8f796b5e800d authored over 8 years ago by Kevin Mulhern <[email protected]>

Merge pull request #162 from TheOdinProject/refactor/lesson-model

refactored next and previous lesson methods

62368ba700694e03cd31ac073b0f6e02234c810d authored over 8 years ago by Kevin Mulhern <[email protected]>

refactored find lesson behaviour into service object

67909eb1965cdfe9e82608c42733dd940ae09ce8 authored over 8 years ago by Kevin <[email protected]>

refactored next and previous lesson methods

dc46fbf091f3fb3ba87e057da89de93c1098513d authored over 8 years ago by Kevin <[email protected]>

Merge pull request #161 from TheOdinProject/refactor/tests-for-lesson

Added shoulda matchers and refactored lesson tests

eec211657c4520799f734c762758c62cd4725051 authored over 8 years ago by Kevin Mulhern <[email protected]>

Added shoulda matchers and refactored lesson tests

6e471e8343a1d8169b5c514512c92a2cf3c64ff0 authored over 8 years ago by Kevin <[email protected]>

Merge pull request #158 from TheOdinProject/feature/updated-seeds-for-name-change

updated seeds for command line basics name change

9806696596de8e7f2bbf0ce1a522547e72d9a822 authored over 8 years ago by Kevin Mulhern <[email protected]>

updated seeds for command line basics name change

9e975a0bd8287aa704d1080b3cb381bd22bce027 authored over 8 years ago by Kevin <[email protected]>

Fixed indentation

3631fb4298c24b9ea0ad90df07a746098be3fd7a authored over 8 years ago by Kevin Mulhern <[email protected]>

Deleted forums helper

dda6d6786a7d5bc832085d724948c8c04d5d3529 authored over 8 years ago by Kevin Mulhern <[email protected]>

Merge pull request #157 from cdouglass/remove-extra-ico-layers

Home page: fix play icon blurriness in firefox

5cbc59f0c28d16c688deeda260f3a7cf00a01f39 authored over 8 years ago by Kevin Mulhern <[email protected]>

Home page: fix play icon blurriness in firefox

Firefox automatically chooses smallest layer of .ico file, which appears blurry at 80px. I extra...

dabc34c42cd98756b9c446ac14398c904d13126b authored over 8 years ago by Cathy Douglass <[email protected]>

Merge pull request #156 from cdouglass/master

Capitalize Slack signup link

62c502cd8309901d6b7606ec47e555039e2f9053 authored almost 9 years ago by Kevin Mulhern <[email protected]>

Capitalize Slack signup link

4f1e98e7128c17a2ebc563e85e7f8d53e004b369 authored almost 9 years ago by Cathy Douglass <[email protected]>

Merge pull request #155 from KevinMulhern/remove-disqus

removed disqus

13cd56460c4c10acc84f5646dd51794c2e84b76d authored almost 9 years ago by Kevin Mulhern <[email protected]>

removed disqus

0e69582c3097368ed9295e4eb08b225c36fb22b4 authored almost 9 years ago by Kevin <[email protected]>

Added derailed gem for profiling

375235e09e4b0a9412c9d031c630e350d87a7a71 authored almost 9 years ago by Mazin Power <[email protected]>

Added new twitter blurb

25ff1169ebae70886a726961e615f65016aa2ff4 authored almost 9 years ago by Kevin <[email protected]>

Added link to slack

9c4ddc2a12f0ff51f605916bcc19a0a46103e1df authored almost 9 years ago by Kevin Mulhern <[email protected]>

Tidied up

1fc0e73499998a8a80be43dbdcb7579387d53f70 authored almost 9 years ago by Kevin Mulhern <[email protected]>

Merge pull request #149 from KevinMulhern/feature/slack-link-in-lessons

Added slack link helper and adaptor

03e1d458bc69753d2ebdc0e7d2224fca686dddb6 authored almost 9 years ago by Kevin Mulhern <[email protected]>

Removed slack link adaptor

8ae622dca22bbb49545ef8a2ca78e90f2e8673fb authored almost 9 years ago by Kevin <[email protected]>

Merge branch 'feature/slack-link-in-lessons' of https://github.com/KevinMulhern/theodinproject into feature/slack-link-in-lessons

4550cc6744d260a0c7f1516c2797dbf95c7c35dd authored almost 9 years ago by Kevin <[email protected]>

Extracted slack link component into a partial

775be29e845d179ed2c58fb8073de6857d065cc3 authored almost 9 years ago by Kevin <[email protected]>

added slack link to lesson view

d03dae78cacf9cbd84fc9f6bdf206e1836b463fd authored almost 9 years ago by Kevin <[email protected]>

added tests

34a56fd8d34318dd3f2117723c1470a462dd3fba authored almost 9 years ago by Kevin <[email protected]>

Added slack link helper and adaptor

5b5f57099cfd0b4288e17f2c802ba8cf925a2151 authored almost 9 years ago by Kevin <[email protected]>

Added fallback to be general

7faadf99b7d80e16887d18ef1198250e037f87fc authored almost 9 years ago by Kevin <[email protected]>

Renamed Object to factory

377e6eeed3a868ff6db7835b9dca68335a804ace authored almost 9 years ago by Kevin <[email protected]>

Tidied up

9bfd0c4e77e395d11d046f87275e01adb0e50151 authored almost 9 years ago by Kevin <[email protected]>

Merg branch 'master' of https://github.com/TheOdinProject/theodinproject

142372caed9dd30be2b1873d504dfa9c00175ce4 authored almost 9 years ago by Mazin Power <[email protected]>

Merge branch 'master' of https://git.heroku.com/theodinproject

02e5f010c4bdf578efa723dc9af6715af1ba74d9 authored almost 9 years ago by Mazin Power <[email protected]>

Remove explicit precompile

1c759da9fddc2b63ff162734565408e4f66df8c8 authored almost 9 years ago by Mazin Power <[email protected]>

Merge branch 'master' of https://github.com/TheOdinProject/theodinproject

4318aaac196078764f4ecac4d48c2adce5d8c882 authored almost 9 years ago by Kevin <[email protected]>

Merge branch 'herminiotorres-improve-seeds'

41c49b52ce24347ab383a6a62040ed365043c3e9 authored almost 9 years ago by Kevin <[email protected]>

Removed some documentation

903ff2931921495e774cdb08763615064f0b5546 authored almost 9 years ago by Kevin <[email protected]>

Update Readme with Rails 4.2

396b241331a25a6adead31f029e64f8bc7fc3e0f authored almost 9 years ago by Mazin Power <[email protected]>

Merge branch 'improve-seeds' of https://github.com/herminiotorres/theodinproject into herminiotorres-improve-seeds

5b7b90f95f7d24e63a0fdb710e847f5f0dd8c031 authored almost 9 years ago by Kevin <[email protected]>

Update lesson number

55c762e09fb2bb3c045c2980b3a050de2b46c5ba authored almost 9 years ago by Kevin Mulhern <[email protected]>

Upgrade to Rails 4.2

713540c1c74ce52674552e3cfe2318f4760ca8d6 authored almost 9 years ago by Mazin Power <[email protected]>

Merge pull request #152 from herminiotorres/delete-the-old-rails-folders

Remove the folders `script` and `plugins`.

0d1186bd8a8371d14be71a3087f016da080a474f authored almost 9 years ago by Mazin Power <[email protected]>

Remove the folders `script` and `plugins`.

- These folders were a version of the old `rails`

9907e6871091bab74dee1fe72c1908cc4a244ee3 authored almost 9 years ago by Herminio Torres <[email protected]>

Improve the `seed.rb`

- Remove espace and blank line.
- Change hash format ruby 1.8 to ruby 1.9.
- Add some comments a...

92fcf0aedf255205b824c8d58482968848a5d6bb authored almost 9 years ago by Herminio Torres <[email protected]>

Updated guides locations

b44e1c330ae7c31236413166352545ee3160087d authored almost 9 years ago by Kevin Mulhern <[email protected]>

Updated ruby version

69ba27cdc2295515a6e7aab1392160003ce08d8d authored almost 9 years ago by Kevin Mulhern <[email protected]>

Update README.md

ff7ad88cc2bee176d550ea75d13c9543354b12ae authored almost 9 years ago by Kevin Mulhern <[email protected]>

Merge pull request #114 from chrisdziewa/patch-1

Fix Facebook like button display issue

7b93f0a6891991b4c6a115f69b60d1f8abf6f3d2 authored almost 9 years ago by Kevin Mulhern <[email protected]>

Move selenium into dev and test group (oops!)

c88184c14c0e25f3fa09fbcb303a62fa8d51479d authored almost 9 years ago by Mazin Power <[email protected]>

Upgrade to Ruby 2.3, Rails 4.1, Rspec 3.4

This final commit removes Transpec, which was used to automatically update tests.

a39b2ba80c71fefadea21f3fd44a6a159fc9aa1d authored almost 9 years ago by Mazin Power <[email protected]>

Serve google fonts over HTTPS

ccf19dbaa5bf10d1120bfb1545702bd69fb5f85f authored almost 9 years ago by Mazin Power <[email protected]>

Added specific error to handle

7a30fb5b18954f38d7cc34aca5805bf6e68f4c2c authored almost 9 years ago by Mazin Power <[email protected]>

Upgrade to RSPEC 3!

1a4d1bdf52469feb9219abac0d6453b3fda6aefe authored almost 9 years ago by Mazin Power <[email protected]>

Convert specs to RSpec 2.99.2 syntax with Transpec

This conversion is done by Transpec 3.2.1 with the following command:
transpec

* 95 convers...

e05964579361285be27defffbeb417b8e8d9f174 authored almost 9 years ago by Mazin Power <[email protected]>

Minor adjustment

3830ce0359eba1c7334d9f263ca3667e6f4cb479 authored almost 9 years ago by Mazin Power <[email protected]>

Ecosyste.ms: OpenCollective

github.com/TheOdinProject/theodinproject