Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Release/0.29.2 #384

Merged
merged 22 commits into from
Jun 14, 2017
Merged

Release/0.29.2 #384

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
beb9772
Merge Release 0.29.1
TiSiE May 26, 2017
f996e0f
[Jobs] fixes ServiceNotCreatedException: An exception was raised whil…
cbleek May 27, 2017
4092daf
[General] Updates composer dependencies
cbleek May 27, 2017
af8557e
[Jobs] Fix #271: Implement remote loading of active organization list…
TiSiE May 30, 2017
cd49dcd
[General] use absolute references for JS assets
cbleek May 30, 2017
d42af7a
[CI] removes symlinks to missng modules
cbleek May 31, 2017
e69c050
[Applications] re-added symlinks to the typeahead libs
cbleek May 31, 2017
8ec313c
[Applications] fixes #382.
cbleek May 31, 2017
f00f201
[CI] adds Orders as a git submodule
cbleek Jun 1, 2017
8cb1569
[CI] use https://github.com/yawik/Orders.git as repository url of the…
cbleek Jun 1, 2017
b2defd2
[Core] SearchForm: Allow setting the name via option 'name'
TiSiE Jun 1, 2017
ff709e0
[Cv] Fix SearchForm: Name was overridden by modified Core/SearchForm
TiSiE Jun 1, 2017
231002d
Implement #379: Core/SearchForm for applications list filter
TiSiE Jun 2, 2017
27be84e
Merge #379
TiSiE Jun 2, 2017
41debe4
[Geo] GeoSelect: Add support for multiple selection
TiSiE Jun 6, 2017
4a5e282
[Cv] Implement #380: LocationSelect for desired location. Allow enter…
TiSiE Jun 7, 2017
959dbb5
Merge #380: [CV] GeoSelect for desired locations
TiSiE Jun 7, 2017
96e5868
[General] Remove twitter/typeahead.js
TiSiE Jun 7, 2017
d6e286f
[Applications] Add variable '##link##' to the confirmation mail template
TiSiE Jun 7, 2017
92d548b
[Jobs] Fix #385: Save multiple locations for a job
TiSiE Jun 7, 2017
6cea9b5
[Application] adds it translations
cbleek Jun 12, 2017
0848d63
[CI] updates build.xml. updates autoload_classmaps.
cbleek Jun 13, 2017
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 .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[submodule "module/Orders"]
path = module/Orders
url = https://github.com/yawik/Orders.git
20 changes: 12 additions & 8 deletions build.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,13 +140,6 @@

<copy file="${project.basedir}/module/Jobs/config/channel.options.local.php.dist" tofile="${builddir}/config/autoload/channel.options.local.php"/>
<copy file="${project.basedir}/module/Core/config/module.core.options.local.php.dist" tofile="${builddir}/config/autoload/module.core.options.local.php"/>


<copy file="${vendordir}/twitter/typeahead.js/dist/bloodhound.min.js" tofile="${builddir}/public/js/bloodhound.min.js"/>
<copy file="${vendordir}/twitter/typeahead.js/dist/typeahead.jquery.min.js" tofile="${builddir}/public/js/typeahead.jquery.min.js"/>

<copy file="${project.basedir}/module/Geo/public/js/jquery.geolocationfield.photon.js" tofile="${builddir}/public/Geo/js/jquery.geolocationfield.photon.js"/>
<copy file="${project.basedir}/module/Geo/public/js/jquery.geolocationfield.geo.js" tofile="${builddir}/public/Geo/js/jquery.geolocationfield.geo.js"/>
<copy file="${project.basedir}/module/Geo/public/js/geoselect.js" tofile="${builddir}/public/Geo/js/geoselect.js"/>

<mkdir dir="${builddir}/log"/>
Expand Down Expand Up @@ -187,7 +180,17 @@
<echo msg="generate YAWIK-${version-short}.zip and YAWIK-${version-short}.tgz"/>
<exec dir="${builddir}/.." command="tar -czpf YAWIK-${version-short}.tgz YAWIK-${version-short}" logoutput="false"/>
<exec dir="${builddir}/.." command="zip -r YAWIK-${version-short}.zip YAWIK-${version-short}" logoutput="false"/>

<delete file="build/YAWIK-${version-short}/public/NextKraftwerke" />
<delete file="build/YAWIK-${version-short}/public/Karrierelounge" />
<delete file="build/YAWIK-${version-short}/public/Greenjobs" />
<delete file="build/YAWIK-${version-short}/public/Xenagos" />
<delete file="build/YAWIK-${version-short}/public/PxSkin" />
<delete file="build/YAWIK-${version-short}/public/YawikDemoSkin" />
<delete file="build/YAWIK-${version-short}/public/YawikXingVendorApi" />
<delete file="build/YAWIK-${version-short}/public/Karriere24" />
<delete file="build/YAWIK-${version-short}/public/YawikDemoJobboard" />
<delete file="build/YAWIK-${version-short}/public/Orders" />
<delete file="build/YAWIK-${version-short}/public/Gastro24" />
</target>

<!-- ============================================ -->
Expand Down Expand Up @@ -290,6 +293,7 @@
<include name="vendor/composer/**"/>
<include name="vendor/zendframework/**"/>
<include name="vendor/container-interop/**"/>
<include name="vendor/psr/**"/>
<include name="vendor/hybridauth/**"/>
<include name="vendor/facebook/**"/>
<include name="vendor/tracy/**"/>
Expand Down
1 change: 0 additions & 1 deletion composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@
"hybridauth/hybridauth": "^2.9",
"mpdf/mpdf": "5.7.*",
"components/jquery": "<3",
"twitter/typeahead.js": "0.10.*",
"tinymce/tinymce": "*",
"mikemix/zf2htmlpurifier": "*",
"jmikola/geojson": "*",
Expand Down
Loading