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
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
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
Ben Word
7016d92f07
Move is_element_empty to nav.php
2015-01-18 04:23:30 -06:00
Ben Word
eb8030abcc
Merge pull request #1265 from roots/use-new-nav-template-tag
...
Use new core navigation template tag
2015-01-18 04:19:02 -06:00
Ben Word
d328bfec91
Use new core navigation template tag
2015-01-18 04:18:11 -06:00
Ben Word
77e9cba688
Merge pull request #1263 from austinpray/8.0.0
...
Fixes watch and wiredep
2015-01-17 14:25:20 -06:00
Austin Pray
2e62ebe8ff
Fixes watch and wiredep
...
wiredep now only touches your files if the destination file is different
from the source file
2015-01-17 08:45:56 -06:00
Ben Word
4d9fd697cb
Merge pull request #1262 from JulienMelissas/js-finalize
...
Adding JavaScript finalize back in
2015-01-16 14:26:15 -06:00
Ben Word
0698cee734
Merge pull request #1260 from austinpray/8.0.0
...
Fixes watch task
2015-01-16 14:24:52 -06:00
Julien Melissas
3fa4d86df4
Adding JavaScript finalize back in.
...
Addresses d6fc59e041 (commitcomment-6183775)
2015-01-16 14:43:27 -05:00
Austin Pray
5d58b86feb
Merge pull request #1261 from JulienMelissas/livereload-triggers
...
Adding live reload triggers to JS and CSS changes.
2015-01-16 01:48:40 -06:00
Julien Melissas
e4a03682b3
Adding live reload triggers to JS and CSS changes.
2015-01-16 02:29:58 -05:00
Austin Pray
2009419a5d
Fixes watch task
2015-01-16 00:23:44 -06:00
Austin Pray
4ed15a97d9
Merge pull request #1255 from austinpray/8.0.0
...
Use new manifest format
2015-01-15 20:59:44 -06:00
Austin Pray
6bb9fb21cb
Use new manifest format
...
Simplifies and consolidates gulp tasks
Adds a --production flag to disable source maps
Uses pleeease.io for css optimization
2015-01-15 12:06:52 -06:00
Ben Word
4d272d5bf1
Merge pull request #1253 from austinpray/readme
...
Add bower install to readme
2015-01-11 12:14:01 -06:00
Austin Pray
151248ae44
Add bower install to readme
...
ref https://github.com/roots/roots/issues/1252
2015-01-11 12:12:39 -06:00
Ben Word
d6625c20d1
Update CHANGELOG
2015-01-10 15:22:21 -06:00
Ben Word
a09fb0f132
Merge pull request #1246 from roots/remove-activation
...
Remove theme activation
2015-01-10 14:54:44 -06:00
Ben Word
7f64125701
Remove theme activation
2015-01-10 14:53:33 -06:00
Ben Word
8f6edbb995
Merge pull request #1248 from roots/add-namespace
...
Add namespace
2015-01-10 14:50:13 -06:00
Ben Word
587fbf6c35
Add namespace
2015-01-10 14:49:46 -06:00
Ben Word
9e1922b06f
Merge pull request #1247 from roots/sage
...
Rename theme from Roots to Sage
2015-01-09 21:00:13 -06:00
Ben Word
030c084134
Rename to Sage
2015-01-09 20:52:29 -06:00
Ben Word
eaf4d7b73b
Fix error after master merge because of new assets directory structure
2015-01-09 19:15:24 -06:00
Ben Word
dadb2ce632
Merge master
2015-01-09 19:09:46 -06:00
