Steve Clay
|
6f94b78135
|
Remove stuff accidentally left in merge
|
2016-05-12 11:14:38 -04:00 |
|
Steve Clay
|
865946c0ed
|
Merge branch '2.x' into merge2x
Conflicts:
.gitignore
HISTORY.txt
README.md
config.php
docs/CookBook.wiki.md
docs/CustomSource.wiki.md
lib/Minify/CSS/UriRewriter.php
min/lib/DooDigestAuth.php
min/lib/FirePHP.php
min/lib/JSMinPlus.php
min/lib/Minify/Controller/Base.php
min/lib/Minify/Loader.php
min/lib/Minify/Logger.php
|
2016-05-12 11:03:16 -04:00 |
|
Steve Clay
|
afbcadf33c
|
Begin prep for 2.3 release
|
2016-03-07 16:50:01 -05:00 |
|
Elan Ruusamäe
|
8fc327bec6
|
ignore editor backups
|
2016-01-22 00:57:33 +02:00 |
|
Elan Ruusamäe
|
42875e8388
|
setup phpcs cache
|
2016-01-22 00:56:05 +02:00 |
|
Elan Ruusamäe
|
a89b1b9efc
|
composer.lock is in root
|
2015-11-23 14:49:53 +02:00 |
|
Graham Campbell
|
0ab74bb892
|
Update .gitignore
|
2015-11-22 22:31:10 +00:00 |
|
Elan Ruusamäe
|
273a08f2ee
|
do not ignore /test!
|
2015-11-20 13:52:48 +02:00 |
|
Steve Clay
|
e596b35fc4
|
Collapse "min" into project root and get unit tests working.
Fixes #472
|
2015-09-28 15:39:25 -04:00 |
|
Steve Clay
|
de8e8be37e
|
Merge commit '5b6b891cc379be1b9c014a5bb070e5e2e792d64c' into 3.0
|
2015-09-27 18:02:48 -04:00 |
|
Steve Clay
|
f1ef53e84e
|
Add wiki docs and point to some of them (lots of work left here)
|
2015-09-04 17:38:45 -04:00 |
|
Elan Ruusamäe
|
0e9e1237c6
|
make composer dependency required
NOTE: this changes required minimum PHP version to 5.3.3
|
2014-10-16 00:04:51 +03:00 |
|
Even André Fiskvik
|
f9c0319049
|
Seems like composer won't search forked code and match on identifier. Changing to Oyatel
|
2012-12-07 23:10:01 +02:00 |
|
Steve Clay
|
5f2c5a4f2d
|
added CSSmin and test
|
2012-03-14 21:41:24 -04:00 |
|
Steve Clay
|
2f11b725b8
|
improved issue 170
|
2011-09-03 20:18:57 -04:00 |
|
git-svn-migrate
|
61bf54fc89
|
Convert svn:ignore properties to .gitignore.
|
2011-06-25 01:30:14 -04:00 |
|