labofsahil/github-event-dataset-2012 huggingface dataset:
Fixed some bugs

Signed-off-by: MIUI Russia <fc.miuirussia@gmail.com>
Added layer idea into TODO
Added log4j to modules
Debut Dev
update fluxbox menu and readme
fix animation:reset in AnAL
Fix crab collision with slants
New sword swing animation
Update Plus4/Solutions/Documentation/readme.txt
Adds a nicer color theme.
add new territory
doc#remove now passes safe options

how has this gone unnoticed?
Merge branch 'mongo2.1.1' into newmaster

Conflicts:
	test/shard.test.js
Merge pull request #823 from aheckmann/tojsonoptions

[ready] added; to{Object,JSON} schema options
Core (VisVideo): Change visual_video_region_sub*() to work like constructors
Core (VisVideo): Don't translate log messages
Fix news module (static method)
Strange comments
Timezone - Fatal error
Merge branch 'master' into BasicEntryRemoval

Conflicts:
	tpl/default/lang/de.lang.php
static methods
Merge branch 'master' into BasicEntryRemoval
acp_users plugin fixes
go and boogie
Added ban import, split permission nodes, updated pom
Please... Just please...
Working on Sticky GOO
new style of index
Broken support for assigning tids
updated map
Premier depot: Ace + jquery + jquery ui + gritter
Ajout du setup pour py2exe
Made it so that you can enter the TDL's

This should make it easier to use
Initial implementation of an engine for UIWebView. Invokes JavaScript OK, but crashes when trying to return to Mono from any of the Objective-C function calls.
push 2.49b
* Added the names for the filters. These labels are too long. Let's talk copy restrictions.
* Slight edit to copy
* Make sure you lint my changes!
Commas!
Merge pull request #2 from pencoyd/patch-1

* Added the names for the filters. These labels are too long. Let's talk...
Foramtted some tests
cambio en funcion insertarCuenta, retorna boolean
Fixing bug in addrxntable that prevented bio from working.
* implemented new Boxel manager(s) and new manager system
* multiple Boxels per world are now available (set boxman-type to 2 in the config.yml)
* implemented metrics (disable by setting enable-metrics to false in the config.yml)
TogoWS Integration
Search View
Inicial Detail View
provide template context processor
reversal of words
Updated Pf4wp (1.0.12.2)
Oeps
Usecases + notulen sjabloom
Merge branch 'mathijs' of github.com:NHL-Water-Apps/Docs into mathijs
Lege notulen
Thief takes moat into account
Doors are now clearly labeled with the word "DOOR". Also removes a special case from the visibility code.
Now supporting all the player position packets
Add H2O tool from OO2C (thanks to Bernhard Treutwein) - http://forum.oberoncore.ru/viewtopic.php?f=34&t=661
Update ZXDev/Docu/ReadMeRus.txt.
Fix a typo in H2O/Test/test.h2o.
Corrected disables cs_npc to match disables in cs_gobject
Small modification to HandlePInfoCommand to get ip2nation working. Works perfectly.
example io until 8.10.2010 supported
examples
Merge branch 'master' of https://github.com/PanMinigun/examples.git
test3
removed player.class.php
Database changes

Can now insert data into the database from the Mathproblem.xaml.cs,
however struggling to display data
Updated readme with PhysX 2.8.4.6 information.
PGD Conversion

Converted current running copy of PGD's T3D 1.2 over to the MIT version.
test commit
missed files
add background-image to users#show
added skip green
added update action to albums controller but no tests
albums#show style
added artist_signature method and adapted to the view
rebuilt pending-editing machinery + factories + tests + view
better movement
cleanup... and switch to float for smoother calculation of movement...
still renders using int but it is interesting to see the smoothness
increase just doing background calcs in float
good wall repulsion
mostly cleanup
not much
Added TypeScript lexer into language.yml

Text only lexer
New binary print files, eassier to read with the Arduino
zebra: use prefix_ipv4 in IPv4-only functions

There is no gain in zebra_static_ipv4(), a pure IPv4 function, using
protocol-agnostic "struct prefix", str2prefix() and apply_mask(). This
commit makes it work with "struct prefix_ipv4", str2prefix_ipv4() and
apply_mask_ipv4() respectively. The change enables helper functions
static_add_ipv4(), static_delete_ipv4(), static_install_ipv4() and
static_uninstall_ipv4() also switch to "struct prefix_ipv4" and cast to
"struct prefix" only where it is actually needed.
babeld: use setsockopt_ipv6_tclass()

IPV6_TCLASS isn't yet available everywhere, but this doesn't keep other
routing protocols from compiling/running. Bring babeld into line.
removed JObj structure from Json sig
Added latest ep/188, ep/189, ep/190 shownotes
Added latest nsfw/57 shownotes
added latest ep (191, 192) shownotes
Merge branch 'master' of https://github.com/SimonWaldherr/shownot.es
latest bm, dw, jc, ll, nsfw and wrint changed to osf parsed version
Removed Podpott, replaced with ReLive Link, as discussed on #shownotes
Changed Flattr Link!! (directs to shownot.es flattr thing instrad of dieshownotes-on-twitter thing). Also minor corrections
Added latest LateLine (ll/07.01_10_12.html) shownotes
Added latest bm/43 shownotes
Rename
Added latest wrint/ra16 shownotes
latest bm changed to osf parsed version, style errors corrected, cache updated
Merge branch 'master' of https://github.com/SimonWaldherr/shownot.es
latest wrint (ra) changed to osf parsed version
images and jquery now on cdn.shownot.es
latest mm episode added (osf-parsed)
changed mm97 to shorted version
Minor corrections
Minor design changes in mm/97 shownotes
changes for tim
Merge pull request #8 from Quimoniz/master

added auto-indexing to directory podcasts/
Merge pull request #9 from Quimoniz/master

Added latest ra shownotes
Added functionality to open episode files with css
link and lightbox at the same time
Added latest Chaosradio (182)
Merge branch 'master' of git://github.com/Quimoniz/shownot.es

