labofsahil/github-event-dataset-2012 huggingface dataset:
[Fixes #2241] Fix broken taxon field in admin
Don't allow a shipment to transition from pending to ready if the determined state is not 'ready'

Fixes #2040
[api] check if a shipment can't transition to ready state and deal with accordingly

Fixes #2229
[api] Return status 422 if shipment cannot transition to ready

Related to #2229
Remove debug from taxon_autocomplete added in 854cf86
Order#merge no longer uses Order#add_variant

This is because a LineItem may have extra information attached to it, which would be lost with the add_variant call

Instead, what we do is one of two things:

1) If the line item with that variant already exists then we increment the quantity for that line item and save it. Everyone goes home happy.
2) If a line item with that variant doesn't exist, then we re-assign the old line item's order_id field to the current order object.

Number #2 comes with a caveat: we *must* reload the old order's line items because otherwise the re-assigned line_items would be destroyed when order.destroy is called.

Fixes #2179
Remove leftover reference to testing_support/env

Fixes #2242
Set payment to processing state when capturing, and allow failure form pending state.

Fixes #2224
Retreive products for search based on currency.

This allows users to override selected_currency in order to get
sets of products retrieved in their selected currency.
Explicitly retrieve price in current_currency.

This will display prices at each step in the currency currently
specified for the user.
Currency support for active.

This allows you to search for products and variants that are active
in a specified currency.  For example,

Spree::Product.active()
returns all active products in the default currency

Spree::Product.active('EUR')
returns all active products in Euro.

This is required if some products are active in some currencies,
but not in others, because a price in that currency has not been
specified.
Remove auto-price logic from Spree::Price.

This logic was copied from a variant but doesn't really make a lot
of sense in this context.  This prevents prices from being nil, so
you can't add have a variant which is not offered in a specific
variant.
Ensure the shipment has been dealt with before transition over payment step

Fixes #2191
Clean up calls to update_totals within Order model

Semi-related to #2191
Add missing end for updater method added in by 86cbc64
fixing recursion

Fixes #2250
Add option to hide cents in price display

Fixes #2251

Fixes #2243
[api] Pre-ship all shipments and inventory units to fix ReturnAuthorizations specs
[api] Fix failing capture payment test
Don't call select2 for product_taxons_id element if the element isn't on the page

Fixes #2245
Fixed bug handling multiple speakers

A simple test script reveals that, if there are two speakers on the network, and this happens:

