Merge pull request #1420 from RocketChat/develop

update server to support mobile clients by default

.meteor/packages

@@ -38,6 +38,7 @@ rocketchat:lib
 
 rocketchat:authorization
 rocketchat:autolinker
+rocketchat:channel-settings
 rocketchat:colors
 rocketchat:custom-oauth
 rocketchat:emojione
@@ -62,8 +63,15 @@ rocketchat:spotify
 rocketchat:statistics
 rocketchat:theme
 rocketchat:tutum
+rocketchat:ui
+rocketchat:ui-account
+rocketchat:ui-admin
+rocketchat:ui-flextab
+rocketchat:ui-login
+rocketchat:ui-master
+rocketchat:ui-message
+rocketchat:ui-sidenav
 rocketchat:webrtc
-rocketchat:channel-settings
 rocketchat:wordpress
 #rocketchat:chatops
 #rocketchat:hubot
@@ -113,11 +121,3 @@ yasaricli:slugify
 yasinuslu:blaze-meta
 # sanjo:jasmine
 # velocity:html-reporter
-rocketchat:ui
-rocketchat:ui-sidenav
-rocketchat:ui-account
-rocketchat:ui-admin
-rocketchat:ui-login
-rocketchat:ui-flextab
-rocketchat:ui-message
-rocketchat:ui-master

.meteor/platforms

 browser
+ios
 server

.meteor/versions

@@ -25,7 +25,7 @@ cfs:http-methods@0.0.30
 check@1.1.0
 chrismbeckett:toastr@2.1.2_1
 coffeescript@1.0.11
-cosmos:browserify@0.8.3
+cosmos:browserify@0.9.0
 dandv:caret-position@2.1.1
 ddp@1.2.2
 ddp-client@1.2.1

.travis.yml

@@ -2,9 +2,10 @@ sudo: required
 language: node_js
 branches:
   only:
+  - master
   - develop
 node_js:
-- '0.10'
+- '0.12'
 addons:
   apt:
     sources:
@@ -33,7 +34,6 @@ script:
 - cd .travis
 - sh ./namefiles.sh
 - cd ..
-- meteor add-platform ios
 - meteor add rocketchat:livechat rocketchat:hubot sanjo:jasmine velocity:console-reporter
 - ./node_modules/velocity-cli/bin/velocity test-packages --ci
 - ./node_modules/velocity-cli/bin/velocity test-app --ci
@@ -51,4 +51,6 @@ deploy:
   skip_cleanup: true
   local_dir: ../build
   on:
-    branch: develop
+    branch:
+    - master
+    - develop

build-ios.sh

 #!/bin/bash
 
-meteor add-platform ios
 rm -rf .meteor/local/cordova-build
 rm -rf ../Rocket.Chat-build
 meteor build ../Rocket.Chat-build --server https://demo.rocket.chat

build-old.sh

 #!/bin/bash
 source ./build-info.sh
 export METEOR_SETTINGS=$(cat settings.json)
-meteor add-platform ios
 meteor add rocketchat:livechat rocketchat:hubot
 meteor build --server https://demo.rocket.chat --directory /var/www/rocket.chat
 cd /var/www/rocket.chat/bundle/programs/server