Conflicts:
	podcasts/cr/182.html
cleaned up cr182 merge artifacts
Typo in require
Changed Messageable#conversations to include data
about unread messages for the caller
Conversation#read? -> #unread?
Quick URL switch.
Changed The ChatListener to Java 1.6

Signed-off-by: Perdemot <perdemot@live.de>
-add: compressed javascript files
-fix-bug: in uninstall-routine
-fix: checks if self::get_options() returns an array before doing the
foreach
-fix-bug: initialize the db-options before using it
Fix update routine, so the data will now be correctly be converted
-version: 2.0.2
-fix-bug: installing the options in installer
implement switch for developer and minified javascript files
create developer and minified versions of javascript
Version 2.0.3
- Fixed several bugs during installation and uninstallation.
- Optimized JavaScript (minified versions)

-version: 2.0.3
use knife.rb in all instances.
Update readme to note CHEF_CONFIG environment variable and some help on
getting a chef server up quickly for testing.
Use *bold*
whoops, wrong constant - use Berkshelf::DEFAULT_CONFIG.
Merge remote-tracking branch 'riot/master' into use_knife_rb
use spec/knife.rb for configuration
using a single method for the knife.rb checks now.
Update readme to reflect new testing requirements
Fix Thorfile to remove the vcr directory and not the subdirectories
sample knife.rb
fix globbing in .gitignore for VCR
Merge remote-tracking branch 'riot/master' into use_knife_rb
Merge pull request #68 from erikh/use_knife_rb

Use knife rb
Fix as Linux complained if internalStringId was not initialized in ROMID class
Release Candidate 0.5.6 RC3
-more work on opengl, mostly spritemap
Préparation relezase
Add login page, home page and calendar page.
downloading audio and video to the board fix
Fixed #48 and #44. Bumped to 0.8.2

Now the entire side of each box is not clickable, and only the box itself
is clickable. Also, I changed margin-top to margin-bottom, and also added
a margin-bottom to the searchterm box at the top of the page. Closes #48.
Closes #44.
use derby, rearange html code
moved menu to top
JimEvans: Adding --host option to IEDriverServer.exe so that the user can specify the network adapter on which to bind the server.

git-svn-id: https://selenium.googlecode.com/svn/trunk@16775 07704840-8298-11de-bf8c-fd130f914ac9
JimEvans: Making .NET unit tests more friendly to non-Windows operating systems (using Mono).

git-svn-id: https://selenium.googlecode.com/svn/trunk@16776 07704840-8298-11de-bf8c-fd130f914ac9
JimEvans: Trivial refactor in the constructors of "service-based" drivers for .NET bindings.

git-svn-id: https://selenium.googlecode.com/svn/trunk@16777 07704840-8298-11de-bf8c-fd130f914ac9
JimEvans: Removing unneeded FxCop message suppressions in .NET bindings.

git-svn-id: https://selenium.googlecode.com/svn/trunk@16778 07704840-8298-11de-bf8c-fd130f914ac9
DanielWagnerHall: Fix getCurrentUrl in FirefoxDriver

git-svn-id: https://selenium.googlecode.com/svn/trunk@16403 07704840-8298-11de-bf8c-fd130f914ac9
DaveHunt: Restoring fix for issue 2826 that was reverted in r16190.

git-svn-id: https://selenium.googlecode.com/svn/trunk@16278 07704840-8298-11de-bf8c-fd130f914ac9
Fixed a bug with Object.map
Remove obsolete files
Http exception template
Kuria update
DB/ALL: Add fresh ip2nation database data.
From http://www.ip2nation.com/ip2nation/Download
source and receiver works, SenderReceiver test them
Split the Test driver into several libraries.

VS9 was reporting out of disk error when tring to link the test driver
executable. The compilations units are now assembled into static
libraries and then linked to for a final executable. This is expected
to easy the burdon on the linker.
Merge topic 'SIMPLEITK-316_SplitUnitTest' into next

8c208a1 Split the Test driver into several libraries.
Adding Morphological Watershed filters
updating data submode for morpholgy testing input
Merge topic 'UpdateData' into next

0d19723 updating data submode for morpholgy testing input
Merge branch 'UpdateData' into SimpleITK-299_MorphologicalWatershed
Merge topic 'SimpleITK-299_MorphologicalWatershed' into next

841ba72 Merge branch 'UpdateData' into SimpleITK-299_MorphologicalWatershed
7836d1e Adding Morphological Watershed filters
Code Optimize.
Util method for toc template
Added First work
vastly improve the overmap performance
Fix chat duping
Show minimap in chat
Move chat color help down
Allow clicking links in chat
switch to Trove map
Use MySQL as the default db
commit on renegate branch
added additionalFile
Merge branch 'renegateBranch'
el fondo degradado
urls.py fixed
changed a few things
Merge branch 'master' of https://github.com/Swazi/perl_practice
- Adding the changePosition() method, to redefine the position of a sublayer in a layer stack
- Adding the applyTranslation() method, that result to new positions after a given translation
- Updating the getLayerPositions() method that allow you to get the positions of a sublayer
- Refactoring methods that change the position of a sublayer for the new method
- Adding some informations in the composer file
commented most views
Fixed issue #06225: unable to pass qcode-named variables via URL
Dev can now pass variables via either qcode or SGQA naming on the URL
Merge branch 'master' into 192_dev
First steps to implement weak references (for purging symbol-table of unused symbols)
Added menus for each Actor
Updated Enderstorage from version 1.2.1 to version 1.2.1.3
Fixed crash on shift clicking and restoring the vanilla ender chest but making it unplaceable and hiding it in NEI. -3 also fixes file handling on some JVMs.
NEI updated from version 1.4.1.1 to version 1.4.1.2
Fixed the disappearing bug with items that fail at rendering. They now render as fire.
Updated Steve's Carts from version 2.0.0 A14 to 2.0.0 A19
Alpha 19
Fixed a bug which made the farming module plant carrots when supplied with potatoes

