github.com/seyhunak/twitter-bootstrap-rails commits

contributing guideline

3612e6a4feaccb9c02e422d6b45d0b89e24e8d1c authored over 10 years ago by seyhunak <[email protected]>

Merge branch 'master' of github.com:seyhunak/twitter-bootstrap-rails

c4c5f35ae5b537e04ba02c5a8c26b70da6014888 authored over 10 years ago by Todd Baur <[email protected]>

Merge pull request #790 from ishank18/master

Updated classes of form generators as per in Twitter Bootstrap 3

6ae6c669402ec3d85ced21cf8ce4c7c4b8a985c1 authored over 10 years ago by Todd Baur <[email protected]>

Fixed form group typo from erb template

2c06ad0f413b82124621ddeef825143512c7e6b4 authored over 10 years ago by Ishank Gupta <[email protected]>

Resolved conflicts

7e2fd2789ba756749f166a1f3f2751554d0c86af authored over 10 years ago by Ishank Gupta <[email protected]>

Updated classes of form generators as per in Twitter Bootstrap 3

dd2316ea2565ebb728f80df3e8f5be5a3a22a589 authored over 10 years ago by Ishank Gupta <[email protected]>

Updated classes of form generators as per in Twitter Bootstrap 3

673c4299fc9804df6714f52c89e02809a2e8ebb5 authored over 10 years ago by Ishank Gupta <[email protected]>

Merge branch 'master' of github.com:seyhunak/twitter-bootstrap-rails

265a1b5837bca252d95003d03c864dfcb720810b authored over 10 years ago by Todd Baur <[email protected]>

Merge pull request #783 from panmari/glyph-fix

Fixed Glyphicons for bootstrap 3.2

a4ebd4d0aaebcee09e07901a597f1c3eee5a5aff authored over 10 years ago by Todd Baur <[email protected]>

Merge pull request #782 from twiz718/master

fixing unit tests, upgrade to fontawesome 4.2.0

bc3dd1ae50cff8368e9fb40dd62a83557b5b89da authored over 10 years ago by Todd Baur <[email protected]>

reverting version back to 3.2.0 as per @toadkicker's request

8def63138f43b1ea5b6b21373377f6ccbefd9759 authored over 10 years ago by twiz718 <[email protected]>

Updated generator to correct value of @icon-font-svg-id

Namely glyphicons_halflingsregular

f0f3a6acddbb237e1619fb5f7f19cc10109e2d01 authored over 10 years ago by panmari <[email protected]>

Glyphicons should be imported explicitely

see documentation/generators

81c91172f0cb5b169f7126cbca79722ad62d0c2d authored over 10 years ago by panmari <[email protected]>

removed .pngs for glyphicons that are not used anymore

951e0ac153766806dbb9a8dceb681d4dd2ee8f85 authored over 10 years ago by panmari <[email protected]>

updated generators

7b5e0422c9b7360a6392ee2a7802c514c2aa8ebd authored over 10 years ago by panmari <[email protected]>

Using glyphicons font paths in a similar way to fontawesome paths

209e7e00f3ea498723016bdf5a5715c6987d6c8f authored over 10 years ago by panmari <[email protected]>

new css

00e6333450a9a02457e76b91de9b740fa21c790b authored over 10 years ago by twiz718 <[email protected]>

pushing to 3.2.1

5c76be531e7fcbcc3d82e8abaa2e49e829644f7c authored over 10 years ago by twiz718 <[email protected]>

adding files from font awesome 4.2.0

1b796b5d94780fb7d88e8cd0d2eb83bff2efe823 authored over 10 years ago by twiz718 <[email protected]>

fixing unit tests

645c334558e911ddbce2d9e28d59c387b22424cd authored over 10 years ago by twiz718 <[email protected]>

Merge pull request #781 from panmari/doku_individual

Updated documentation for using individual components

4c41627d55c276ee41b3079f27fe2f45b0ba4ae5 authored over 10 years ago by Todd Baur <[email protected]>

Updated documentation for using individual components

To reflect recent changes in naming of components.

e58c02eef5837fd6be6293a36ce10ee789025fc7 authored over 10 years ago by panmari <[email protected]>

Merge pull request #779 from panmari/merge_fix

Removed remains of some merge conflict

a25667a4233e0a0674547b700d1222dbeab1b5a6 authored over 10 years ago by Todd Baur <[email protected]>

Merge pull request #780 from panmari/generator_fix

IE6-8 fix must be included AFTER loading other CSS

0ced6545e30514ac2123a1a97eb463346d2efb38 authored over 10 years ago by Todd Baur <[email protected]>

IE6-8 must be included AFTER loading other CSS

See discussion http://stackoverflow.com/questions/18286892/twitter-
bootstrap-3-rc2-navigation-i...

