build v3.0.0-beta1b

owncloud-archive · Jan 29, 2016 · 142e5f7 · 142e5f7
1 parent 6c50da5
commit 142e5f7
Show file tree

Hide file tree

Showing 34 changed files with 1,027 additions and 482 deletions.
diff --git a/.gitignore b/.gitignore
@@ -7,7 +7,7 @@ node_modules/
 *.zip.sig
 .settings/
 archives/
-css/
+/css/
 
 composer.phar
 /vendor/

diff --git a/Gruntfile.js b/Gruntfile.js
@@ -20,7 +20,7 @@ module.exports = function(grunt) {
          build: {
             files: [ {
                expand: true,
-               src: [ 'js/*.js', 'css/*', 'appinfo/*', 'ajax/*', 'img/**', 'templates/*', 'sound/*', 'vendor/**', 'settings.php', 'LICENSE' ],
+               src: [ 'js/*.js', 'css/*', 'appinfo/*', 'ajax/*', 'img/**', 'templates/*', 'sound/*', 'vendor/**', 'lib/**', 'settings.php', 'LICENSE' ],
                dest: 'build/'
             }, {
                expand: true,
@@ -55,15 +55,15 @@ module.exports = function(grunt) {
             src: [ 'build/appinfo/info.xml', 'appinfo/info.xml' ],
             overwrite: true,
             replacements: [ {
-               from: /<version>[\d.]+<\/version>/,
+               from: /<version>[^<]+<\/version>/,
                to: "<version><%= app.version %></version>"
             } ]
          },
          version: {
             src: [ 'build/appinfo/version', 'appinfo/version' ],
             overwrite: true,
             replacements: [ {
-               from: /[\d.]+/,
+               from: /.+/,
                to: "<%= app.version %>"
             } ]
          },

diff --git a/appinfo/app.php b/appinfo/app.php
@@ -18,8 +18,6 @@
 OCP\Util::addScript('ojsxc', 'ojsxc');
 
 // ############# CSS #############
-OCP\Util::addStyle ( 'ojsxc', 'jquery.mCustomScrollbar' );
-OCP\Util::addStyle ( 'ojsxc', 'jquery.colorbox' );
 OCP\Util::addStyle ( 'ojsxc', 'jsxc.oc' );
 
 $version = OCP\Util::getVersion();

diff --git a/appinfo/info.xml b/appinfo/info.xml
@@ -3,7 +3,7 @@
 	<id>ojsxc</id>
 	<name>JavaScript XMPP Chat</name>
 	<description>XMPP Chat with OTR</description>
-	<version>3.0.0-beta1</version>
+	<version>3.0.0-beta1b</version>
 	<licence>MIT</licence>
 	<author>Klaus Herberth</author>
 	<require>5</require>

diff --git a/appinfo/version b/appinfo/version
@@ -1 +1 @@
-3.0.0-beta1
+3.0.0-beta1b
diff --git a/build/appinfo/app.php b/build/appinfo/app.php
@@ -18,8 +18,6 @@
 OCP\Util::addScript('ojsxc', 'ojsxc');
 
 // ############# CSS #############
-OCP\Util::addStyle ( 'ojsxc', 'jquery.mCustomScrollbar' );
-OCP\Util::addStyle ( 'ojsxc', 'jquery.colorbox' );
 OCP\Util::addStyle ( 'ojsxc', 'jsxc.oc' );
 
 $version = OCP\Util::getVersion();

diff --git a/build/appinfo/info.xml b/build/appinfo/info.xml
@@ -3,7 +3,7 @@
 	<id>ojsxc</id>
 	<name>JavaScript XMPP Chat</name>
 	<description>XMPP Chat with OTR</description>
-	<version>3.0.0-beta1</version>
+	<version>3.0.0-beta1b</version>
 	<licence>MIT</licence>
 	<author>Klaus Herberth</author>
 	<require>5</require>

diff --git a/build/appinfo/version b/build/appinfo/version
@@ -1 +1 @@
-3.0.0-beta1
+3.0.0-beta1b
diff --git a/build/css/jquery.colorbox.css b/build/css/jquery.colorbox.css