Skip to content
This repository was archived by the owner on Feb 16, 2021. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
56 commits
Select commit Hold shift + click to select a range
467ff6f
Require bower
tijsverkoyen Feb 10, 2015
aae4803
Make sure the (node-)modules are installed when the initial install i…
tijsverkoyen Feb 10, 2015
b8f8057
Merged our Framework Core Bundle into our default application
tijsverkoyen Feb 10, 2015
007385a
Added a todo-list
tijsverkoyen Feb 10, 2015
17ba93d
Initial bower-configuration
tijsverkoyen Feb 10, 2015
b5520cc
Use jquery installed with bower
tijsverkoyen Feb 10, 2015
741a906
Don't forget to upload the generated files
tijsverkoyen Feb 10, 2015
8f5bb09
Ignore vendor-folder
tijsverkoyen Feb 10, 2015
6e12ef9
Replace bootstrap, modernizr and respond.js with the ones installed w…
tijsverkoyen Feb 10, 2015
1093865
Use 2.6
tijsverkoyen Feb 10, 2015
1a32546
Install bower-dependencies
tijsverkoyen Feb 10, 2015
e991b41
Initial Grunt-configuration
tijsverkoyen Feb 10, 2015
6212bde
Add a Gemfile which specifies the versions of our Gems
tijsverkoyen Feb 10, 2015
6cfc4d3
Ignore folders which will be used by our grunt-configuration
tijsverkoyen Feb 10, 2015
60ccb30
Use bootstrap thru bower
tijsverkoyen Feb 10, 2015
a7ae93c
Moved fonts into the assets-folders
tijsverkoyen Feb 10, 2015
9513354
Grunt configuration
tijsverkoyen Feb 10, 2015
07281ea
Renamed font to look like the other files...
tijsverkoyen Feb 11, 2015
a353bef
Implemented FontGen
tijsverkoyen Feb 12, 2015
3c9e79d
Added more documentation
tijsverkoyen Feb 12, 2015
b44e652
Watch for coffee-files
tijsverkoyen Feb 12, 2015
d067c88
Implemented autoprefixer
tijsverkoyen Feb 12, 2015
cf50584
Bugfix
tijsverkoyen Feb 12, 2015
4ca9f9a
Files shouldn't be copied, as this will be done by the watcher
tijsverkoyen Feb 12, 2015
dbd7c85
Implemented imagemin
tijsverkoyen Feb 12, 2015
0300519
Speed up the proces by using concurrent processes
tijsverkoyen Feb 12, 2015
b352b9d
Correct docs
tijsverkoyen Feb 12, 2015
5adeb34
Implemented webfont to generate iconfonts
tijsverkoyen Feb 12, 2015
cec3a86
Only process ttf and otf-files
tijsverkoyen Feb 12, 2015
6a776ab
Include generateJS into our tasks
tijsverkoyen Feb 12, 2015
6b1652c
Wrote decent documentation
tijsverkoyen Feb 12, 2015
0a14965
Implemented live reload
tijsverkoyen Feb 12, 2015
e8f0a6f
typo's
tijsverkoyen Feb 12, 2015
2c9e30b
Use Assetic again
tijsverkoyen Feb 12, 2015
6e27ad8
Sync in favor of copy
tijsverkoyen Feb 13, 2015
23a297a
Make sure the cache is cleared.
tijsverkoyen Feb 13, 2015
340dfe2
Only sync the images & js
tijsverkoyen Feb 13, 2015
4849ffc
Updated the docs with assetic-usage
tijsverkoyen Feb 13, 2015
bb35541
Centralised todolist
tijsverkoyen Feb 13, 2015
292e25b
Proper options
tijsverkoyen Feb 13, 2015
dadea65
Preserve the folder structure for fonts
tijsverkoyen Feb 13, 2015
c1edf66
Extra todo items
tijsverkoyen Feb 13, 2015
e45ce92
Fixed the issue with the woff2 file
tijsverkoyen Feb 13, 2015
d2e1dc6
Fixed the issue with the jquery source map file
tijsverkoyen Feb 13, 2015
4d6f249
Used taged versions
tijsverkoyen Feb 13, 2015
2e69514
Updated docs
tijsverkoyen Feb 13, 2015
05a36ef
Better travis file
tijsverkoyen Feb 13, 2015
b207729
Split into test and functional suite
tijsverkoyen Feb 13, 2015
3606644
As the use statement is used we don't need to provide the fqn
tijsverkoyen Feb 13, 2015
5771bdb
As globs don't work I added documentation and commented the needed xml
tijsverkoyen Feb 16, 2015
96aed16
Allow failures on hhvm
tijsverkoyen Feb 16, 2015
d534fe0
Added a Sumofile
tijsverkoyen Feb 16, 2015
01b4be7
Don't use abbr(eviations).
tijsverkoyen Feb 16, 2015
13624d4
As this target is executed in both task it should be named more gener…
tijsverkoyen Feb 16, 2015
596341d
Fixed typo
tijsverkoyen Feb 16, 2015
d3fd26b
Updated the todo-list
tijsverkoyen Feb 16, 2015
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .bowerrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"directory": "web/assets/vendor/"
}
16 changes: 10 additions & 6 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,12 +1,16 @@
/web/bundles/
/web/css/
/web/js/
/web/*/locale.json
/app/bootstrap.php.cache
/app/cache/*
/app/config/parameters.yml
/app/logs/*
/build/
/vendor/
/assets/coffee
/assets/sass
/assets/fonts
/bin/
/composer.phar
/node_modules
/vendor/
/web/*/locale.json
/web/assets
/web/bundles
/web/js
/web/css
15 changes: 12 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,18 @@ language: php

php:
- 5.3.3
- 5.3
- 5.4
- 5.5
- 5.6
- hhvm

before_script: composer install -n
matrix:
allow_failures:
- php: hhvm

script: phpunit -c app
before_script:
- travis_retry composer self-update
- travis_retry composer install --no-interaction --prefer-source --dev

script:
- bin/phpunit --verbose --coverage-text -c app
4 changes: 4 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
source 'https://rubygems.org'

gem 'compass'
gem 'compass_sumo'
31 changes: 31 additions & 0 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
GEM
remote: https://rubygems.org/
specs:
chunky_png (1.3.3)
compass (1.0.3)
chunky_png (~> 1.2)
compass-core (~> 1.0.2)
compass-import-once (~> 1.0.5)
rb-fsevent (>= 0.9.3)
rb-inotify (>= 0.9)
sass (>= 3.3.13, < 3.5)
compass-core (1.0.3)
multi_json (~> 1.0)
sass (>= 3.3.0, < 3.5)
compass-import-once (1.0.5)
sass (>= 3.2, < 3.5)
compass_sumo (0.5.1)
compass
ffi (1.9.6)
multi_json (1.10.1)
rb-fsevent (0.9.4)
rb-inotify (0.9.5)
ffi (>= 0.5.0)
sass (3.4.11)

PLATFORMS
ruby

DEPENDENCIES
compass
compass_sumo
Loading