Skip to content

Commit 11a6a77

Browse files
committed
chore: temporary add "orders" and "demo-skin" to the modules. They have to be removed before merging in Master
1 parent fbe1143 commit 11a6a77

File tree

5 files changed

+2620
-927
lines changed

5 files changed

+2620
-927
lines changed

.travis.yml .travis.yml.disabled

File renamed without changes.

Gruntfile.js

+8
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,14 @@ module.exports = function(grunt) {
55
nodeModulesPath: __dirname + "/node_modules",
66
targetDir: './public'
77
});
8+
9+
grunt.file.recurse('./public/modules',function(absPath,rootDir,subDir,fileName){
10+
if('Gruntfile.js' === fileName){
11+
grunt.loadTasks(rootDir+'/'+subDir);
12+
}
13+
});
14+
15+
816
grunt.loadTasks('./public/modules/Core');
917
grunt.registerTask('default', ['yawik:core']);
1018
grunt.registerTask('build',['yawik:core']);

composer.json

+14-10
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,10 @@
8383
"symfony/process": "^3.4 | ^4.1",
8484
"tracy/tracy": "^2.4",
8585
"yawik/composer-plugin": "^3.0",
86-
"yawik/geo": "^1.1.0"
86+
"yawik/demo-skin": "^1.2",
87+
"yawik/geo": "^1.1.0",
88+
"yawik/orders": "^0.5.0",
89+
"yawik/solr": "^2.0"
8790
},
8891
"require-dev": {
8992
"behat/behat": "^3.2",
@@ -140,6 +143,7 @@
140143
"Cv\\": "module/Cv/src",
141144
"Install\\": "module/Install/src",
142145
"Jobs\\": "module/Jobs/src",
146+
"Orders\\": "module/Orders/src",
143147
"Organizations\\": "module/Organizations/src",
144148
"Pdf\\": "module/Pdf/src",
145149
"Settings\\": "module/Settings/src",
@@ -168,15 +172,15 @@
168172
}
169173
},
170174
"replace": {
171-
"yawik/applications": "0.33",
172-
"yawik/auth": "0.33",
173-
"yawik/core": "0.33",
174-
"yawik/cv": "0.33",
175-
"yawik/install": "0.33",
176-
"yawik/jobs": "0.33",
177-
"yawik/organizations": "0.33",
178-
"yawik/pdf": "0.33",
179-
"yawik/settings": "0.33"
175+
"yawik/applications": "0.35",
176+
"yawik/auth": "0.35",
177+
"yawik/core": "0.35",
178+
"yawik/cv": "0.35",
179+
"yawik/install": "0.35",
180+
"yawik/jobs": "0.35",
181+
"yawik/organizations": "0.35",
182+
"yawik/pdf": "0.35",
183+
"yawik/settings": "0.35"
180184
},
181185
"extra": {
182186
"branch-alias": {

0 commit comments

Comments
 (0)