sp1 = soco.SoCo('10.0.0.1)
sp2 = soco.SoCo('10.0.0.2')
info1 = sp1.get_speaker_info()
info2 = sp2.get_speaker_info()
print "First speaker:",info1
print "Second Speaker:",info2

The information comes out with just the 2nd one. It seems a static definition of the speaker_info variable is to blame.
Merge pull request #2 from nixscripter/master

Bug Fix: properly retrieve information from multiple players.
Add Changelog entry for #7560: deprecate #filter in AS::Callbacks [ci skip]
Add Changelog entry for #4976: fix eager load associations without pks [ci skip]
Remove 3.2.x entries from Active Record changelog [ci skip]

Since 810a50dacf9ddddc1d59c1cb350e8ce785c8bf85, the new policy is to
keep old changelogs in their own branches, to avoid manual syncing
across different branches.

Please check that commit for more reasoning about the new policy.
Fix Active Support changelog formatting [ci skip]
Skip test_remove_column_with_array_as_an_argument_is_deprecated with Oracle adapter.
Because Oracle adapter supports only remove_column :table_name, :column_name syntax
and it has never supported remove_column :table_name, [:column_name].
Merge pull request #6593 from yahonda/skip_test_remove_column_with_array_as_an_argument_is_deprecated

Skip test_remove_column_with_array_as_an_argument_is_deprecated with Oracle
Add explicit opt-out for fragment cache digesting

This add support for sending an explicit opt-out of the "Russian-doll"
cache digest feature on a case-by-case basis. This is useful when cache-
expiration needs to be performed manually and it would be otherwise
difficult to know the exact name of a digested cache key.

More information: https://github.com/rails/cache_digests/pull/16
Merge pull request #8317 from latortuga/cache-digest-opt-out

Add explicit opt-out for fragment cache digesting
Added X-Content-Type-Options to the header defaults.

With a value of "nosniff", this prevents Internet Explorer from MIME-sniffing a response away from the declared content-type.
Merge pull request #7390 from aantix/add_x_content_type_options_to_default_headers

Added X-Content-Type-Options to the header defaults.
Install binstubs by default
add gem "newrelic_rpm"
update app_name for newrelic
rails generate refinery:engine activity action originator_id:integer originator_type target_id:integer target_type --skip-frontend
rails generate refinery:activities
rails generate refinery:engine visitor ip agent  --extension activities --namespace activities --skip-frontend
rails generate refinery:activities
change routes "/refinery/activities" to "/refinery/activities/activities"
not allow to add activity
now allow to add visitor
enable to log visitor activities
make sure refinerycms_visitors.extend_process_action running before refinerycms_visitors.set_current_visitor
add gem 'thin' to kill "WARN  Could not determine content-length of response body. Set content-length of the response or set Response#chunked = true"
change default time zone
change activities title in dashboard
Merge branch 'feature/add_activity_tracker' into develop
show activity description
fix Activity#description
add gem "bullet"
make activities index page load faster
Merge remote-tracking branch 'origin/develop' into kkt
added content dir and test html file
added initial content created by Reshma
Merge pull request #19 from rcbops/kong_cleanup

Fix for people using our chef recipes for kong
Merge pull request #20 from rcbops/kong_cleanup

Print copy/pastable curl command on test failures.
Merge branch 'master' of github.com:rcbops/kong
Keystone test fix for diablo final
Fix versions.json to avoid running essex test against dfinal
Add diablo-final test for create user
More diablo final fixes
More diablo fixes.
Hopefully last diablo-final fix
missing a / in last diablo test
Added schema draft
Removed the mysociety dir.
don't use spork when ENV['CI'] is 'true'
add Hash core_extensions

generate a new hash from a dotted path
return the value of a nested hash from a dotted path
Merge pull request #1 from reset/hash-corext

add Hash core_extensions
prepare for 1.1.13 RC release.
prepare for next release.
CJuiSliderInput: fix typo in generated javascript event
Merge pull request #1799 from tpruvot/master

bug/typo in jui slider widget
[ci skip]
docs/guide/ja and docs/blog/ja updated
Merge pull request #1802 from softark/docs-ja

docs/guide/ja and docs/blog/ja updated
[ci skip]
docs/guide/ja/database.arr.txt fixed wrong translation
Merge pull request #1807 from softark/docs-ja

docs/guide/ja/database.arr.txt fixed wrong translation
included Herbert's and MLN's comments, some typos fixed
Switch encoding plugin
Fix bug with file output building

* Things called 'index.$ext' were getting converted to 'index.html' on
  publishing -- this fixes that.
Remove test output files that shouldn't have been added

and update .gitignore so they don't get _re_-added.
Don't convert *.html without YAML front matter
Tweak index redirects in server
v0.3

        Tweak index redirects in server
        Don't convert *.html without YAML front matter
        Remove test output files that shouldn't have been added
        Fix bug with file output building
        Switch encoding plugin
Tweak index redirects again
Switch to File::Copy::Recursive::fcopy()...

...so permission bits will be preserved during publishing
Set up delegations for template processing
modified:   rerimer/moc_rerimerwidget.cpp
	modified:   rerimer/rerimer
	modified:   rerimer/rerimer.pro.user
	modified:   rerimer/rerimerwidget.cpp
	modified:   rerimer/rerimerwidget.o
	modified:   rerimer/ui_rerimerwidget.h
	new file:   rimgid/images/San_Agostino.jpg
	new file:   rimgid/images/San_Luidzhi_dei_Franchezi.jpg
	new file:   rimgid/images/Santa_Mariya_deli_Popolo.jpg
Migrate from drupal_set_message to watchdog for specific filesystem copy errors
Fix oops. Grain background should repeat.
Add info about email on command line
[bug 804529] Include locale in kbforum URLs.
Se modifico fondo
mais cenas de camioes
Строительство и ремонт -> электрика и отопление
asdasd
Included chromedriver
asd
Using chromedriver gem
3 attempts to show results page
Correct decrease
Bus year fix
Check for ad to have no more than 130 symbols in description
Notebooks
asdasd
Trailers fix
Trucks
notebook fixes
Животные и растения -> Аксессуары -> Корма и добавки - правильное имя поля
Bump extension version number to 0.7.6.
Added license file. Fixed reference from New BSD to Simplified BSD.
Moved html to index.html, moving proposal to proposal.html. Cleaned up visibility toggle etc.
deleting old sequenceDisplayObject.html
Implemented better exception handling for JSONExceptions generated by Google and FB. Still needs cleaning up.
Restructured HTTP communication package to have a parent class, and
added the ability to post occurrences. Also, began laying out an
interface for the container package.
Removed docstrings to is_scalar_sparse_matrix in identitsearch
because of it's dependency to numpy/scipy.  Imported skip.
Doctests and tests pass w/o numpy/scipy.
Update tests/TraceReplayer7Batch.sh
update for synching
Only allow callables on Handle.close
Fixed decrementing refount on Loop.active_handles
Raised libuv revision
array access in actions column
fix the call to the function 'solve_qp_as_cvxopt' to be the same as cvxopt
As reported by @pimlott in #215: remove literal ~.
Use rawflags for checking FINAL flag.

Partially reverts 18efdedfb97de7ca9f6
Merge pull request #1154 from hubertp/2.10.x-issue/5676-fix

Use rawflags for checking FINAL flag.
Fix for exponential compile time in specialization.

Review by @prokopec.
Merge pull request #801 from paulp/issue/exponential-spec

Fix for exponential compile time in specialization.
remove trash info
deleted most of the imported text
Gene ontology annotations are loaded by Ray.
Updated comments in code to reflect recent changes in response codes for
service  list.quorum.to.


git-svn-id: https://svn.nmap.org/nmap@28271 e0a8ed71-7df4-0310-8962-fdc924857419
o [NSE] Added the script duplicates which attempts to determine duplicate
  hosts by analyzing information collected by other scripts. [Patrik Karlsson]


git-svn-id: https://svn.nmap.org/nmap@28272 e0a8ed71-7df4-0310-8962-fdc924857419
Revert "Include <net/if.h> before <net/if_arp.h>" in netutil.cc.

This seems be broken on AIX 5.3.

git-svn-id: https://svn.nmap.org/nmap@28273 e0a8ed71-7df4-0310-8962-fdc924857419
adding jasmine
added bash commands spec
Merge branch 'master' of github.com:sens3/kraut
[reject-handler] log unknown handlers
Merge pull request #314 from portertech/reject-handler

[reject-handler] log unknown handlers
[readme] move all documentation to the wiki
Merge pull request #270 from portertech/readme

[readme] move all documentation to the wiki
add reports
Merge branch 'release/v0.19'
allows send_template_mail to define sender details

git-svn-id: http://svn.osqa.net/svnroot/osqa/trunk@1275 0cfe37f9-358a-4d5e-be75-b63607b5c754
Added Oracle Architecture mind maps
Site updated at 2012-10-13 06:55:37 UTC
Unfinished further attempts to implement the new remote structure
Rename apps/opengrok... to devel/opengrok.rst
Rename apps/net-snmp file to apps/net-snmp.rst
Rename squid file to squid.rst
Add cvs.rst, svn.rst and websvn.rst files

Compilation didn't work at the 1d7c47f and e65390e commits.
Rename sqlite file to apps/sqlite.rst
Rename qemu file to qemu.rst
Rename screen file to screen.rst
some api fixes
fix fav rendering
fix funny characters
block edit toggle
add readme.md to core
Add more stylesheets from devilcoders/spree
allow case insensitive coupon codes

fixes #2009
Translate jstree labels + JS escape taxonomy names

Fixes #2015
- Added setup_env.sh file that can be sourced in bash to setup all the env variables
- Updated setup_env.sh to include config variables. Also updated README.
improved alignment demonstrator
Lexer fixes, and more functionality.

* Keyword / Identifier lexer fix
* Long strong lexer fixes
* Custom unescaping code to match lua tests.
* Moved to Lua 5.2 tests
* Started working on compat with literals.lua
add kill_running_test_files command to do `kill -9`
don't introduce an additional method for kill
Test for 3.x.
Updated installation instructions: moved dependencies list to overview page.
Added script to help with OS X installation
Update master
Update master
Update master
Added GOESLightCurve
Fixed an issue with EVE plotting
Merge branch 'master' of github.com:sunpy/sunpy
Updated MANIFEST to include default sunpyrc
Updated sunpyrc support to use ConfigParser instead of configobj
Merge branch 'master' of github.com:khughitt/sunpy
Merge pull request #162 from khughitt/master

Initial GOESLightCurve support
V1.0.0-SNAPSHOT-fixed1

增加了部分bean和service增删改查
orgUnit fixed
Logout/Restart fehlt noch
フレンド一覧で、フレンドのイメージをクリックしたときのポップアップを追加
（閉じるボタンは未実装）
いろいろ追加　＆　整理整頓
Merge branch 'master' of https://github.com/syupein/oct.git
Need to reconvene with noel about FMB's createBooking() and BookingView's selectOwner
Getting ready for a merge with Noel's work
simple command line parser.
chat funcionando con estilos
Bring back .c files.
change name of 'default' theme to 'defaults', remove  misplaced comma in an object

1. change name of 'default' theme to 'defaults'
js/noty/jquery.noty.js
js/noty/themes/default.js
demo/*.html

2. remove  misplaced comma in an object
js/noty/themes/default.js

these two things makes error in IE 8.
adding Net-SSLeay-1.36
adding libevent-1.4.14
change vimrc and ctags
Added comments for commented out code.
吹き出しの実装
Changement sur Order, suppression de l'enum State et passage a du polymorphisme, 1 classe enfant de Order par état
added modules, corrected soap gen bug
scanner: added special recognition for blue pixels
mosaic: display a saturated/scaled version of the thumbnail
add CodeMirror as the text editor
Added bin/ to the .gitignore
first commit
added a sample index page
first version
Merge http://github.com/ttulkin/404
update list parent
On comment not created redirects back
Add tests showing more usages of createFromTemplate
Use WebGL now that server sends CORS headers (see #75)
Add pake.py

See https://github.com/twpayne/pake
Add build.py

This removes the dependencies on make, sh and curl for building ol3.
Update readme.md for build.py
Use build.py for Travis
Merge bin/generate-requireall into build.py
Update CONTRIBUTING.md for build.py
Bump to latest version of pake
Update Plovr version
Update to latest version of pake
Bump to latest version of pake
Fold gh-update-pages into build.py

This also fixes a bug in gh-update-pages: gh-update-pages does not
handle file deletition, meaning that stale files are never removed.
FIX: updated TokenAgent to work with latest version of clients
Save .project if there is one
* Make basic bloodspider and hovernet resistances similar to light alien armour.
* Adjustments to make the SMG a bit more powerful.
* map [+solarplant] Latino210 added the missing dropship tiles for Herakles and Raptor

* some adjustments and fixes
Removed unnecessary files used for communication during dropbox collaboration. Should never have been there :p
Fixed controller dependencies
improved wsgi.input reports
refactored daemonize2
added emperor:// to the supported schemes, improved vassals config handling
added option for expanded style
added API documentation
Citations: Harvard and Vancouver formats added
Tickets: various issues and stylistic features requests
[test] Users test now working
fix recursive call __setattr__ in Settings
Modified Maya Scenes
Allow mixing of vt and ref type params.
Replace enum map with memebers on the Pad enum
Oefening 10.8 bijgevoegd.
Oefening 10.3
Voorbeeld Exceptions
Adding target for iPad. Successfully renders model. Performance seems to be about the same as OS X model.
Changed world's start method to be synchronous. Interceptor must call [world step]; to move it to the next iteration. This alleviates the synchronization issues. This is still not a perfect solution at all. The best way would be to use GCD all through the World class. But this will take time to implement properly.
Added entityconfig parsing logic and unit test.
Changed .meta to __meta. Removed some old debug output.
Made NodeEdit an executable
Fixed a bug in ParamEditor
Made ServiceEdit an executable
Added an exit button to main UI
fix event/listbox example screenshots

--HG--
branch : feature-sphinx
更新开发分支的项目版本到3.1.2
Merge branch 'dev-3.1.2' into dev-3.0.10

创建下一次合并的起始点
alert notice beauty
SCI: Possibly fix kMergePoly input vertex order

Thanks to Walter for creating debugging tools for MergePoly and testing.
update to redme about Anna not having GitHub.
Move the class loading method to the RegistryUtils

git-svn-id: https://svn.wso2.org/repos/wso2/carbon/kernel/trunk@128189 a5903396-d722-0410-b921-86c7d4935375
.cleanup was missing from nolive mode
failover example added
Log4JAppender updated such that also failover works
notes about authentication key added
realms config added
note about username and password added
keystorepassword parameter added
obsolete import removed
obsolete import removed
obsolete keystore removed
log4jappender version updated
log statements improved
Initial work on show-realms resource for welcome realm
more ambigous libs added
security lib updated including bcrypt implementation
Merge branch 'master' into log4jappender-678
failover example added
Log4JAppender updated such that also failover works
Show exceptions in realms overview
Merge branch 'master' into log4jappender-678
Log4JAppender lib updated getting message keys from realms configuration
sample auth key added
updated to latest version
Chrome touch fixes
Art/Publish Code Update
satisfied jsHint
Custom HTML reporter for jasmine
Added configurability to SAT
Used config in SAT
Sanitized the tests. Need to rename the project, now it has been
rescoped (much smaller)
Renamed all references of "sat" to "flow" for project renaming
Renames references from "sat" to "flow"
make Reflex{Request,Response} subclasses of dict for ease of implementation
make Reflex{Request,Response} a little more realistic
more detail work done on WSGI reflex
fix example's reference to rendering hub
make Reflex{Request,Response} subclasses of dict for ease of implementation
make Reflex{Request,Response} a little more realistic
more detail work done on WSGI reflex
make weiyu framework do encoding
Merge branch 'reflex' of github.com:xen0n/weiyu into reflex
forgot a name just below the hub decl
make Reflex{Request,Response} subclasses of dict for ease of implementation
make Reflex{Request,Response} a little more realistic
more detail work done on WSGI reflex
make weiyu framework do encoding
Merge branch 'reflex' of github.com:xen0n/weiyu into reflex
fix modified attr name
HTTP headers before delivery should be dict

Note: We'll see if order is important in some cases; if that's the case
the whole thing will be made a list.
add example directory README
initial session package
Beaker integration -- skeleton
initial session package
Beaker integration -- skeleton
initial session package
Beaker integration -- skeleton
Merge branch 'session' of github.com:xen0n/weiyu into session
initial BeakerSession impl
make http headers a list instead of dict; auto encoding of unicode header data
add cookie translating for WSGI reflex
hook insertion functions
initial session package
Beaker integration -- skeleton
initial BeakerSession impl
make http headers a list instead of dict; auto encoding of unicode header data
add cookie translating for WSGI reflex
hook insertion functions
Merge branch 'session' of github.com:xen0n/weiyu into session
reduce postprocessing hooks' incoming params to response only
name conflict
well... silly typo
force hook registry init before the rest of hook module load
just another PHP5.2 issue solved
make/clean script
incr!
introducing ConfigurationRepository to store settings.

  * Configuration class keeps settings.
  * An instance of Configuration class will be saved and loaded via
    ConfigurationRepository interface.  Refer to its save and load methods.
  * ConfigurationRepositoryFS is an implementation of ConfigurationRepository.
    It will store settings in ~/.ssh/jcterm.properties file.
  * JCTermApplet will process applet properties,
     - jcterm.config.repository
     - jcterm.config.name
    The former is a class name, which is an implementation of
    ConfigurationRepository.  The later is used as an argument for
    ConfigurationRepositry#save() method to load the configuration.
Stile, ancora
modified the ui to reflect enabled / present / downloadable
Consistency.
Add vendor.
Backport 1.4 EventManager and ServiceManager
Code Analysis->Reports column size
init, nu dawt philes
resolver: added support for precompiled (pre-prepared) targets.

Precompiled targets skip the target compilation (preparation)
phase altogether. They get added with a pre-prepared scripting
context readily provided by the one creating the target. Hence
it is possible, using precompiled targets, to avoid altogether
the textual representation of target update 'rules' in cases
where this would be difficult or inconvenient.
Should be "continue"
Inline method
Support old DS 3.0.3.41 - 3.0.4.44
Support DS obfuscated SL assemblies
fixed assertion bugs
fix contact us
Merge remote-tracking branch 'origin/master'
First attempt to do the assignment #4 (added 'gtransofrms' module). Refurbished the 'renderPSFile' (now 'loadPSFile') to return a list of GElements that will be used further on by the transformation module. Altered the 'main' module to make room for the graphical transformations change request.
add color statement #30
Add the window notification. Fix the bug with the private message sent with the "/" command.
	modified:   config.py
	modified:   js/irc/commands.js
	modified:   js/irc/ircclient.js
	modified:   js/qwebircinterface.js
	modified:   js/ui/baseuiwindow.js
	modified:   static/quidebug.html
Do not remove the channel from the favorites if the user is getting kicked.
Show hints when the user connect to the client.
	modified:   js/irc/ircclient.js
	modified:   js/qwebircinterface.js
	modified:   js/ui/frontends/qui.js
started the icons menu, enable test modal
enable prev next buttons
stopped tracking topics cache
Fix tests: time to time some tests fail after BootstrapperTests are executed. The reason is that bootstrapper sets custom DependencyResolver. Restored it with default-like resolver.
Improved code for setting conventional metadata
Fixed err when .html and append use with null as input
$('h1').append( $('.notfound').html() );
Some ajax and clientside tests
snowgoon: Eggs i dag klokken 12:00, med snowgoon
Fiks git-funktioner
dolle: ønsk blåskimmelost
Control de acceso de Módulos en nueva interface
Merge branch 'master' of github.com:Aulla/eneboo
Added README and LICENSES along with the JARS and natives
remove minc4itk
Fixed ItemContainerGenerator retrieval container from index and vice versa.
Squashed 'extlibs/aurora/' changes from 4fd9f23..95bcec3

95bcec3 [Tools] Changed Distribution constructor
1752733 [All] Replaced add_/is_reference with add_/is_lvalue_reference
9eb46f4 [Tools] Cleaned up Metaprogramming.hpp, brought some functionality to the public API
6b010bd [All] Use static_assert
dd75ca0 [All] Use nullptr literal
b9c111e [All] Ported TR1 functionality to C++11
57f5fb1 [Tools] Documentation

git-subtree-dir: extlibs/aurora
git-subtree-split: 95bcec382d11785d9230b61cbd47bedf0a9c9739
Merge commit 'cb9fae56dba242bee8a50915f462255a2546521e'
[All] Adapted to Aurora
#17: contracts for static methods

todo: check return value works correctly + contracts for static
constructors
fixed compilation issues with Sun JDK 1.6 and primitive return types
Cambios en los formularios de visualizacion de datos
Example plotting routine
Make boilerplate.
Add dunsmoreb as admin.

Bryan Dunsmore is the coolest person ever and ergo deserves to be an
administrator.
Merge pull request #4 from dunsmoreb/feature/dunsmoreb-as-admin

Add dunsmoreb as admin.
Removed GenMin Service
Added GenMin script for thumb generation
Removed cron files
Removed unnecessary files
Improved search system (ajax + request)
Added dependency of hadoop-hdfs
Some refactorings - package names, protobuf message name
Audit entries transformations tests
Merge pull request #26 from acz-icm/master

Audit entries transformations tests; some refactorings
Pruebas de definicion de protcolo con construct
Revert "Clonage du repo vers RANA"

This reverts commit 0a0e57fd8d61c65d47e7f0f8766ed0a1eebfb24f.
Litt forsiktig forsøk på front-end
remove test5.php
Make it possible to read private messages for local moderators.
Merge branch 'release/0.8.5'
Minor pre-release mods
Merge branch 'hotfix/0.8.5.1' into develop
Fixed svg files to scale properly in IE9
Icons are now properly viewed in IE9
Add missing column names in LoadResident for SQL.
refactoring code, Skinning done through Skin() only
added orderGraph, repair some bugs, when max degree vertex first, still
some bugs need to repair
trying to implement disconnect
Flexible Headers! Start of 3.1.1
settings formatting and update
fix subtle bug with track rendering exposed by BAM caching: if a track calls its loadSuccess callback immediately on load (i.e. without yielding), the genomeview won't be set up for it yet
make ucsc-to-json emit useful error messages when it can't find files, closes #137
added ucsc-to-json error messages to release notes, reordered release notes to reflect importance prior to releasing 1.6.2
release 1.6.2
Merge branch 'master' of https://github.com/GMOD/jbrowse
Merge branch 'master' of https://github.com/GMOD/jbrowse
Merge branch 'issue32' of https://github.com/GMOD/jbrowse
Merge branch 'master' of https://github.com/GMOD/jbrowse
Merge branch 'master' of https://github.com/GMOD/jbrowse
asd
Merge branch 'master' of https://github.com/GMOD/jbrowse

Conflicts:
	main.css
Merge branch 'master' of https://github.com/GMOD/jbrowse

Conflicts:
	main.css
asd
Merge branch 'master' of https://github.com/GMOD/jbrowse
Merge branch 'master' of https://github.com/GMOD/jbrowse
added- ignore vim swap files
Merge branch 'master' of https://github.com/GMOD/jbrowse
New: Refactored event sink functionality
add autoinstall for keys
Withdrawal possible
Miren
Miren
update to ewol 0.3.4 ==> change the arbo
Added filesystem browser dialog. Still need to link with importer
some fixes
Figures behavior fixed
Merge remote-tracking branch 'origin/denis' into alex
Black pawn fixed
Merge pull request #6 from Humple/alex

merge branches
Update zathura configuration
Use the full path to the conkyrc
Add spell checking to vim (mail and tex)
Remove useless latex's aliases
fixed about page footer
fixed sign in redirect
Base RGR
Abstract and Unint test refactored using new Class Lib
waters09 additions
fixing build for ubuntu and windows
changed the bullet and missile class slightly
padding seems to be wrong, css class container had the right padding
Changed interface of "solve" method. Added GeneticSolver, but hardcoded
for now.
Merge pull request #2 from dominik2cucu/master

taking new version
with core implemented 
with core implemented second try
changes
with core functionality
Sikor test.
Merge pull request #3 from sikor/master

asdf
Tada
Merge pull request #4 from szymesl/master

PointMap
Merge pull request #1 from dominik2cucu/master

Lala
Add more tests to themes bundle
fix modules info files
Snap movement to grid
Change editor to subl
Article about webfonts
Update version number for release.
Merge branch 'release/1.3.2' into develop
WEP support in xbian-config, fixing #56
Revert "Use the db instead of the session in the views"

This reverts commit b7ab85cfdf01f4acdc2bea9e3297449528b2e31d.
Revert "Use the db.session in the views"

This reverts commit 034e2e6ec9c50c3b22427f0887f5c6975ecb6e7a.

Conflicts:

	pynuts/view.py
Уникальность юзера и его категории
Multi font support. Major refactoring of many places.
change autoresizeButton & tabBar
Added CascadedShadowMapFiles
[osx] revert change to x86_64-osx, we do not track internal dylibs that way
[darwin] add temp helper file for pvr addon binary build
[osx] - move SDLMain.mm from xbmc/osx to xbmc/main and stick it into the main.a - fixes compilation of test framework
[darwin] - enable gtest targets
[darwin] - fix assert when running test suite
algorithm-note: Chapter 12 Binary Search Tree
Routing changes

Make default url something like /news/2012/9/30/slug in order to
allow me to write two posts with the same slug in different days.
Update auto-install.sh to download Milnex's vimrc
added and edited files containing console variables
修改reset，去掉不必要的margin/padding重置。
添加table.less
Wow this thing is working pretty well
added the client jar entries to the job jar if no lib jars are used
started a heuristic to determine if we need to upload jars to the cluster
Merge branch 'master' of github.com:NICTA/scoobi into master-publish
updated spec sources
bumped to version 1.0.1
updated for 1.0.1
Switch to latest NOVA revision and enable 4M pages in vancouver
(thanks to the latest NOVA commit, big pages work also on x86_64
now)
Fix encrypted tunnels in networks with more than 256 resources

We were generating invalid IP addresses (like 192.168.105.321), so use
the whole 192.168.0.0/16 range from 192.168.105 upwards.

Would be nice if for purposes of IP address assignment we had an index
that only counts machine resources.
Disambiguate progress indicators when there are several running in parallel
Pipe to /dev/null to prevent error message from appearing in include path.
renamed DUNE_PATH_SUPERLU to OPM_PATH_SUPERLU such that the test within DUNE is not overwritten in other DUNE modules.
Added missing files that should be ignored (*.mod files generated by gfortran and two test executable).
Merge remote-tracking branch 'upstream/master' into superlu-support
to get the latest changes.
Merge pull request #56 from blattms/superlu-support

Superlu support with fix for issue OPM/opm-core#54
Make GCC 4.6.3 happy in C++0x mode

It complains about not finding a match for the pair<> template class,
because the first parameter (this) is allegedly const. However, this
isn't a const method, so I suspect it is a compiler bug.

In order to move on, I slap on a harmless cast which will make this
particular compiler happy, and which should have no effects elsewhere,
but put it in a #if..#else..#endif macro to avoid warnings on others;
hopefully this also makes it easier to spot and remove in the future.
Merge pull request #81 from rolk/pair0x

Make opm-core compilable in C++0x mode on Ubuntu Precise
Added feh back in
Error in about page fixed
Merge branch 'develop'
Merge branch 'master' of https://github.com/PomanoB/lsse
Added i18n
Cleaned up reposts view
Added troubleshooting to readme
Reduced ciclomatic complexity of Router::dispatchRequest
CrazyCore: modes don't support and need : to set their value!
CrazyChats: added possebility to customize chatFormats from within (external) channels
CrazyPunisher: some code formating
CrazyCore: show details by default
initial commit
Merge branch 'master' of github.com:Seppone/bsvc
Added snippet tab, change snipet to snippet in the hole extension
后台信息更改
相关包提交
过滤器调整
Self-update composer before use
updated (overhaul canceled)
Fix up Android build and made a Configuration class.
Added FPS counter for Android
make sure all Android classes have a TAG field
make sure all Pc classes have a TAG field
make sure all Core classes have a TAG field
Updates to LWJGL related OpenGL/GLSL code
Simplify PcDisplay debuggy stuff based on NeHe

From the iOS tutorial, lesson 02.

http://code.google.com/p/nehe/source/browse/#git%2Flessons%2Fios%2FLesson02%2FLesson02
Еще немного текста
deleted use cases
adding dump of cards
Add Python implementation of Github and Redmine connectors.
#58
roles account data
Added support for weeks, months and years
Resorting theme stuffs...

-Dx
Adding some UIColor convenience categories and a useful YKConstrain define
Bumping GHKit
Bumping GHKit
Better version for _.pick
Better version for _.omit
_.template should not override existing properties
ignore
igonre
Deactivated symbols in powerline
Replace plugin_get_file_name() with plugin_address_to_filename()
#21, запилил RSS. В ленту включается только одна запись - последняя (т.е. от последнего прохода валидатора). Для аутлука и ему подобных (которые ранее полученные элемениты хранят сами) должно хватить.
More consistency.

I'm guessing the "96" is the address of the DAC in some way, and
that if someone had more than one, they might have different addresses,
so this seemed like a sensible move.  It also lets dacWrite() act
more in line with digitalWrite().
Fri 05,2012
Writing numeric data using ndarray.tofile method to reduce typechecking/recasting.
Updated changes.
Fixed a problem in evaluting a kwarg and organized module.
Revised docstrings.
Add the option -max-torrent-size
Rect and Polyline redraw issues fixed.
Rect and Polyline redraw issues fixed.
Removed unnecessary spaces.
Added a quick explanation for matplotlib
Unused colors removed.
Polyline color changing on drag zoom and mouse movement fixed.
Unnecessary spaces removed (OCD me)
Unnecessary draw removed.
Updated doc strings.
Добавлено подменю в модуль User
add image to header, new about content
continuing with stack2
Fixed redrawing. You can now inspect other tiles while in move/attack
mode
listener
git
Gitignore
git
se arreglo lo de modulos
Merge pull request #8 from mjrcmrma/master

qarre
fix buffer namespace conflict

closes #88
passing back the error to all the callbacks now
add debug dependency
debug
refactor identify
mixin EventEmitter
refactor identify and getters commands

identify getters now only use -verbose when necessary. -verbose is quite
slow when run on large (3MB) images. The -format option is a good
replacement for most cases.

This change causes a slight behavior change since previously all
getters used -verbose. The impacted getters are:

  format()
  depth()
  size()
  color()
  filesize()

These getters now use the -format option which is much faster but
may produce different results than previous releases. If you need
the old (slow) behavior for these properties, first use the full
`identify()` method and read the value afterward.

  var image = gm(img);
  image.identify(function (err) {
    console.log(image.data.format);
  })

closes #83
fixed; rotation by 0

closes #90
ocd
reset internal arguments after execution
CLT verociously consumes API. Project Done.
Added Simple Moving Average calculation method to TrendTradingAgent
Commiting lab7 changes
commiting README.md
many
goodbay stackmob
i18n: Fix extraction of plural forms
Let lispy optionally known a binding connection.
Viewpoint#parser, accepting an optional connection.
Let the parse bind expressions in Connection.
Better error message.
Pass connection around when instanting sub viewpoints.
Refactor database schemas
Add Predicate.coerce from Relation values.
Add support for Time and DateTime in coerce and to_ruby_literal.
Add a ObjectOriented#_compile hook
enhance plain object detecting
Mid-Term
	Part 3 - 3) configure Database connection
Mid-Term
	Part 3 - 4) made the first list.php view
Added loop transpose
1.Modify the function of getting Mobile network type.
2.Add a function to check the information of GSMCellLocation, get the value of LAC,CID,MNC,MCC.
3.Add a function to get lantitude and longitude of the current location based on the information from GSMCellLocation, but still in the debugging....
reorganized startup process (command line option wasn't setting debug flag in time to change logger to STDOUT)
example logrotate config
Clarify COND_THIRD_LIBSTDDJB code

Signed-off-by: Anders Kaseorg <andersk@mit.edu>
Set poll_LIBS = libpoll.a in Makefile.am so dependency tracking works

Signed-off-by: Anders Kaseorg <andersk@mit.edu>
Remove --install from ACLOCAL_AMFLAGS (for automake < 1.10)

Signed-off-by: Anders Kaseorg <andersk@mit.edu>
removed mock_redis
1205072225
修改了debug中函数名称
Fix some issues with the DS9 ranks
Add the dress whites ranks
Add the voyager ranks
Blockクラスの追加
それによる追加ブロックの記述の簡略化
Signed-off-by: aoisensi <aoisensi@aoisensi.info>
Minor commit; Message properties are now initialised to null.
Upgraded to Groovy 2.0.6

git-svn-id: https://svn.apache.org/repos/asf/camel/trunk@1425344 13f79535-47bb-0310-9956-ffa450edef68
HBASE-7359. [REST] 'accessToken' in RemoteHTable is vestigial


git-svn-id: https://svn.apache.org/repos/asf/hbase/branches/0.94@1422310 13f79535-47bb-0310-9956-ffa450edef68
OOZIE-1124 Split pig unit tests to a separate module (rohini via virag)

git-svn-id: https://svn.apache.org/repos/asf/oozie/branches/hcat-intre@1423202 13f79535-47bb-0310-9956-ffa450edef68
Commenting out experimental code for text controls.
add generated sentences file
Adding the new changes in the flip buffer for the efficient message passing. Old file remains as it is.
footer parcial
comentarios de entities
no se q
Added: open in Chrome, highlight TDs without width, IMGs witout />.
[Closes #310] Deadlink in README
[Finishes #26842559] less exports, less in-your-face interface
Adicionando a base do novo projeto
Added avleens blog, and some suggested additions to the script
document add form
Merge branch 'master' of https://github.com/awidarto/pnu
12b - conferir testes
Merge branch 'desktop-2.0.6'
Merge master
bump version desktop 2.0.7
bump version desktop 2.0.7-SNAPSHOT
Extract the private channel key from the photo owner.
Properly set job type in fromProgram and fromRecorded methods.

Signed-off-by: Raymond Wagner <rwagner@mythtv.org>
(cherry picked from commit 868a566c1d635be3e60f83438f87b6f21d9f1780)
Merge branch 'fixes/0.25' of code.mythtv.org:mythtv into fixes/0.25
Merge branch 'fixes/0.25' of code.mythtv.org:mythtv into fixes/0.25
Correct --printexpire option in mythbackend.

This corrects logic that was accidentally inverted in 8bc8dd54, and
allows `mythbackend --printexpire` to be used again.
(cherry picked from commit a9f18c63bfb23494ee83a8ba76d82fc320617067)
Merge remote branch 'upstream/fixes/0.25' into 0.25-fixes-patched
Rework IP selection so link-local is always used.

This adds an option to mythtv-setup that makes link-local addresses
listened to by default.  This behavior can still be disabled, to block
off network access.

Signed-off-by: Jean-Yves Avenard <jyavenard@mythtv.org>
Correct bad copy/paste in ServerPool.

Signed-off-by: Jean-Yves Avenard <jyavenard@mythtv.org>
Make AllowLinkLocal default to true

Signed-off-by: Jean-Yves Avenard <jyavenard@mythtv.org>
Add a sliding window sample type for histograms
Add delete function clause for slide sample
Add eunit and quickcheck tests for sliding window
Add a hybrid sliding window/uniform sample to bound size
Add eqc test for slide_uniform sample

Changes to code based on test:
Add delete metric
Add server pid to record
Correctly select the whole window
ifdef out eqc test if eqc

use symbolic calls in next_state to simplify model
Merge pull request #3 from basho/rdb-slide-uniform

Add a hybrid slide / uniform sample type
Merge branch 'rdb-slide-sample'
enable to build QRCode instance every call
Merge branch 'dev-regexp'
version++; # 0.034
Setting up r/o properties from parents (to be reviewed)
bearing change calculations
Bal
test2
graph erneuert
Add ex30
Removed processEvents in parser
Fixed license
Merge branch 'master' of github.com:bmc/picoblog
Show that you can use -removeheaders to create a whitelist
Removed space form property key in components.
Made RESOURCE elements have a child that contains the SHA
riportato il modulo tkip_mic_utility.py nella sua posizione. era statao spostato per sbaglio
inserito il modulo di test del tkip - da sistemare
Added Platform's Enum, DAO, DTO (no tests)
Added BaseEnumDAO class for all enums
Fix argument types
map window adjustments, ready for design layer
Added ability to add comments to posts.

Changed markdown filter to escape raw html.
Users that are not logged in have to solve a recaptcha to post a comment.
Comments by logged in users have special formatting (author highlighted in green).

methods changed from get(), post() to _get(), _post() to solve conflict with the post view

Added blah.views.util.validate_email to naively validate emails.
fix emacs typing error
added logging comments
readme upate

minor structural changes
removed sql from .gitignore
Fixed bug when disconnected while waiting to write.
created the file for the first point of the first part of the assignment that everyone has to contribute an edit to
added error checking for the user input
Update EuiScript/module/loadkey.lua

尝试处理眼镜蛇射击被识别成稳固射击的BUG.
跟随更新,因reminder模块武器附魔检查仍有问题,先禁用.

Signed-off-by: cadcamzy <cadcamzy@hotmail.com>
继续尝试添加双RaidDebuff图标显示.

Signed-off-by: cadcamzy <cadcamzy@hotmail.com>
双Debuff显示方式调整中... 未定.

Signed-off-by: cadcamzy <cadcamzy@hotmail.com>
removing overhead of $name since half the examples dont have it anyway and it only takes focus from the real issue
more corrections
Merge pull request #415 from dereuromark/master-cleanup

Master cleanup
Replace reference to $useroffset with $timezone
fixed debug function format
Merge pull request #370 from okonomi/debugging-format-fix

Fixed 'debug' function formatting
screen.c: call nonl in init() so ncurses doesnt mess with newline input
#59: removed scale handling in gluOrtho2D
Bug 798361 - Make release automation work with mock slaves. r=rail
Bug 809177 - Find python through $PATH for spidermonkey.sh. r=kmoir

On the mock builders, spidermonkey.sh is looking for python in a nonexistent location. I believe $PATH is now getting set properly for all environments, so avoiding an absolute path here seems safer.

--HG--
extra : rebase_source : cc525c044bc8150a9700d60fdaa40b967447a9c6
Bug 808474 - Restore the ability to write a watcher.ini to tegras after reimage. r=jmaher

--HG--
extra : rebase_source : e12256df013306b9da94c63b84796b26bdab55b8
Bug 809012 - panda boards do not reboot when the sutagent is in a hung state. r=Callek
Added tag FENNEC_17_0b5_RELEASE, FENNEC_17_0b5_BUILD1 for changeset 0d98286d34f6
Added tag FIREFOX_17_0b5_RELEASE, FIREFOX_17_0b5_BUILD1 for changeset 57ee8afae7b7
Automated configuration bump: update configs for Firefox 17.0b5 build 1
Added tag FIREFOX_17_0b5_RELEASE_RUNTIME, FIREFOX_17_0b5_BUILD1_RUNTIME for changeset 72e9e54d6b55
Bug 796995 - create mozilla-esr17 branch. r=catlee
Bug 809484 - Add android-noion, panda, unagi. r=armenzg
Bug 809890 - sut_tools fails to uninstall applications in cleanup.py among various other quirks on panda boards. r=Callek
Bug 809952 - sut_tools/reboot.py never does the PDU reboot for pandas. r=Callek
Bug 799160 - Use hgtool.py when present to update blocklist - r=Callek
Bug 810760 - change the <br /> in Jetpack results to a <br/> so tbpl will realize they are results, r=Callek
Merge branch 'master' of git://github.com/mozilla/build-tools into gittool
added comments
seem to have fixed some basic cases
fixed some misc bugs
swaps again...
slightly better logic in updateMaskIfNecessary
install/upgrade procedure, add configurable MP frontpage, rename engineering to status and reports
bring marker icon back (oops!)
Fix error with removing GeoJSON, closes #685
Merge pull request #683 from cfis/tileLayersToLoad

_tileLayersToLoad Cleanup
Merge pull request #682 from cfis/tilesLoaded

Make sure TileLayer load event is fired
update build
update changelog
fix debug files for IE6
Fixed layers control in IE7, closed #652
polyline: Remove deleted marker from internal list

When marker is deleted from line it's left in internal _markers list.
Merge pull request #700 from shramov/polyline-edit-fix

polyline: Remove deleted marker from internal list
update build
Merge branch 'master' into zerista
Fix remote repo path
Modified patch from Matt Kopec that fixes a process launch issue on linux where we wouldn't acquire the process run lock.



git-svn-id: https://llvm.org/svn/llvm-project/lldb/trunk@163163 91177308-0d34-0410-b5e6-96231b3b80d8
<rdar://problem/12446320> Fixing an issue with our Driver where setting an immediate output would not cause suppression of the final printout. This allows effective output redirection for Python commands

git-svn-id: https://llvm.org/svn/llvm-project/lldb/trunk@166058 91177308-0d34-0410-b5e6-96231b3b80d8
ARM: Add a few missing add->sub aliases w/ 'w' suffix.

Aliases for adding a negative immediate when using an explicit 'w'
suffix. E.g.,
        adds.w r2, #-16
        adds.w r2, r2, #-16
        addw r2, #-16
        addw r2, #-16
        addw r2, r2, #-16

rdar://11330769

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@155946 91177308-0d34-0410-b5e6-96231b3b80d8
Cleanup pcmp(e/i)str(m/i) instruction definitions and load folding support.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@167652 91177308-0d34-0410-b5e6-96231b3b80d8
Add a release note for r145714.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@153224 91177308-0d34-0410-b5e6-96231b3b80d8
Typo. Patch by Nicklas Bo Jensen <nbjensen@gmail.com>.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@157415 91177308-0d34-0410-b5e6-96231b3b80d8
comment typo

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@164097 91177308-0d34-0410-b5e6-96231b3b80d8
TargetSchedModel API. Implement latency lookup, disabled.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@164098 91177308-0d34-0410-b5e6-96231b3b80d8
Let NULL slip through again.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@164099 91177308-0d34-0410-b5e6-96231b3b80d8
Be more verbose when detecting dominance problems.

Catch uses of undefined physregs that haven't been added to basic block
live-in lists. Run the verifier to pinpoint the problem.

Also run the verifier when a virtual register use is not jointly
dominated by defs.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@160207 91177308-0d34-0410-b5e6-96231b3b80d8
Document the interface for integer expansion, using doxygen-style comments

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@164231 91177308-0d34-0410-b5e6-96231b3b80d8
Add files which were not included by commit 154868.



git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@154872 91177308-0d34-0410-b5e6-96231b3b80d8
docs: ASCII-fy

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@170637 91177308-0d34-0410-b5e6-96231b3b80d8
Bugfixes (hopefully) to assemble.c.
Bugfixes (hopefully) to symtable.c.
ajout de quelques traductions
Adding vcr cassettes.
Remove vcr config due to spurious failures.
Adding LIPA as provider.
Stick model stiffness, natural period, DAF, and DAF at resonance added.
Fixing operation.
[jobsub] Authenticate to Oozie in non-secure mode

* Always include `user.name'.
[jobsub] Fix ui modal dialog and broken history listing
[build] Do not overwrite an existent pseudo-distributed.ini
HUE-664. [ui] Jobsub design edit page mis-styled
[ui] Contents in <pre> tags need to be html-escaped
HUE-666. [ui] Jobbrowser attempt page unstyled
[build] Markdown requires elementtree when generating docs
[jobsub] Specify oozie.use.system.libpath for streaming jobs
More readable verbose messages.
Fixed a couple of errors and finished test cases for Act, Difficulty and Progress entity
Minor gruntfile tweak.
Need to find a better way to test gruntplugins.
Adding 'concat' helper separator option as well as 'concat' and 'min' task separator config property. Closes #73.
as;dlfkjjjjjjjjj
CLN: add slots and make fmt dtype
DOC: update doc
FIX: remove side (too arbitrary)
Merge branch 'hotfix/remove-side-index' into develop
TST: update for removal of side
TST/CLN: import directly from unittest module
TST: add 2dmap tests
CLN: remove unused imports
CLN: shorten fused type name
BUG/TST: fix
CLN: remove print statements
CLN: import directly from unittest and use between as within
TST: remove uncovered and unused test code
Merge branch 'gh-pages' of https://github.com/cpcloud/span into gh-pages
hide some not yet prepared stuff
Includes a much faster visTheseParts(); not all tests pass yet
there, I've done it