Alpha 18
Fixed a scrolling issue with multilined strings.
Fixed a bug which caused mouse overlays to be drawn behind items.

Alpha 17
Fixed a bug with the liquid sensors which made them be confused by glass and similar blocks.

Alpha 16
The combination of shooter(or adv), cleaner and (any) storage won't break the shooting mechanic.
Fixed a rendering glitch in the glass used by the cleaner.

Alpha 15
Drills now drill from top to bottom instead of from bottom to top.
Carts with drills won't turn back just because the drill can't drill.
Recipes with wood or planks will now accept other kinds of wood than oak,
The farmer can now handle potatoes and carrots.
Updated Technic to version 7.3.1
Fixed exe
a big step
enum json
account curd
Changed the inventory in game text from "Chest" to "DarkBox"
- Cleaned up 'speciai' conversion code
- File downloads are now triggered in 'Gathering' callback from cloud
Fixing silly clientid bug
Sctratched out method 2

A slow day. Spent most of the sessioc reading.
Code Kata 3

Kata Three: How Big, How Fast?

Rough estimation is a useful talent to possess. As you’re coding away,
you may suddenly need to work out approximately how big a data structure
will be, or how fast some loop will run. The faster you can do this, the
less the coding flow will be disturbed.

So this is a simple kata: a series of questions, each asking for a rough
answer. Try to work each out in your head. I’ll post my answers (and how
I got them) in a week or so.
How Big?

roughly how many binary digits (bit) are required for the unsigned
representation of:
1,000
1,000,000
1,000,000,000
1,000,000,000,000
8,000,000,000,000
My town has approximately 20,000 residences. How much space is required
to store the names, addresses, and a phone number for all of these (if
we store them as characters)?
I’m storing 1,000,000 integers in a binary tree. Roughly how many nodes
and levels can I expect the tree to have? Roughly how much space will it
occupy on a 32-bit architecture?

How Fast?

My copy of Meyer’s Object Oriented Software Construction has about 1,200
body pages. Assuming no flow control or protocol overhead, about how
long would it take to send it over an async 56k baud modem line?
My binary search algorithm takes about 4.5mS to search a 10,000 entry
array, and about 6mS to search 100,000 elements. How long would I expect
it to take to search 10,000,000 elements (assuming I have sufficient
memory to prevent paging).
Unix passwords are stored using a one-way hash function: the original
string is converted to the ‘encrypted’ password string, which cannot be
converted back to the original string. One way to attack the password
file is to generate all possible cleartext passwords, applying the
password hash to each in turn and checking to see if the result matches
the password you’re trying to crack. If the hashes match, then the
string you used to generate the hash is the original password (or at
least, it’s as good as the original password as far as logging in is
concerned). In our particular system, passwords can be up to 16
characters long, and there are 96 possible characters at each position.
If it takes 1mS to generate the password hash, is this a viable approach
to attacking a password?
Re-factoring

