Commit Graph

1440 Commits

Author SHA1 Message Date
Eric Wafford
226f0f9fc7 fix a few errors in notes of gulpfile 2015-01-28 14:42:44 -06:00
Austin Pray
84437f738e Merge pull request #1291 from Tidal-Wave/fix/remove-lodash
remove lodash from gulpfile and package.json
2015-01-28 14:18:28 -06:00
Eric Wafford
805e123a90 remove lodash from gulpfile and package.json 2015-01-28 14:01:02 -06:00
Austin Pray
5175071c41 Update CHANGELOG.md 2015-01-28 11:28:46 -06:00
Austin Pray
28214a8132 Merge pull request #1289 from guix77/8.0.0
browserSync
2015-01-28 11:24:41 -06:00
guix77
ff207dfab9 Merge pull request #1 from austinpray/guix77-8.0.0
Switches from livereload to browsersync
2015-01-28 18:21:03 +01:00
Austin Pray
c85d059239 Switches from livereload to browsersync
Formatting
Removes references to livereload
Removes enqueued livereload client
2015-01-28 09:22:05 -06:00
guix
cf4f58d5cc localhost proxy by default 2015-01-28 07:49:40 +01:00
guix
3735730569 browserSync 2015-01-28 07:40:49 +01:00
Ben Word
594251ae44 Update referenced file name 2015-01-27 16:40:38 -06:00
Ben Word
b8608db3ec minor 2015-01-27 14:12:09 -06:00
Austin Pray
a3d3a427c5 Merge pull request #1283 from austinpray/gulp-rev
Fixes revved files base
2015-01-25 17:27:25 -06:00
Austin Pray
c6fd38afc1 Fixes revved files base 2015-01-25 17:20:57 -06:00
Austin Pray
005ea820b3 Merge pull request #1280 from roots/austinpray-patch-1
Clean up json config files
2015-01-24 14:09:33 -06:00
Austin Pray
dfe0cd8a2c Merge pull request #1270 from austinpray/fix-gulp-rev
[WIP] [8.0.0] Reworks asset revving
2015-01-24 14:05:11 -06:00
Austin Pray
a3040c496a Update package.json 2015-01-24 14:05:02 -06:00
Austin Pray
e45dc36736 Update .gitignore 2015-01-24 14:04:48 -06:00
Austin Pray
55367f4106 Updates rev documentation 2015-01-24 13:57:44 -06:00
Austin Pray
d5d2d02459 Fixes livereload
If the environment is development -> try loading the livereload client
being served by `gulp watch`
2015-01-24 13:17:25 -06:00
Austin Pray
c95261e8a8 Merge branch '8.0.0' of github.com:roots/roots into fix-gulp-rev
Conflicts:
	gulpfile.js
	package.json
2015-01-24 11:41:59 -06:00
Austin Pray
dc1baa4bef No version in bower.json
It doesn't do anything and we should only have to keep track of it in one place.
2015-01-24 10:43:09 -06:00
Austin Pray
d822bed5e1 Block publishing to npm 2015-01-24 10:40:47 -06:00
Austin Pray
04528c2603 Merge branch 'add-jscs' into merge-add-jscs
Conflicts:
	.travis.yml
2015-01-24 10:36:04 -06:00
Austin Pray
ae62873779 Adds JSCS for gulpfile and scripts
install JSCS globally npm install jscs -g
use `npm run jscs`
2015-01-24 10:26:30 -06:00
Ben Word
8e1eb461f5 Merge pull request #1279 from roots/phpcs
[8.0.0] Coding standards, run PHP_CodeSniffer on Travis
2015-01-24 10:20:36 -06:00
Ben Word
0b98a1e41a [skip ci] Update CHANGELOG 2015-01-24 01:11:38 -06:00
Ben Word
f4d64d23c9 Update PHP files to pass coding standards 2015-01-24 00:48:50 -06:00
Ben Word
33fe490cb0 Add PHPCS to Travis 2015-01-24 00:37:48 -06:00
Ben Word
78fd50212d Add Roots coding standards based on PSR-2 2015-01-24 00:24:52 -06:00
Austin Pray
09e494683b Merge pull request #1276 from roots/remove-jshint
remove trailing option
2015-01-23 11:30:13 -06:00
Austin Pray
2b39b64909 remove trailing option
fixes https://github.com/roots/roots/issues/1275

ref https://github.com/jshint/jshint/pull/1554
2015-01-23 11:27:58 -06:00
Austin Pray
c60b9052bf Enhance asset revving
conditional asset revving based on --production
make assets.php respect new asset revving flow
2015-01-23 03:13:01 -06:00
Scott Walkinshaw
507de3a045 Merge pull request #1272 from roots/google-analytics-improvement
Improve Google Analytics conditional loading
2015-01-21 23:31:27 -05:00
Scott Walkinshaw
4911ebcaaa Merge pull request #1274 from roots/austinpray-patch-1
Safe console.log
2015-01-21 11:43:17 -05:00
Austin Pray
1f098c242b Safe console.log 2015-01-21 10:41:46 -06:00
Scott Walkinshaw
4467d41325 Improve Google Analytics conditional loading
The current logic for condtionally including the GA snippet is confusing
and bit inconsistent. In development you would see logging when the
snippet wasn't included but this wouldn't happen if you were a logged in
admin.

Now there's only two cases:

1. Production non admin user: GA snippet is loaded.
2. Anything else (development or admin user): log output
2015-01-20 23:35:01 -05:00
Ben Word
015814c99f Merge pull request #1271 from roots/use-theme-styles-for-editor-styles
Use the theme styles for the editor stylesheet
2015-01-19 22:51:00 -06:00
Ben Word
cf2bd6b70f Use the theme styles for the editor stylesheet 2015-01-19 22:47:35 -06:00
Ben Word
1d7205891b Fix editor style path 2015-01-19 16:19:57 -06:00
Austin Pray
37f8a2646f docs -> docco 2015-01-19 15:25:27 -06:00
Austin Pray
c6a0f6eab9 Reworks asset revving
fixes https://github.com/roots/roots/issues/1266
2015-01-19 15:19:26 -06:00
Scott Walkinshaw
327ee7ac3a Merge pull request #1269 from emaildano/patch-1
Formatting edits for `travis.yml`
2015-01-19 11:12:19 -05:00
Daniel Olson
caba05a0b1 Formatting edits for travis.yml
Edits according to the travis-ci.com docs: http://docs.travis-ci.com/user/languages/php/#Choosing-PHP-versions-to-test-against
2015-01-19 11:10:55 -05:00
Ben Word
67f3811a6d app.js -> main.js 2015-01-18 17:30:49 -06:00
Ben Word
95cbd1713d Use minified jQuery
See 3a4ae77b1e (commitcomment-9235183)
2015-01-18 17:08:38 -06:00
Ben Word
ae04179822 Merge pull request #1268 from roots/short-array-syntax
[8.0.0] Use short array syntax
2015-01-18 16:51:06 -06:00
Austin Pray
d66f30a905 Fix node requirements 2015-01-18 16:49:21 -06:00
Ben Word
a903e08b86 Use short array syntax 2015-01-18 16:45:18 -06:00
Ben Word
747882c85e Merge pull request #1267 from roots/short-echo-syntax
[8.0.0] Use short echo syntax, bump required PHP version to 5.4
2015-01-18 16:33:23 -06:00
Ben Word
203c4c39e0 Use short echo syntax, bump required PHP version to 5.4 2015-01-18 16:29:23 -06:00