Merge branch 'release/0.19'

cross-solution · Jun 10, 2015 · 2741983 · 2741983
2 parents 8f6d763 + a6eb653
commit 2741983
Show file tree

Hide file tree

Showing 424 changed files with 21,032 additions and 10,598 deletions.
diff --git a/.travis/phpenv.ini b/.travis/phpenv.ini
@@ -1,4 +1,2 @@
 
 extension="mongo.so"
-extension="openssl.so"
-extension="mbstring.so"
diff --git a/.tx/config b/.tx/config
@@ -57,3 +57,10 @@ source_lang = en_US
 type = PO
 lang_map = de: de_DE, en: en_US
 
+[yawik.companyregistration]
+file_filter = module/YawikCompanyRegistration/language/<lang>.po
+source_file = module/YawikCompanyRegistration/language/messages.pot
+source_lang = en_US
+type = PO
+lang_map = de: de_DE, en: en_US
+
diff --git a/bin/translate b/bin/translate
@@ -56,7 +56,7 @@ xgettext -L PHP --force-po $EXCLUDE_OPTION -o "language/messages.pot" --from-cod
 rm _translatable_files
 
 
-for language in de_DE fr es it ru pl tr hi_IN ar pt; do
+for language in de_DE fr es it ru pl tr hi_IN ar pt zh; do
   echo "-- build ${language}.mo file"
   msgfmt -cv -o language/${language}.mo language/${language}.po
 done;

diff --git a/build.properties.dist b/build.properties.dist
@@ -21,13 +21,14 @@ mongo.pass=
 
 username=
 password=
+email=
 
 ;
-; initial user role. After the first login. Users are asigned to this role by default.
-; possible roles: [ user | recruiter ]
+; role of the initial user.
+; possible roles: [ user | recruiter |admin ]
 ;
 
-role=recruiter
+role=admin
 
 ;
 ; external appKey. You can add jobs and users by using a simple API. This 
@@ -41,7 +42,7 @@ external.app.prefix=myapp
 ;
 ; Email (module/Core/config/core.mails.global.php.dist).
 ;
-mail.from.email=demo@yawik.org
+mail.from.email=name@example.com
 mail.from.name=YAWIK
 
 ; subject of the initial email, if somebody logs into via a social network
@@ -56,7 +57,7 @@ auth.suffix=
 ; Override recipient for every mail send. (including CC and BCC)
 ; Use comma to separate multiple addresses.
 ;
-mail.develop.override_recipient=false
+mail.develop.override_recipient=
 
 ;
 ; Facebook, Xing and Linkedin credentials. (module/Auth/config/module.auth.global.php.dist)

diff --git a/build.xml b/build.xml
@@ -108,6 +108,9 @@
     <copy file="${vendordir}/components/jquery/jquery.min.js" tofile="${builddir}/public/js/jquery.min.js"/>
     <copy file="${vendordir}/twitter/typeahead.js/dist/bloodhound.min.js" tofile="${builddir}/public/Geo/js/bloodhound.min.js"/>
     <copy file="${vendordir}/twitter/typeahead.js/dist/typeahead.jquery.min.js" tofile="${builddir}/public/Geo/js/typeahead.jquery.min.js"/>
+    <copy file="${vendordir}/cross-solution/bootstrap3-dialog/examples/assets/bootstrap-dialog/js/bootstrap-dialog.min.js"  tofile="${builddir}/public/js/bootstrap-dialog.min.js"/>
+    <copy file="${vendordir}/cross-solution/bootstrap3-dialog/examples/assets/bootstrap-dialog/css/bootstrap-dialog.min.css" tofile="${builddir}/public/css/bootstrap-dialog.min.css"/>
+
     <copy file="${vendordir}/twbs/bootstrap/dist/js/bootstrap.min.js" tofile="${builddir}/public/js/bootstrap.min.js"/>
     <copy file="${vendordir}/ivaynberg/select2/select2.min.js" tofile="${builddir}/public/js/select2.min.js"/>
     <copy file="${vendordir}/ivaynberg/select2/select2.css" tofile="${builddir}/public/css/select2.css"/>
@@ -211,6 +214,8 @@
         <exclude name="YawikDemo**"/>
         <exclude name="Jobs/**"/>
         <exclude name="JobsDeutschland/**"/>
+        <exclude name="Karriere24/**"/>
+        <exclude name="YawikCompanyRegistration/**"/>
         <exclude name="Organizations/**"/>
       </fileset>
       <mapper type="regexp" from="^(.*?)/([^/]+\.php)\.dist" to="\2"/>
