Skip to content

Instantly share code, notes, and snippets.

View scottgonzalez's full-sized avatar

Scott González scottgonzalez

View GitHub Profile
@scottgonzalez
scottgonzalez / pr-merge.md
Last active January 3, 2016 09:49
Landing PRs

Update master

First, make sure master is up to date.

git checkout master
git pull upstream master

Rebase your branch

$( "#dialog" ).dialog({
buttons: [
{
text: "a",
"class": "primary",
click: function() {
alert( "a" );
},
},
{
(SELECT DISTINCT `reporter` AS `contributor`
FROM `ticket`
WHERE `resolution` = "fixed"
AND `milestone` = $V )
UNION
(SELECT DISTINCT `author`
FROM `ticket_change`
WHERE `ticket` IN (
SELECT `id`
FROM `ticket`
@scottgonzalez
scottgonzalez / local-dev.conf
Created December 5, 2013 14:23
Apache virtual host for local testing.
<VirtualHost *>
ServerName local-dev
ServerAlias local-dev.*
VirtualDocumentRoot /Users/scottgonzalez/Projects/%2+
<Directory />
AllowOverride All
</Directory>
</VirtualHost>
@scottgonzalez
scottgonzalez / tips-for-jquery-bug-patching.txt
Created July 16, 2013 19:06
MediaWiki source for Tips for jQuery Bug Patching
=== Environment: localhost w/ PHP, Node & Grunt ===
Starting in jQuery 1.8, a newly overhauled development workflow has been introduced. In this new system, we rely on node & gruntjs to automate the building and validation of source code—while you write code.
The Ajax tests still depend on PHP running locally*, so make sure you have the following installed:
* Some kind of localhost server program that supports PHP (any will do)
* Node.js
* NPM (comes with the latest version of Node.js)
* Grunt (install with: `npm install grunt -g`
Version Date Stable
1.0.0 2007-09 x
1.5.0 alpha 1 2008-02
1.5.0 beta 1 2008-02
1.5.0 beta 2 2008-04
1.5.0 beta 3 2008-05
1.5.0 beta 4 2008-05
1.5.0 rc 1 2008-06
1.5.0 2008-06 x
@scottgonzalez
scottgonzalez / api.json.php
Created March 21, 2013 20:38
Old api.jquery.com JSON API
<?php
/*
Template Name: JSON Api
*/
?>
<?php
$debug = false;
$apivars = array();
if (isset($_GET)):
@scottgonzalez
scottgonzalez / grunt-release-process.md
Last active December 15, 2015 06:19
Proposal for grunt release process

The following is pseudo-code for a proposed grunt release task.

The task assumes that you're using git and the default remote is where the release should be pushed to.

There are safety checks to ensure a clean release, and the custom checks can be added by the project using the release task.

None of the following is a suggestion on naming, this is purely an overview of the way I think the release task should work.

The word "task" is heavily abused in the comments. These may not be tasks as defined in Grunt.

/*!
CSSLint
Copyright (c) 2011 Nicole Sullivan and Nicholas C. Zakas. All rights reserved.
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions: