When running git pull we should also rebase to avoid possible merge conflicts.
git pull --rebase
| "scripts": { | |
| "post-install-cmd": [ | |
| "npm install", | |
| "./node_modules/gulp/bin/gulp.js", | |
| "php artisan clear-compiled", | |
| "php artisan optimize" | |
| ], | |
| "post-update-cmd": [ | |
| "npm install", | |
| "./node_modules/gulp/bin/gulp.js", |
| # Capistrano Laravel 4 Deployment Tasks | |
| # Watts Martin (layotl at gmail com) | |
| # https://gist.github.com/chipotle/5506641 | |
| # updated 14-Aug-2013 | |
| # Assumptions: | |
| # | |
| # - You are using a .gitignore similar to Laravel's default, so your | |
| # vendor directory and composer(.phar) are *not* under version control | |
| # - Composer is installed as an executable at /usr/local/bin/composer |
| (function(){ | |
| function Floater(el, opt) { | |
| this.el = el; | |
| this.$el = $(el); | |
| opt = opt||{}; | |
| this.init(); | |
| }; | |
| Floater.prototype.init = function() { |
| <?php | |
| if ( ! function_exists('dump')) | |
| { | |
| function dump() | |
| { | |
| list($callee) = debug_backtrace(); | |
| $arguments = $callee['args']; | |
| $total_arguments = count($arguments); |
| Form::macro('multiselect', function($name, $list = [], array $selected = [], $options = []) | |
| { | |
| $options['name'] = $name; | |
| $html = array(); | |
| if (is_string($selected)) $selected[$selected] = $selected; | |
| //dd($list, $selected); | |
| foreach ($list as $value => $display) | |
| { | |
| $sel = isset($selected[$value])?' selected="selected"':''; |
| if ( ! function_exists('dd')) | |
| { | |
| /** | |
| * Dump the passed variables and end the script. | |
| * Pimped out dump function from pyrocms @PhilSturgeon | |
| * | |
| * @param dynamic mixed | |
| * @return void | |
| */ | |
| function dd() |
| {{ sidebar_menu:has_sidebar page=page:id }} | |
| <div class="sidebar"> | |
| <ul> | |
| {{ sidebar_menu:show page=page:id}} | |
| </ul> | |
| </div> | |
| {{ /sidebar_menu:has_sidebar }} |
| function tagcloud() | |
| { | |
| $max_size = $this->attribute('max_size', 32); | |
| $min_size = $this->attribute('min_size', 12); | |
| $font_size_unit = $this->attribute('font_size_unit', 'px'); | |
| $separator = $this->attribute('separator', ' '); | |
| $output_array = array(); | |
| $tags = $this->db | |
| ->select('k.name, ka.keyword_id as id, COUNT(ka.keyword_id) AS weight') |