d47753b7afdf94647c8acc654b8a5bf5c60915d1 authored over 10 years ago by panmari <[email protected]>

removed remains of some merge conflict

0886b53a2f6ab84f73632cfd16376d8104e6de2b authored over 10 years ago by panmari <[email protected]>

Merge pull request #773 from toadkicker/engine_tuneup

simplify engine.rb

aedb1a08b3dbb5b619b050bb1ea1b625a63b6462 authored over 10 years ago by Seyhun Akyürek <[email protected]>

simplify engine.rb

0410515d9122466d1c2381fa26ec7ab5908224f8 authored over 10 years ago by Todd Baur <[email protected]>

Updated badges/urls

739312a97972f0083cfe673e7901b45a32832f30 authored over 10 years ago by Todd Baur <[email protected]>

added test to check Number can be passed in

94d8e04ab70847715aa09949bd3bc9855f50d2cd authored over 10 years ago by Todd Baur <[email protected]>

Merge pull request #768 from RyoYamamotoJP/fix_label_example

Fix label example in README

a4da0dc85a7d5ece81006004b3adec4de7cef391 authored over 10 years ago by Todd Baur <[email protected]>

Fix label example in README

1b1cc4b8055587c8c8202ad236bde0134609411f authored over 10 years ago by Ryo Yamamoto <[email protected]>

Merge pull request #767 from RyoYamamotoJP/fix_modal_dialog

Fix modal_dialog

957e3074192555e24bbb01d56932ab8c5af95223 authored over 10 years ago by Todd Baur <[email protected]>

Fix modal_dialog

3cd6dce77b966a0bcc81a82a150506c2076d2a1a authored over 10 years ago by Ryo Yamamoto <[email protected]>

add glyph helper test

a50313904c61a02473b9ba5359dc4e32d50c23bf authored over 10 years ago by Todd Baur <[email protected]>

Merge pull request #765 from iguto/master

Fix error 'no implicit conversion of Symbol into Integer'

73182dff7ca13c369030126c07ead0ef7d902903 authored over 10 years ago by Todd Baur <[email protected]>

Fix error 'no implicit conversion of Symbol into Integer'

8e2cd78f489ba1d2827abd254a2b3ea102d2a24a authored over 10 years ago by Club09 s09t214 OOKAWA Masahiro <[email protected]>

Revert "dependency update for Rails 4 compatibility"

This reverts commit a52021037b7b4e671fb78ae0bdd37f3213e92c19.

b86063aa9fb47effdc9937788eb2b3d51c26f934 authored over 10 years ago by Todd Baur <[email protected]>

Revert "update test to expects syntax"

This reverts commit f1b3b9404d36bc5a51fb9df59187a77815b78d56.

f2d488a7ab66296d51690612bb968ad12412f7e1 authored over 10 years ago by Todd Baur <[email protected]>

update test to expects syntax

f1b3b9404d36bc5a51fb9df59187a77815b78d56 authored over 10 years ago by Todd Baur <[email protected]>

status badges updated

fda026b0b397010dbaddbb3399342052376b390f authored over 10 years ago by seyhunak <[email protected]>

dependency update for Rails 4 compatibility

a52021037b7b4e671fb78ae0bdd37f3213e92c19 authored over 10 years ago by seyhunak <[email protected]>

Merge pull request #762 from toadkicker/v_3.2

V 3.2

0387901e86503553b51a2f873a02c9d3de9175b8 authored over 10 years ago by Seyhun Akyürek <[email protected]>

update tests to expects syntax

f347c194ced667f4e1cb216625587298cb5e972d authored over 10 years ago by Todd Baur <[email protected]>

updated spec to use expect syntax

e756516426448b0697c26977d5c4aef0ea414ff3 authored over 10 years ago by Todd Baur <[email protected]>

added html matchers gem

a01a5d41ce5a69bd8f05dfbb9a2d1b99d7b3d57c authored over 10 years ago by Todd Baur <[email protected]>

merge master

445597ebdafcbafe1265f7b86b1666550b955ae4 authored over 10 years ago by Todd Baur <[email protected]>

optional option

38476dbd7f9a99179388bffb101826d844029949 authored over 10 years ago by Todd Baur <[email protected]>

default empty options

a2f18d5f5b257ff2ef86b8c7d56d843f5ce8bdf3 authored over 10 years ago by Todd Baur <[email protected]>

missed conflict

0b364a586dd67cb30d3c4e26efc8168a8752bea0 authored over 10 years ago by Todd Baur <[email protected]>

update readme to reflect new version support

46887db6f151a0490a49198cf6ac02ac21132f42 authored over 10 years ago by Todd Baur <[email protected]>

bump to 3.2