@@ -284,12 +289,12 @@
   <!-- Target: symlinks                              -->
   <!-- ============================================  -->
   <target name="symlinks">
-    <symlink link="${project.basedir}/public/Core" target="${project.basedir}/module/Core/public" />
-    <symlink link="${project.basedir}/public/Applications" target="${project.basedir}/module/Applications/public" />
-    <symlink link="${project.basedir}/public/Auth" target="${project.basedir}/module/Auth/public" />
-    <symlink link="${project.basedir}/public/Jobs" target="${project.basedir}/module/Jobs/public" />
-    <symlink link="${project.basedir}/public/Geo" target="${project.basedir}/module/Geo/public" />
-    <symlink link="${project.basedir}/public/Settings" target="${project.basedir}/module/Settings/public" />
+    <symlink link="${project.basedir}/public/Core" target="${project.basedir}/module/Core/public" overwrite="true"/>
+    <symlink link="${project.basedir}/public/Applications" target="${project.basedir}/module/Applications/public" overwrite="true"/>
+    <symlink link="${project.basedir}/public/Auth" target="${project.basedir}/module/Auth/public" overwrite="true"/>
+    <symlink link="${project.basedir}/public/Jobs" target="${project.basedir}/module/Jobs/public" overwrite="true" />
+    <symlink link="${project.basedir}/public/Settings" target="${project.basedir}/module/Settings/public" overwrite="true" />
+    <symlink link="${project.basedir}/public/Organizations" target="${project.basedir}/module/Organizations/public" overwrite="true" />
   </target>
 
   <!-- ============================================  -->
@@ -306,7 +311,7 @@
     <exec command="rsync -rv ${project.basedir}/docs/ ${deploy.ssh.user}@${deploy.ssh.host}:${deploy.docs.target}" passthru="true"/>
   </target>
 
-  <target name="deploy-builds" description="publish TGZ and ZIP packages via rsync">
+  <target name="deploy-builds" depends="preinit" description="publish TGZ and ZIP packages via rsync">
     <echo msg="deploy: rsync -r ${project.basedir}/build/ ${deploy.build.user}@${deploy.build.host}:${deploy.build.target}${version-short}"/>
     <exec command="rsync -rv
     ${project.basedir}/build/YAWIK-${version-short}.* -l --exclude=YAWIK ${deploy.build.user}@${deploy.build.host}:${deploy.build.target}${version-short}" passthru="true"/>
@@ -336,6 +341,8 @@
       <include name="vendor/hybridauth/**"/>
       <include name="vendor/doctrine/**"/>
       <include name="vendor/kriswallsmith/assetic/src/**"/>
+      <include name="vendor/ezyang/htmlpurifier/library/**"/>
+      <include name="vendor/mikemix/zf2htmlpurifier/src/**"/>
       <include name="LICENCE"/>
       <include name="README"/>
       <exclude name="public/js/*"/>
@@ -346,6 +353,9 @@
       <exclude name="public/Auth"/>
       <exclude name="public/Core"/>
       <exclude name="public/Geo"/>
+      <exclude name="module/Geo/public/js/bloodhound.min.js"/>
+      <exclude name="module/Geo/public/js/typeahead.jquery.min.js"/>
+      <exclude name="public/css/bootstrap-dialog.min.css"/>
       <exclude name="public/Jobs"/>
       <exclude name="public/Organizations"/>
       <exclude name="**/*.po"/>
@@ -374,8 +384,15 @@
     </fileset>
   </target>
 
+  <target name="preinit">
+	  <property file="${project.basedir}/build.properties" />
+	  <exec outputProperty="version" command="git describe --tags" dir="${project.basedir}"/>
+          <exec outputProperty="version-short"  command="git describe --tags --abbrev=0 | sed -E -n 's/v(.*)/\1/p'"
+                          dir="${project.basedir}"/>
+  </target>
+
   <target name="init"
-          depends="load-properties, prepare"
+          depends="preinit, load-properties, prepare"
           unless="project.initialized">
     <exec outputProperty="version" command="git describe --tags" dir="${project.basedir}"/>
     <exec outputProperty="version-short"

diff --git a/composer.json b/composer.json
@@ -40,7 +40,7 @@
         "twbs/bootstrap": "*",
         "components/jquery": "*",
         "fortawesome/font-awesome": "*",
-        "twitter/typeahead.js": "*",
+        "twitter/typeahead.js": "0.10.2",
         "blueimp/jquery-file-upload": "*",
         "ivaynberg/select2": "3.5.*",
         "tinymce/tinymce": "*",