github.com/t4t5/sweetalert commits | Ecosyste.ms: OpenCollective

Fixing merge conflicts (for real this time)

bb79c88a967f0ccd7138965a835e702717f2d184 authored about 10 years ago by Andrew Walton <[email protected]>

Fixing merge conflicts.

551431de92b6371bba11d345f9caef8dc6a27702 authored about 10 years ago by Andrew Walton <[email protected]>

Merge branch '0.1.1'

750a0fd72c3beaa6d4d71336290def4d71d3ecd2 authored about 10 years ago by Tristan Edwards <[email protected]>

Minify JS

37601914302e92ff3992053906e801d2df4f5998 authored about 10 years ago by Tristan Edwards <[email protected]>

Merge branch 'line-break-with-backslash-n' of git://github.com/xming13/sweetalert into 0.1.1

3d36686decfa4e8a04cf17eb20f0197f815f69d3 authored about 10 years ago by Tristan Edwards <[email protected]>

Merge branch 'more-min-friendly' of git://github.com/connyay/sweetalert into 0.1.1

eb81fdd1c58fd9239bc20e027f5dea4150880805 authored about 10 years ago by Tristan Edwards <[email protected]>

Merge branch 'hotfix-viewport' of git://github.com/gaugejosh/sweetalert into 0.1.1

61bc646fc3a925ac0e0290950f6399b6106a824b authored about 10 years ago by Tristan Edwards <[email protected]>

Fix missing comma in example

34892af073099544572f51bd28f418923bb3eb32 authored about 10 years ago by Tristan Edwards <[email protected]>

Merge branch 'patch-1' of git://github.com/simonVansuyt/sweetalert into 0.1.1

f6389f011f44bc1f59f07e79a6a5479fa7a1ec00 authored about 10 years ago by Tristan Edwards <[email protected]>

Merge branch 'fix-warning-icon-IE' of git://github.com/theodorejb/sweetalert into 0.1.1

e308a388edef4602ed2742ce3601b208cc39ddb0 authored about 10 years ago by Tristan Edwards <[email protected]>

Merge branch 'feature/update-box-sizing' of git://github.com/holmesal/sweetalert into 0.1.1

aa77e8e9b21de29f94201b9ad3d4363cd0639d56 authored about 10 years ago by Tristan Edwards <[email protected]>

Removed the semicolons in the viewport declaration and replaced them with commas.

02417d3d11fbe2f3e41b62ca7a6cfdba60975bda authored about 10 years ago by Joshua Romero <[email protected]>

Wait until getModal returns the correct value

In response to https://github.com/t4t5/sweetalert/issues/53

the function is split to two swal a...

364d83d8a4fd3f8590de0aff492a8e2acee2df29 authored about 10 years ago by hanpp <[email protected]>

Update index.html

adding meta charset utf-8

f5cc61bd0bdf5b84889ae6e880ad1a3c53cfd15f authored about 10 years ago by simon vansuyt <[email protected]>

Allow line break in alert title and text using \n

33e5b1beb04cc886b09c30481fc85c1ff73ac2ef authored over 10 years ago by xming13 <[email protected]>

Merge branch 'nixta-add-keyboard'

71ac716fb2faa56d8c69cfebf0c7cdf30fbb5d46 authored over 10 years ago by Tristan Edwards <[email protected]>

Cleanup for release

7d75b68bd6ef4619e5e7ebf0862faed4356e94e7 authored over 10 years ago by Tristan Edwards <[email protected]>

Fix focus states for buttons

f0ec46c64fa073f189c1a97d8b02ce2799176ac6 authored over 10 years ago by Tristan Edwards <[email protected]>

Set left position for warning icon dot to center it in IE

Fixes #42

af5623b7208fb6eb16ef14a0a44b10075d034728 authored over 10 years ago by Theodore Brown <[email protected]>

also added to success icon .placeholder