4a025e306f2cd416a27e00f2cc87682aa9e3aee3 authored over 10 years ago by Todd Baur <[email protected]>

Merge branch 'master' of github.com:seyhunak/twitter-bootstrap-rails

* 'master' of github.com:seyhunak/twitter-bootstrap-rails:
add active_class to doc
syntax fi...

c457371fe4c06bd284a97d737a4d50bbcd266a2a authored over 10 years ago by Todd Baur <[email protected]>

disabling ree builds due to out of date dependencies

a3450f589a197080e5cfc5135fc4fe8a986391a3 authored over 10 years ago by Todd Baur <[email protected]>

Merge pull request #751 from toadkicker/issue_720

added tabindex value

ca0f6fd569b7a47e9e4c99751bcab3e8763c9954 authored over 10 years ago by toadkicker <[email protected]>

Merge pull request #753 from toadkicker/issue_718

glyph tag renders <i> element by default, set tag option otherwise

752f616d7f15d5a84e05610fd0bbb5e7aa216b9b authored over 10 years ago by toadkicker <[email protected]>

Merge pull request #754 from toadkicker/issue_677

allow classes to be set in bootstrap_flash helper

31215e7c125b0b58842334a177657c5b85898e51 authored over 10 years ago by toadkicker <[email protected]>

Merge pull request #755 from toadkicker/issue_248

Issue 248

5f55cf0d9d2344fcb80ad344b25a2c58d6d2fdc4 authored over 10 years ago by toadkicker <[email protected]>

merge master

f1e83c1dc14be28ee2e324396a32a1a73aeb5e5e authored over 10 years ago by Todd Baur <[email protected]>

Merge branch 'master' of github.com:seyhunak/twitter-bootstrap-rails into issue_718

* 'master' of github.com:seyhunak/twitter-bootstrap-rails:
travis wants 1.9.3, 1.9.2 is compla...

72570fdaff3daae7abdbe792191673e41f469d0f authored over 10 years ago by Todd Baur <[email protected]>

Merge branch 'master' of github.com:seyhunak/twitter-bootstrap-rails into issue_677

* 'master' of github.com:seyhunak/twitter-bootstrap-rails:
travis wants 1.9.3, 1.9.2 is compla...

cd2cac4c7b8d84386f20dd9daf768cc5d33fefa5 authored over 10 years ago by Todd Baur <[email protected]>

Merge branch 'master' of github.com:seyhunak/twitter-bootstrap-rails into issue_248

* 'master' of github.com:seyhunak/twitter-bootstrap-rails:
travis wants 1.9.3, 1.9.2 is compla...

75b8b96f7ac417e4e57f9be5e934aca840f364fa authored over 10 years ago by Todd Baur <[email protected]>

travis wants 1.9.3, 1.9.2 is complaining it can't install rubyracer.

4dd03579232540b077a2c34bb23a801a7cc7a3e0 authored over 10 years ago by Todd Baur <[email protected]>

fix failed test

76b608720f369e61173352a8daed1da6f505bcbe authored over 10 years ago by Todd Baur <[email protected]>

Merge pull request #760 from toadkicker/guard_rspec

Guard rspec

5af0f2888bdf52deb5e0573eab7fff00296db816 authored over 10 years ago by toadkicker <[email protected]>

green tests

536af67ce393a8079c9b32ac27d687d855ae832c authored over 10 years ago by Todd Baur <[email protected]>

ran guard init

0e712941fb1c82a8af5413ed0089d5660764b066 authored over 10 years ago by Todd Baur <[email protected]>

Merge pull request #759 from toadkicker/guard_rspec

added guard, pry, and rspec configuration for each

fd11fc20410f8c70f9f9be48403de923dff15932 authored over 10 years ago by toadkicker <[email protected]>

added guard, pry, and rspec configuration for each

cca4c4c261c61dbc902dad60c55e11880f80cd9a authored over 10 years ago by Todd Baur <[email protected]>

fix command to travis

4d86a00d95021751633dcaa7dfea1c39b0ea3ff5 authored over 10 years ago by Todd Baur <[email protected]>

Merge pull request #758 from toadkicker/rake_rspec

command is spec not rspec

84663b2874f20be89c723b4573b25ae9bce4ed13 authored over 10 years ago by toadkicker <[email protected]>

merge master

a45c9f37a6380f3a5e03852d4a13be319d90f4cd authored over 10 years ago by Todd Baur <[email protected]>

command is spec not rspec

9d802c5877dede660eb0bb0e75795b8f1f0f1be0 authored over 10 years ago by Todd Baur <[email protected]>

Merge pull request #757 from toadkicker/rake_rspec

fix travis command to run test

135956953d5214841a8f6e05944111530604a39c authored over 10 years ago by toadkicker <[email protected]>