Further cleaned up the code by placing those variables used in the
search method into the method def itself, at the same time changing them
to local variables.
Made RSpec mode more granualr by using subjects to representing simple
testes in an extremely concise way (http://youtu.be/xZYOuOJ53E8)
Correction de faute de frappe.
Typos en toevoegingen
Added check for zsh installation
Third commit. Removes useless ArrayList in favor of 2 dimentional array.
Update lib/booki/account/templates/account/error_import.html
apache support
Added full alpha-numer key support to the input handler, ie a-z 0-9
Can now place the tile selected onto the map
iolhszadfiosdh
Battery monitoring and cutoff
Merge branch 'master' of github.com:USCiLab/nrt-modules

Conflicts:
	Robotics/Drivers/Hermes/Firmware/hermes/hermes.ino
	Robotics/Drivers/Hermes/Hermes.C

Using my hermes.ino and origin's Hermes.C
Reads voltage from arduino
- Fix printf format error
second time.
Update to 1.2.4
Merge pull request #41 from 68x/patch-2

Update to 1.2.4
The last attempt at fixing line endings
[Net] Implement MimeBase64 encode/decode, using reference implementation from Parrot's MIME::Base64. Make a few cleanups and use ByteBuffer instead of repeated string concats to improve performance
[Net] Several cleanups for MimeBase64. Use it, following a similar algorithm to Parrot's HTTP::Message, to generate a random boundary for multipart POST requests
ignore SIGINT in paramiko tunnel subprocesses
Clean up ipdb docstrings for namespace magics.
Add pfile command to ipdb.
Add psource command to ipdb.
Split pinfo into pinfo, pinfo2.

(Previously pinfo actually ran pinfo2...?)
Docs: replace 'definition header' with 'call signature'
Merge pull request #2559 from bfroehle/ipdb_magic_improvements

Add psource, pfile, pinfo2 commands to ipdb.
Make 'Paste Above' the default paste behavior.

Destructive paste mapped to Ctrl-M V is a surprising choice given that
there was no drag-to-select on the area being replaced (there is a
weaker notion of "selected cell" but this does not map to will-be-replaced-
by-paste in the minds of participants in an unscientific poll at
PyConCA).

Destructive paste is still available as the last paste option in the
Edit menu, qualified as "Paste Cell Replace".
"Paste Cell Replace" -> "Paste Cell & Replace"
Merge pull request #2526 from minrk/setpgrp

Don't kill paramiko tunnels when receiving ^C
Refactored warning printout as per Issue #2244
Made some changes to message and logic as advised by Fernando.
Made changes as per discussion in PR thread.
Fix displaying history when output cache is disabled.

Closes gh-2581
Include less in auto-generated API docs
Add COPYING.txt to MANIFEST.in
Merge pull request #2591 from khinsen/master

Add COPYING.txt to MANIFEST.in

Fix for Issue #2584 
Merge pull request #2582 from takluyver/i2581

Fix displaying history when output cache is disabled.

Previously, disabling the output cache disabled all history. These were separated, but the %hist magic was left with an unnecessary check, where if the output cache was disabled, it would refuse to work.

Closes gh-2581
Merge pull request #2574 from dkua/Fix#2244

Reformatted the warning message of notebook server starting.

Public IP without SSL should prompt a warning.
Public IP in read-write mode and no password, also a warning.

Fix #2244

past below by default
Moved to non-min action; used an analytics link
These tables were unrelated
Remove icons and meta
Moving css
Move js; jQuery to google gdn
Force SSL
Add bootstrap and less
Change containers to bootstrap
String interpolation; closing comments
append tmp with .niml.do so all files can be shown
Ny Design

Bättre struktur på sidan.
Responsive design.
HTML5
Kinda finished intro screen - img needs resizing
updated title code to be more dynamic
Add a uninstall button in the advanced operations area of resources
stash
stash
updated
Add initial support for browser-based uploads in iOS 6. see #20923 for trunk.



git-svn-id: http://core.svn.wordpress.org/trunk@21141 1a063a9b-81f0-0310-95a4-ce76da25c4cd
Autofocus the search box on the Theme and Plugin installation pages. Faster flow for people who know what they are looking for. props SergeyBiryukov. fixes #21080. see #21027.

git-svn-id: http://core.svn.wordpress.org/trunk@21143 1a063a9b-81f0-0310-95a4-ce76da25c4cd
Use set_post_format(), not wp_set_post_terms(), in XML-RPC mw_newPost and mw_editPost. props koke. see #20697.

git-svn-id: http://core.svn.wordpress.org/trunk@21145 1a063a9b-81f0-0310-95a4-ce76da25c4cd
Update the version numbers for wp_explain_nonce() deprecation. see #21076.



git-svn-id: http://core.svn.wordpress.org/trunk@21146 1a063a9b-81f0-0310-95a4-ce76da25c4cd
Compress scripts/styles: 3.5-alpha-21148.

git-svn-id: http://core.svn.wordpress.org/trunk@21148 1a063a9b-81f0-0310-95a4-ce76da25c4cd
added synchronization to methods/thread safety etc.
moving licences to right position..
move storefront Session::setLanguage code to only user
merge Storefront and Http Session classes

This simplies our task of moving all context stuff to runtime instead of
"compile" time.
move validation.php  file loading back to runtime
quick fix to remove context_dir from L10nController
fix 2 html compliance issues in admin default_layout.html.php
Adding a way for android to use the KeyValueStore interface
test web commit
Fixed experience again.
Fixed JavaDoc.
update the model and added the relations between user and microposts
Changed getting started to get started
error messages not displaying rght
minor refactoring of the layout, to allow multiple articles
Conditionally load jQuery to intercept all links, and prompt when clicking links whether to edit page.
Page & Changes are now tables.
Mercury form styles are now namespaced.
Use 'changes' and 'toggle:preview' events.
Separate authentication from authorization.
Fix out-of-date comment re: routes
Add files
Del files
Added meta data for mobile
* Fixed console output and logging
* Changed header
* Password is now cleartext in kickstart
* Added temporary puppet manifest to create puppet group and apply it during kickstart
Initial commit. Still need to finish vagrant setup.
removed MapBasedDirectedGraph class
added reverse_enum_of
fixed pass debug

git-svn-id: http://haxe.googlecode.com/svn/trunk@5541 f16182fa-f095-11de-8f43-4547254af6c6
guard against DCE stack overflow (fixed issue #1273)

git-svn-id: http://haxe.googlecode.com/svn/trunk@5542 f16182fa-f095-11de-8f43-4547254af6c6
Fix Python indentation after constructs like "if(condition): # comment"

So far, only the last character on a line was tested against the
colon.  However, as inline comments after e.g. "if" and "for"
statements are allowed, it is wise to search for the last code
character if the line contains a comment.
noet_s_type fix
Add missing jni folder
behave properly in the 'item' function and rename $this to source
Modified plot_profile to plot_channel_velocity() in UDV_helpers, changed handling of channels in class Shot
new icon
Merge branch 'master' of github.com:aijiay/IOLabProject
added confirm delete page
solr Document Update zen-2

Moved the doc update code to separate module
moved signal registration to main app
Raise an instance of ValueError not the class.
Added tools for data preparation.

Tools to reshape/reorder data arrays for input to the standard
interface. These tools serve equally well for preparing input to
pyspharm.

A version of the standard interface example that uses these tools
is also added.
Changed getting started example.

This example now uses the metadata interface as it is simpler to
understand and is more helpful to the target audience.
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8055 f3b2605a-c512-4ea7-a41b-209d697bcdaa


git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8056 f3b2605a-c512-4ea7-a41b-209d697bcdaa


git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8057 f3b2605a-c512-4ea7-a41b-209d697bcdaa
Added ev_unset() function

git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8059 f3b2605a-c512-4ea7-a41b-209d697bcdaa
Merge branch 'master' into lammps-icms

Resolved Conflicts:
	doc/Section_commands.html
include bugfix for fix rigid from trung.
rearrange for better alignment
move block to work around parser weakness
Merge branch 'lammps-icms' into lammps-tcl
version 0.5, add some non-blocking operations
non-administrators should not see the "Create..." link, although real security check is done on post-back of creation form
validations on tasks
added Task.assignee
use em.find(Class, id) for findById()
sources are in the same jar file
implemented TaskService
updated schema
output generated DDL + output generated SQL
updated
Fixed a small bug in the Cmake script preventing compilation of the phdf5 example
Updated _posts/2012-08-11-your-filename.md
Add/Remove endpoints and namespaces
Enable/disable modules
Better explanation in lodspk.sh
added listing namespaces
add config parameters to tmux
Addede Some Lua to the Server.
Death_knight gryphon works now
ICC Buff Works now.
remove clapack.h, include only needed headers
redundant commit kill
Use syntastic (better? Not sure) rather than pyflakes, update Go plugins.
Jem2 initial release
refactoring iteration
refactoring iteration
refactoring iteration
Tests fixed
Debug
Added twitter and facebook buttons, increased cv size.
Added ability to select only certain states for the overall ranking page.
before layout deletion
added dynamic titles
Revert "Revert "Merge pull request #6084 from brainopia/support_for_magic_domain_on_all_stores""

This reverts commit a48ea6800ef712440b08c551f8041feb35de8cb4.
Dont stream back cookie value if it was set to the same value
Test actual content of permanent cookie
Merge pull request #7286 from kennyj/fix_7191

Fix #7191. Remove unnecessary transaction when assigning has_one associations.
Conflicts:
	activerecord/test/cases/associations/has_one_associations_test.rb
Add CHANGELOG entry for #7286
[guides] Add info about CHANGELOGs to contributing guide
Update changelog to reflect support of cookie jar options for all
session stores
Merge pull request #7316 from brainopia/backport_fix_session_store_options

Backport of "Support cookie jar options for all cookie stores" for 3.2-stable
Merge pull request #6073 from daveyeu/restore-state-on-record-invalid

Restore state on create when ActiveRecord::RecordInvalid is raised
Conflicts:
	activerecord/CHANGELOG.md
Backport 5c51cd0: #send_file leans on Rack::Sendfile to X-Accel-Redirect the file's path, so opening the file to set the response body is wasteful. Set a FileBody wrapper instead that responds to to_path and streams the file if needed.
Do not use update_column where update_attribute is not interchangeable

Revert "Deprecate update_attribute."

This reverts commit b081f6b59fb3f15d12043072ad9b331ffd2bc56e.

Reason: Since the new deprecation policy we removed the deprecation of
update_attribute but we didn't reverted the changes to use
update_column.

Fixes #7306
Merge pull request #7027 from erichmenge/patch/jruby_send_file

Backport 5c51cd0 to fix an issue with jRuby encodings. Fixes #6844
Remove duplicated changelog entry [ci skip]
Use benchmark/ips to measure AR performance

This means we can more easily compare numbers, and we don't have to
specify a single N for all reports, which previously meant that some
tests were running many more/fewer iterations than necessary.
Increase benchmark time to 20 seconds.

I think that 5 seconds was a bit low for our purposes.

Also enable it to be configured via env vars.

We also need to scale the number of records up/down depending on how
long we're running the benchmark for.
Merge pull request #7352 from aripollak/microsecond-timestamp

Fix occasional microsecond conversion inaccuracy
Conflicts:
	activerecord/CHANGELOG.md
Ruby 1.8 doesn't have to_r defined to NilClass and Float.

Use round to get the right conversion
Table#remove passed an array to remove_column, which is deprecated.

See 02ca9151a043a4fefbb3f22edd05f0cd392fffaa
Merge pull request #7388 from ManageIQ/fix_table_remove_passing_array_deprecation

Table#remove passed an array to remove_column, which is deprecated.
Merge pull request #7377 from brainopia/use_inversed_parent_for_first_and_last_child

Use inversed parent for first and last child of has_many association

[Backport] Closes #3223.

Conflicts:
	activerecord/lib/active_record/associations/collection_association.rb
initial introduction and simulations sections of SBRC 2013 article
CAMAD updates and initial article of techCon 2013
fix i.e. => e.g.
Opps, don't have to add files in the oh-my-zsh folder
Order items in a curated list based on the CSV

any_in didn't guarantee the order of data returned.
removed all download types except epub which is now created by calibre
Core/Spline: Improve error output for SpineInitArgs check

by Schmoozerd
Fix build
Merge branch 'master' of git://github.com/TrinityCore/TrinityCore into teste2
ulduar merge
Merge branch 'teste2' of git://github.com/amsjunior1/FaceCore into teste2
Added getScores() and getBestScores() API methods.
Update Apq_DBA/Apq_BuildSPParams[P].sql
Updating gemspec files
Adding google spreadsheets support.
Gem google-spreadsheet-ruby has been replaced by google_drive
Using gem google_drive
Removing some unused dependencies
Bumping version
Updated README to a markdown file.
Increase feed api result length to 300
Adding improved groups API to core/api/group*. Removing old group api via groups.php.
Adding documentation of new groups api
Fix for choosing idp per default from config file.
updating readme a little
Redirecting from signup if already logged in
starting to document; improved crypto
Merge pull request #40 from andrewjpage/master

preserve underscores
Merge pull request #41 from andrewjpage/master

default preserve underscores to true
Merge branch 'master' of github.com:sanger-pathogens/gubbins
Basic DMA.
cleaning up areas not using extendSimilar, ceil, floor, or "| 0" for floor
Also moved toISOString into the es5 package
moving buildInstanceMethods into the core as buildObjectInstanceMethods,
and refactoring the tests to test for extended object methods as well
working on new release script
protected eapi controllers
parseando em SAX, mas o xml nao ta bem formado
parseando a metade
upgrading caribou dependency
Merge branch 'master' of github.com:antler/lein-caribou
Update web/exec/decapageInsert.php
fix bugs in BuildWikipediaWeightedLinkGraph bug001
choose new colour using pixel colour
Safari now builds off same options as Chrome. Added support for Safari auto-updating.
add getPlainText on TextView
support Shadow filter
fixed proxyDimensions getTransformedBoundingBox
added chapter counter
Pasalintas niutonas, pradetas daryti funkcijos kvietimas is MATLAB
Perf: switch to SingleThreadScheduledExecutor and add sleep(10) between
tasks
More js documentation...
Read in all you can from serial pipes (prevent lost commands)
Merge pull request #39 from briand/working

Console fix
Fixes multiplicity of entity reference in document in java.
Adds an entity part in composition.
Handles automatic id creation.
Adds a trait in the meta model.
Adds trait to diagram generator.
Achieves that diagram generator handles trait.
Fixes that id defined at trait does not refered by concrete class in adjust phase.
Removes snapshot.
Adds entity powertype.
Refactors entity reference handling to address warning message.
Refactors XMindEntity as OutlineEntityBase.
Adds trait in mindmapmodeling.
Adds datatypes date, time, and datetime.
Adds SpecMaker to generate a WADL specification document.
instantiate SDService and check wether its an ownService
Moved stop log message to appropriate place
Added specific stop functions
#4 aficionado filtro para notas que não foram cadastradas

Adicionando filtro para exibir um traço ao invés de exibir "None" nas
notas que ainda não foram cadastradas
OK theta can actually be zero
Should be able to set keys directory/password on template.

Added tests. Tests are good.
ajout de la page search
Add user stories
Specify which user to log in as
Bring in changes for alternate implementation
Merge branch 'master' of https://github.com/JumpstartLab/store_engine into working
change price color on product show
try to fix for heroku
fix for heroku and tests
updated prices in seed
try to fix for heroku
use month and year
remove raise
added product search by title
fix regex
make all tests pass for new billing
merge
merge stuff
[CORE] Added sections crucial for SMP support. Also update all arch ports accordingly.

Signed-off-by: Anup Patel <anup@brainfault.org>
[ARCH] Introduce arch_config.h to specify ARCH_HAS_xxxx optional features

Signed-off-by: Anup Patel <anup@brainfault.org>
[CORE] Add string-to-ipaddr conversion api in vmm_string.h

Signed-off-by: Anup Patel <anup@brainfault.org>
[LIBS] Make UIP library runtime loadable

Signed-off-by: Anup Patel <anup@brainfault.org>
[ARM] arm32ve: Minor fixes in CP15 read/write and irq assertion.

Signed-off-by: Anup Patel <anup@brainfault.org>
[LIBS] Make vfs library runtime loadable

Signed-off-by: Anup Patel <anup@brainfault.org>
channels/smartcard: refactoring of smartcard code
Allow extensions to add to the transformers list.
Add spect for config.
Merge pull request #110 from lance/awestructx

Add spec for issue #108
Merge pull request #13 from axel-b/master

Bugfixes from @axel-b.
Merge pull request #15 from axel-b/master

solution for issue #14: spurious 'Starting new HTTP connection' log messages
Added note about Screenly Pro.
now check whether database is modified via filesystem

moved the dbisnewer check to separate function,
of which we now have two implementations:
 - check database file modification time (now being used)
 - ask webserver (not used)
Merge branch 'master' into auth
set up description etc
pom.xml
[maven-release-plugin] prepare release stubby4j-1.0.7
changes reflecting email stuff, spec for mailer
Also include epicalc dependency.
null fix in ExprTools.map
ExprTools.map fix
Merge pull request #14 from Simn/master

Another small fix
slight refactor to remove unused variable
moved the entry point classes to the core package
better mouse click behaviour, added missing backspace redraw
updated for new branch
finished authentication
update readme
Finish sign in
Tell glite jobs to sleep for a far smaller amount of time before giving up.
system events - fix specs related to changes in status retrieval
connections update
added gitignore for log files
Update Studio API libraries
Remove duplicate heading
Point to github.com/susestudio/susestudio-lib-java
Fix curl examples to point to v2 of the API
Updated Troubleshoot page with info on EULA handling
Merge pull request #19 from aosthof/updated_troubleshoot

Updated Troubleshoot page with info on EULA handling
Add license note.
Add github 'fork me' ribbon
changed stylesheet to match portfolio
more stylesheet changes
better urls
Deleted unused bundles and modified various files
q
123
added two files
Support .brow config file in app directory, so that you can override the number of Unicorn workers.
Generate models for User, Issue, Article, Reference
BKCommonLib update to use new fields and class changes
Updated Preference spec
Merge pull request #20 from bernschab/master

fixed recentfilehandler
.
hsfr: new test file for printing long strings
added next_link to category shortcode
Merge branch 'master' of d:/starter/wp-content/plugins/cartalog
solved 0049 with python
QRcode update
Merge branch 'master' of https://github.com/bhm/Thrilling-Tales
Ensuring pawns can take both sides. Also moving to jQuery UI drag/drop interface for nicer interaction and less animation fudging.
changed date on two news story and on announcement banner
SQLite pragma doesn't need quotes.

Also updated a comment now we've dropped Python 2.4
Sigs from building with kvm instead of lxc
Added new Logger class to handle info, warning and error logging throughout the framework.
By default logging behaves exactly as it did before, but it can now be customized to register log callbacks (C or Lua) for logging to custom outputs.
The GP_WARN and GP_ERROR macros now call Logger::log.
Added new Logger class to handle info, warning and error logging throughout the framework.
By default logging behaves exactly as it did before, but it can now be customized to register log callbacks (C or Lua) for logging to custom outputs.
The GP_WARN and GP_ERROR macros now call Logger::log.
Merge branch 'next' of https://github.com/blackberry/GamePlay into next
Merge pull request #456 from sgrenier/next

Added new Logger class to handle info, warning and error logging throughout the framework.
[WIP] work in progress - search bar functionality
small fix for having Réunion at the right place
..
..
upgrade mongo driver 2.8.3
remove sync
..
Added padding between close button and header text.
Added loglikelihMoore; tests broken
friends added to routes and 404 CORS
Added friends, not finished. Can request friendship and return friends and requests.
Updated html, added some friends funcionality to swagbook.js, friends don't show yet, html for that needs to be added
Correction d'une erreur minime.
Mise à jour de la configuration du projet.
Use the same type of URL for installation instructions.

Currently docco points to the github web page, while
coffee-script points directly to the HTTP git URL.
supporting url params in browsers without pushState support when pushState is enabled
removing ds_store -- should be added to .gitignore...
add link to Walmart Mobile
Merge pull request #1260 from zamiang/push_state_unsupported

Fix #1252 - Backbone history with pushState enabled incorrectly handles urls with query params in browsers that do not support pushState
Merge pull request #1258 from syntacticx/master

Adding Walmart Mobile as an example
shifting the Walmart mobile down a teense.
point to CoffeeScript.org for installation instructions
Merge pull request #1257 from benatkin/patch-1

Use the same type of URL for installation instructions.
Whitespace cleanup for extend Collection.prototype.chain function definitions.
Merge pull request #1264 from gsamokovarov/patch-1

Whitespace cleanup for extend and Collection.prototype.chain
updating linkedin example app
Merge branch 'master' of github.com:documentcloud/backbone
null and undefined are invalid ids.
Update QUnit.

* Use `deepEqual` in place of `same`.
* Expect 0 tests where appropriate.
* Update view test to use #qunit-fixture.
* Remove `QUnit.config.reorder = false;`.
Merge pull request #1274 from braddunbar/null-id

null and undefined are invalid ids.
Merge pull request #1275 from braddunbar/qunit-1.5.0

Update QUnit.
Made the per-category chronological pages look pretty good too.
Focus on textbox on load.
Shrink input box as responsive layout.
Properly size input box on mobile.
Add alias to commit without whitespace differences
Updates
Fixed typos.
Added link to license.
Fixed typo.
Initial test function.
Merge branch 'development'
增加error500错误日志
Implemented category menu updating, including updates on edits to category menus.
Merge branch 'master' of github.com:brentj84062/kitchen
Made the modals disappear!
Remove diff information from README.

Somehow magically the virtually empty README.md decided to get diffed and then have that committed instead. Somehow.
added latest image to readme
i think its making ok graphs now??? idk
insert something to README
Update Linux 3.0.54
Update Linux 3.0.55
Default Config: Disable zcache and bumped to r02
Converting library page grid to new dgrid
Organise imports
added age class, and pastes which aren't in the recent paste list use their age instead of their date now, as they're supposed to
Update bin/install-mongo-extension.sh
cambion en el home
Merge branch 'master' of github.com:caarloshugo/razones
YARD documentation for base.rb
Setting cell_set to not include root by default for consistency and to prevent root from being added when cell_set is an attribute in another model.
Added play/stop button in Video's bubble
added .md extension to README file
no filepicker
SQL Genarator (in progress)
Edited Rep's start GCode for heating optimization
add gitignore to the template
Cleanup before handin.
Merge branch 'master' of github.com:cbrenton/SPEEDRACER
Removed old stuff in preperation for handin.
Update .gitignore, remove nbproject stuff.
Style changes to make variable-width.
Third version of front image, with GIMP file.
Huuuurk @ rbx
tmm1-inspired TaskThread implementation

This implementation of TaskThread uses two queues ala tmm1's Poor Man's
Fiber instead of raw Thread.stop/run logic. And the tests actually pass!
added json food data file
addiund secured action against Google API
Ajustes de configuracoes...
Função marcar item de video
После удаления модификаторы классы могли слипнуться
Suggest

Do not show suggest on hot keys input: text does not change.
Also, text is not changed and we use it as check.
Suggest

Add option "show suggest" on focusin / click event.
Merge branch 'gh-pages' of github.com:nanoblocks/nanoblocks into gh-pages

Conflicts:
	nanoblocks.js
Merge branch 'gh-pages' into suggest
Switched to option for NextState return to allow actions without transitions
Minor changes to the application layout.
Rename acceptance test.
Users can now create a new list.
Ensure validation messages are displayed.
fixed an issue with tracking numbers not going through, also added 15 digit fedex tracking numbers
deleted old main.js and renamed pop to main, fixed js call in index
Merge branch 'gh-pages'
Show Select Files button the first time the media modal is opened.

Props koopermsith
fixes #22691


git-svn-id: http://core.svn.wordpress.org/trunk@22990 1a063a9b-81f0-0310-95a4-ce76da25c4cd
Show a spinner when attachment details are saved.

Props koopersmith
see #22613


git-svn-id: http://core.svn.wordpress.org/trunk@22991 1a063a9b-81f0-0310-95a4-ce76da25c4cd
Compress scripts/styles: 3.5-RC2-22992.

git-svn-id: http://core.svn.wordpress.org/trunk@22992 1a063a9b-81f0-0310-95a4-ce76da25c4cd
When settting a featured image, move the currently selected image to the beginning of the library if it doesn't exist within the attachments loaded so far.

Props koopersmith
fixes #22494


git-svn-id: http://core.svn.wordpress.org/trunk@22993 1a063a9b-81f0-0310-95a4-ce76da25c4cd
In the QuickPress media modal, use the new post id when a post is published.

Props nacin, koopersmith
fixes #22673


git-svn-id: http://core.svn.wordpress.org/trunk@22994 1a063a9b-81f0-0310-95a4-ce76da25c4cd
Compress scripts/styles: 3.5-RC2-22995.

git-svn-id: http://core.svn.wordpress.org/trunk@22995 1a063a9b-81f0-0310-95a4-ce76da25c4cd
Pass the post date to wp_upload_dir() during sideloads, just as we do uploads. Ensures that sideloaded images make it into the right uploads directory.

props solarisssmoke, fixes #16777.



git-svn-id: http://core.svn.wordpress.org/trunk@22105 1a063a9b-81f0-0310-95a4-ce76da25c4cd
Pass the current blog id to is_main_site() in wp_upload_dir(), because is_main_site() without arguments does not respond correctly on switch. see #19235.



git-svn-id: http://core.svn.wordpress.org/trunk@22106 1a063a9b-81f0-0310-95a4-ce76da25c4cd
Add no-customize-support to the body classes when the toolbar is showing. Allows for 'Customize' to be hidden when JS is disabled. props obenland, DrewAPicture. fixes #20896.



git-svn-id: http://core.svn.wordpress.org/trunk@22107 1a063a9b-81f0-0310-95a4-ce76da25c4cd
fix upload file name too long display
README corrections
masterimage can be color, and will be converted to grayscale.
.gitignore image files
Adding widget table & config for plugins
basic widget plugin implementation
Some work toward scenario and player dialogs.
fix nrepl-middleware link /ht rodgert
added new demo texts and a new basic word loading function
added "tar-name" to docs
got padding override working. But negative padding doesn't work. Need to support 'crop'
Merge pull request #25 from cmears/master

Apply frozen transformations with <g> element.

I have a fix for the clipping issue that I will put up after this push.
Fix for clipping with freeze support.

Adding freeze support broke clipping.  The clip path needs to have the
same transformations applied as a normal path.  But as an attribute it
gets rendered through a different code path.  So we apply the inverse of
the freeze transform to get it back in line with a normal path.
Merge pull request #26 from fryguybob/clipping-fix

Fix for clipping with freeze support.
configurando o spec_helper
Fix calls to deprecated Jackson method.
user creation specs
trying jshint with travis
fix for windows rsync
Created Warp Scene Files
Press N to go to next scene for all scenes.
BUG 9185 Cuando se deshabilita o habilita un plugin... SOLVED

- No found validation to the skin uxmodern.
- were added validation for the skin.
Merge pull request #401 from marcoAntonioNina/BUG-9185

BUG 9185 Cuando se deshabilita o habilita un plugin... SOLVED
DSFix 1.5
Deal nicely with GIF files that have an illegal index-color set.
This prevents an error from popping up in that case. see http://stackoverflow.com/questions/3874533/what-could-cause-a-color-index-out-of-range-error-for-imagecolorsforindex
Merge pull request #507 from patrickheck/patch-7

Deal nicely with GIF files that have an illegal index-color set.
Arreglo 2 - Lunes 21 de Mayo

- Agregué el cuadro de Conexión TV [On] al blog
- Faltan cuadrar líneas cuadriculares de los "Posts" con el "Aside"
- Cuadrar el Slider con el Post en los márgenes derechos
Update needs form via ajax upon change.
basic support for view queries

Change-Id: Iabe23f1f54704170755fdfb68737702605289eb9
Reviewed-on: http://review.couchbase.org/21674
Reviewed-by: Chris Anderson <jchris@couchbase.com>
Tested-by: Chris Anderson <jchris@couchbase.com>
MB-6927: Fix sporadic failure in 'duplicate items on disk' test

The problem was that we were doing anasync vbucket deletion and
then creating a vbucket right after that. As a result the vbucket
deletion was sometimes deleting the new vbucket.

Change-Id: Ie800cc55776273ac09017c748d127e3d52e65e40
Reviewed-on: http://review.couchbase.org/21660
Reviewed-by: Jin Lim <jin@couchbase.com>
Tested-by: buildbot <build@couchbase.com>
Add tweeting support
do not add category stylesheet in traditional navType
Revert "work on balloon"

This reverts commit 8fdb7027bae70dfda6647211636605133e8ab130.
added etype to packages
may crash until the etype code is actually added
output structure changes
Added Opera to browserstealer signature
advanced - passing ldrs requests to php scripts & external programs
Merge pull request #1 from customink/refactor-ui

added styles to nhessler/refactor
fixed a bug with an undefined last build time
fixed an issue with projects_list just adding to the end and never removing the old views
added an interval refresh of 5 seconds
Merge pull request #11 from nhessler/master

Ignore Builds
Add @willdurand's Puppet implementation link
Fix NoMethodError exception on Logger

See: https://github.com/customink/stoplight/issues/14
Merge pull request #15 from willdurand/patch-1

Fix NoMethodError exception on Logger
add .rbenv-version, change config file extension
Prevent active tool from being replaced
added tracks to jbrowse links
Added resource file copying
Support multidimensional arrays
Conflicts and cleanup
Add delay between keypress
completo hasta reportes pdf
Removed touchpad class
Cleanup
Still more readme file stuff
Remove gems from gemfile
Added a basic non asserting test for gen server bundle
Fixed bug in the server skeleton
parent_post is a required field for a comment
New version, mostly moved into user-defined functions, to simplify use of .gb files in future revisions
add Scrolling
Improve search UI
initial creation of distributed real-time solr log playback tool...
Update config to handle common cases easily
Del: removed Math/Camera class.
[DF-429] Fixed crash with landscape selection at ruler tool mode
Fix: added files to project
Add: Entity system draft.
Merge branch 'development' of github.com:dava/dava.framework into development
Restructuralization of instruction parsing
Don't use vimux if sessions exist elsewhere

Also update vim-commentary.

Signed-off-by: Stephen Celis <stephen@stephencelis.com>
Merge remote-tracking branch 'upstream/master'
accommodate Gatherer's weird treatment of card names containing apostrophes
Murrrrrrrrrrr
Refactoring bliss
adding more stylez
[RJA-923][feature] reflection based step builder
[RJA-952][fix] issues with lazy issues
[RJA-951] [fix] - lazy variables
Merge pull request #485 from ddurnev/master

[RJA-957][RJA-958][fix]: UpdateEnvAttributes action, result description
Merge pull request #484 from bugzmanov/spring

[RJA-923][feature] reflection based step builder
[RJA-951] [fix] - lazy variables
[RJA-951] [fix] - lazy variables
Merge pull request #486 from rsvato/master

[RJA-951] [fix] - lazy variables
[RJA-955] [feature] - Integrate "rescue" email step to RJA template

Some defaults for email step
[RJA-563] [feature] - Add DSL construction to allow access to databags
Merge pull request #488 from rsvato/master

[RJA-955] [feature] - Integrate "rescue" email step to RJA template 
[RJA-962][feature]: html step/action logs by default.
abc works
test'n
Update plugins/email/lib/class.rex_xform_emailtemplate.inc.php

Siehe: http://www.redaxo.org/de/forum/addons-f30/xform-betreff-und-e-mail-name-in-zwei-e-mail-templates-t18346.html
Merge pull request #23 from tbaddade/patch-1

Update plugins/email/lib/class.rex_xform_emailtemplate.inc.php
Insignificant update to gamescreen

Simply commented out an unnecessary random generator object.
Ship syntax correction

Fixed the initialization of mRoll and mPitch which were initialized in the
header but are now initialized in the constructor.
Merge branch 'master' of github.com:dergemkr/CheeseJam1