90d728c0487b7f6d180d32616c21435a2899be79 authored over 10 years ago by holmesal <[email protected]>

added content box-sizing to icons

0f79daf735e737455509bd8db096e8b230cf356f authored over 10 years ago by holmesal <[email protected]>

Improve my keyboard logic according to some cool bits from the keyboard-shortcuts branch, plus handle leaving and re-entering the window better.

b1eedd8a348c8528c51785bbc2a8d911b08f6ae0 authored over 10 years ago by Nicholas Furness <[email protected]>

Merge branch 'master' into add-keyboard

Conflicts:
lib/sweet-alert.css

a823c6b6882dce40a30e95ebe52ede06ed9b2ef4 authored over 10 years ago by Nicholas Furness <[email protected]>

Merge branch 'master' into add-keyboard

Conflicts:
example/index.html
lib/sweet-alert.js

f9be7adb45ff6aa79c099865edbd126040a23e85 authored over 10 years ago by Nicholas Furness <[email protected]>

Merge branch 'mizterp-patch-1'

85e8d92e8bcfb66d1836f19d661ac92c3cf7d0db authored over 10 years ago by Tristan Edwards <[email protected]>

Compile SCSS file

c04edf43d91e574b667498c0a2a9f65cd176c16c authored over 10 years ago by Tristan Edwards <[email protected]>

Update sweet-alert.scss

Fixed Google Font URL

83f11f03bfcd4deb14578158bf93ed5839d3fe6a authored over 10 years ago by mizterp <[email protected]>

Add keyboard handlers. ENTER & SPACE will cause the current action or, if no button focused (which should not happen - onblur handlers attempt to constrain focus to the buttons), will confirm the modal. ESC will cancel the modal, if a cancel button is visible, otherwise will do nothing. TAB will cycle through the buttons.

2413e5cbcd1fe3d6e1f724716c4f972f803a2380 authored over 10 years ago by Nicholas Furness <[email protected]>

Resolved merge conflicts

fd7ca65cb4b5d85c7354baac8df4f0deebb0c06a authored over 10 years ago by Andrew Walton <[email protected]>

Merge branch 'tommytcchan-master'

a7e517c6bfb56f7965bcce39cccdf1d34d3477d8 authored over 10 years ago by Tristan Edwards <[email protected]>

Update comments

07d4019e263516178e4da577224ae6f906397088 authored over 10 years ago by Tristan Edwards <[email protected]>

added the readyState complete check for cases where the library is injected after web page loads.

016d3bcde66397eae74ec1bd0c73682fee8d8f06 authored over 10 years ago by Tommy Chan <[email protected]>

Merge branch 'AlexKvazos-confirmButtonColor'

e3b35c13499512c0cb129f2f0fb018d17a00b6a8 authored over 10 years ago by Tristan Edwards <[email protected]>

Fix chosen confirmButtonColor states

bae3ec59dc8f340cbe1cf79092fb1b1e44e80721 authored over 10 years ago by Tristan Edwards <[email protected]>

Merge branch 'confirmButtonColor' of git://github.com/AlexKvazos/sweetalert into AlexKvazos-confirmButtonColor

da171d2f6a6352573cc6065d60b8b5d06b8ff69c authored over 10 years ago by Tristan Edwards <[email protected]>

Merge branch 'jeffutter-patch-1'

b6c032abf319180d5b8dfa261aa76c6b025a0ced authored over 10 years ago by Tristan Edwards <[email protected]>

Fix bower.json

Fix missing ':' in bower homepage.

519471ff58199fd198520a7a4077b322b674bcc0 authored over 10 years ago by Jeffery Utter <[email protected]>

Merge branch 'connyay-add-bower'

6eaf24a11d08847a1bf70ba04a188c66e18ba563 authored over 10 years ago by Tristan Edwards <[email protected]>

Add bower instructions

1de67c9605ecb785896bf7eea3447503dd428a84 authored over 10 years ago by Tristan Edwards <[email protected]>

Showing sweet alert callback as a 'success' type alert.

104a5a0c924f513bc0ff74cdff83d8c37d497ebe authored over 10 years ago by Andrew Walton <[email protected]>

Added support sweet alert in confirm callback.

9b758e442363e1db8517245bf8dd0bafbfafc68c authored over 10 years ago by Andrew Walton <[email protected]>

Confirm button background color can be changed

6562142e5a883ae8b86040a44d9f9466896b0595 authored over 10 years ago by AlexKvazos <[email protected]>

make the minifier's job easier

d680ef2eb340341d6b31b620b3476718342b3525 authored over 10 years ago by Connor Hindley <[email protected]>

add bower.json

1787e842c74f96ca3507ac280e6a1e64ae1b21c7 authored over 10 years ago by Connor Hindley <[email protected]>

Merge branch 'connyay-remove-jquery'

8f973d1422f09bdee35063513decaa3cca18d79e authored over 10 years ago by Tristan Edwards <[email protected]>

Remove jQuery dependency + update example page

aaa5ed4996e6aad5df5200b48efb8b77d6061efb authored over 10 years ago by Tristan Edwards <[email protected]>

hack 'n' slash

d94ec4f01bdba9b1dd1570ed5d376657585f0f6e authored over 10 years ago by Connor Hindley <[email protected]>

Merge pull request #1 from jmversteeg/patch-1

Made safe to use with noConflict version of jQuery

ced05c20be53052e185f95cb7baf7ec00aa465f7 authored over 10 years ago by Tristan Edwards <[email protected]>

Made safe to use with noConflict version of jQuery

fcf96ef12f77b8640ec677af0b3a8ae99eb464ac authored over 10 years ago by jmversteeg <[email protected]>

Fix download link in example

42a1a2968ca10923f799194aec55bc4b6f8d543b authored over 10 years ago by Tristan Edwards <[email protected]>

Add example in README

983ff0a7935231cee709910586038451c3b5729f authored over 10 years ago by Tristan Edwards <[email protected]>

Fix README

ac03c3871a432427c813d654a225a6b1e0325f4f authored over 10 years ago by Tristan Edwards <[email protected]>

Merge branch 'master' of https://github.com/t4t5/sweetalert

5ececfcfdf0a8dd1f3823b1155efae9d2f088c89 authored over 10 years ago by Tristan Edwards <[email protected]>

Initial commit

b06a494357a5fc662e156af601bec591a7c383d8 authored over 10 years ago by Tristan Edwards <[email protected]>

Update README + comments

d42d65923a9bca7b09aa56a93535d9995eeba6fb authored over 10 years ago by Tristan Edwards <[email protected]>

Add imageUrl and imageSize parameters

717430b4360c64978f415598c6d1cad399dab84a authored over 10 years ago by Tristan Edwards <[email protected]>

Working example page

a77cac5323d31f5223f3bd975693b7d1f7d53229 authored over 10 years ago by Tristan Edwards <[email protected]>

Add icons for all alert types

febe976895f7a4f23ab4f4adb3fa20bbfddd1faa authored over 10 years ago by Tristan Edwards <[email protected]>

Add 'type', 'allowOutsideClick' and 'showCancelButton'

00790af4b154fbb0d59363ce45aef3de2216e5f2 authored over 10 years ago by Tristan Edwards <[email protected]>

Add animation for modal

03e63fc75df8118eb79ba252d57bb619f0a064e5 authored over 10 years ago by Tristan Edwards <[email protected]>

Parameter handling for main function

3f631224da09da2397d2c67db5e403f14e28558d authored over 10 years ago by Tristan Edwards <[email protected]>

Created example page with demo

5405182137ed49ddea402cb698ea867b3b2ccfca authored over 10 years ago by Tristan Edwards <[email protected]>

Basic file structure

9685e92f5160659f382a337d05f1f431a718dd79 authored over 10 years ago by Tristan Edwards <[email protected]>