fix travis command to run test

86fa82007f599fb28cd02e7a7fda2cec9db7d6f1 authored over 10 years ago by Todd Baur <[email protected]>

Merge pull request #749 from toadkicker/travis_ruby_versions

drop travis ruby support for 1.8 and add 2.1

6d42a4b7a7192d14935892ab65e6621ef5af425c authored over 10 years ago by toadkicker <[email protected]>

Merge pull request #756 from toadkicker/rake_rspec

update rake to run rspec

09085344d9e966bd557d7b36cbc3fdd07f0c8909 authored over 10 years ago by toadkicker <[email protected]>

update rake to run rspec

a0490fe6a68e0220a39a927a06daf7b937e4c311 authored over 10 years ago by Todd Baur <[email protected]>

add active_class to doc

799c25d4093a710f46dd8f0d975880946de640ec authored over 10 years ago by Todd Baur <[email protected]>

syntax fix

4d2768b733467fa2b861258dcd12be73bb27ec59 authored over 10 years ago by Todd Baur <[email protected]>

syntax fix

1e3cffb350d491a4a29ba5ee87f660853f8de4de authored over 10 years ago by Todd Baur <[email protected]>

update doc

88aad28242dbcf6cac464f827b09038ce3feebbf authored over 10 years ago by Todd Baur <[email protected]>

allow options to be passed into the breadcrumb helper

229a79bab68d7e1e19e0403a9d32b9066ff528bd authored over 10 years ago by Todd Baur <[email protected]>

allow classes to be set in bootstrap_flash helper

ac1d91183c0e2ec12052c3530eb50d2595ef2c11 authored over 10 years ago by Todd Baur <[email protected]>

update documentation for glyph helper

c9082245fc0d84a5ce3d7b21d4aa4cb288ac0587 authored over 10 years ago by Todd Baur <[email protected]>

glyph tag renders <i> element by default, set tag option otherwise

6dfc7a61d5f247053b85d071d265b1222c25aff3 authored over 10 years ago by Todd Baur <[email protected]>

Merge pull request #752 from toadkicker/update_readme_issue_728

update readme for issue 728

907d3fa403a7ac8a774ef6da2770a4e227f23f33 authored over 10 years ago by toadkicker <[email protected]>

update readme for issue 728

c2a9cda0a2eb9f962b576eb8c843458f838a0ed2 authored over 10 years ago by Todd Baur <[email protected]>

update readme for modal body requiring a content option for injectable modal

a0d946fba21c37fe19aa3730332ef0fc623bce29 authored over 10 years ago by Todd Baur <[email protected]>

Merge pull request #737 from coppolaf/injectable-modals

Injectable modals

deda0bc93c59e27192b33e03f903f9e84b6b6e0c authored over 10 years ago by toadkicker <[email protected]>

Merge pull request #748 from Sprachprofi/master

Validation error messages on themed forms are no longer removed

3e076d5b8bcc1e2ede390fc00c2887bb49bdecb6 authored over 10 years ago by toadkicker <[email protected]>

added tabindex value

63fe32cc0559248c898af0185ea42500e54dc618 authored over 10 years ago by Todd Baur <[email protected]>

fix reference to renamed sprits.less to glyphicons.less

aae4d459f44cc8589bf4f23f4be70f37add8a7c3 authored over 10 years ago by Todd Baur <[email protected]>

add new helper to engine

3a5f4d8ed24754be39319fda87a4366d4666e18e authored over 10 years ago by Todd Baur <[email protected]>

drop travis ruby support for 1.8 and add 2.1

891bc4e5c1c23c46fb0d57efb5853a802a8dba3a authored over 10 years ago by Todd Baur <[email protected]>

using ruby 1.9 syntax

2cef1a4a86b9a323e1ce8597cb620127ae748807 authored over 10 years ago by Todd Baur <[email protected]>

need to access object and template

4ee4ee60cfc2476d342b2d15fab922bf0c4fc749 authored over 10 years ago by Todd Baur <[email protected]>

add error_span helper to templates

8840debf1e95890dac17f18bc278bc4c817a3efc authored over 10 years ago by Todd Baur <[email protected]>

Merge branch 'bootstrap3' into error_msgs

* bootstrap3: (44 commits)
remove accidentally added hash tag
Update readme and less overide...

e7edc5d26a097426610897978b38b7f57fc1d088 authored over 10 years ago by Todd Baur <[email protected]>

trying to fix ;end;_hamlout.buffer issue

c053563bd0ee13a55e89db55868e43744ae774d9 authored over 10 years ago by Todd Baur <[email protected]>

Ecosyste.ms: OpenCollective

github.com/seyhunak/twitter-bootstrap-rails